hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo HALResource change, all tests run locally

Browse Source
This commit is contained in:
Marie Verdonck
2019-06-04 12:57:19 +02:00
committed by Andrew Wood
parent f6bf8b09fd
commit 668b6551b0
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/HALResource.java
View File

@@ -27,7 +27,8 @@ public abstract class HALResource<T> extends Resource<T> {
protected final Map<String, Object> embedded = new HashMap<String, Object>();
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonUnwrapped
private EmbeddedPageHeader pageHeader;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -49,9 +50,5 @@ public abstract class HALResource<T> extends Resource<T> {
public void setPageHeader(EmbeddedPageHeader page) {
this.pageHeader = page;
}
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonUnwrapped
public EmbeddedPageHeader getPageHeader() {
return pageHeader;
}
}