Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-1213 - Polishing.

Browse Source 
Simplified tests and domain code. Reinstantiated accidentally removed method in PersistentEntityResource.

Original pull request: #355.
This commit is contained in:
Oliver Drotbohm
2020-10-26 22:17:23 +01:00
parent e3a88ff9ca
commit 2b0095d89b
7 changed files with 65 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/HttpHeadersPreparer.java
View File

@@ -60,7 +60,7 @@ public class HttpHeadersPreparer {
public HttpHeaders prepareHeaders(Optional<PersistentEntityResource> resource) {
return resource//
.map(it -> prepareHeaders(it.getPersistentEntity(), it.getTargetEntity()))//
.map(it -> prepareHeaders(it.getPersistentEntity(), it.getTarget()))//
.orElseGet(() -> new HttpHeaders());
}

18
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/PersistentEntityResource.java
View File

@@ -91,17 +91,19 @@ public class PersistentEntityResource extends EntityModel<Object> {
}
/**
* Returns the underlying instance. If the instance is a dynamic JDK proxy, the proxy target is returned.
* Returns the underlying instance. If the instance is a {@link TargetAware}, the {@link TargetAware}'s target is
* returned.
*
* @return
* @see #getContent()
*/
public Object getTargetEntity() {
public Object getTarget() {
Object content = getContent();
if (content instanceof TargetAware) {
return ((TargetAware) content).getTarget();
} else {
return content;
}
return content instanceof TargetAware
? ((TargetAware) content).getTarget()
: content;
}
/**
@@ -110,7 +112,7 @@ public class PersistentEntityResource extends EntityModel<Object> {
* @return
*/
public PersistentPropertyAccessor<?> getPropertyAccessor() {
return entity.getPropertyAccessor(getTargetEntity());
return entity.getPropertyAccessor(getTarget());
}
/**

2
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/ETag.java
View File

@@ -75,7 +75,7 @@ public final class ETag {
Assert.notNull(resource, "PersistentEntityResource must not be null!");
return from(resource.getPersistentEntity(), resource.getTargetEntity());
return from(resource.getPersistentEntity(), resource.getTarget());
}
/**