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

DATAREST-1067 - EntityLookup.lookupEntity(…) now returns Optional<T>.

Browse Source
This commit is contained in:
Oliver Gierke
2017-05-04 23:55:53 +02:00
parent f906695e7a
commit 3b0c73f109
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/config/EntityLookupConfiguration.java
View File

@@ -208,8 +208,12 @@ class EntityLookupConfiguration implements EntityLookupRegistrar {
* @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.io.Serializable)
*/
@Override
public Optional<Object> lookupEntity(Object id) {
return Optional.ofNullable(lookupInfo.getLookup().lookup(repository, id));
@SuppressWarnings("unchecked")
public Optional<T> lookupEntity(Object id) {
Object result = lookupInfo.getLookup().lookup(repository, id);
return Optional.class.isInstance(result) ? (Optional<T>) result : Optional.ofNullable((T) result);
}
/*

2
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/EntityLookup.java
View File

@@ -54,5 +54,5 @@ public interface EntityLookup<T> extends Plugin<Class<?>> {
* @param id will never be {@literal null}.
* @return can be {@literal null}.
*/
Optional<Object> lookupEntity(Object id);
Optional<T> lookupEntity(Object id);
}

9
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactory.java
View File

@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.domain.Pageable;
@@ -29,6 +30,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.repository.support.RepositoryInvoker;
import org.springframework.data.repository.support.RepositoryInvokerFactory;
import org.springframework.data.rest.core.util.Java8PluginRegistry;
import org.springframework.data.util.Optionals;
import org.springframework.util.Assert;
import org.springframework.util.MultiValueMap;
@@ -89,9 +91,10 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact
@SuppressWarnings("unchecked")
public <T> Optional<T> invokeFindById(Object id) {
return (Optional<T>) lookup//
.map(it -> it.lookupEntity(id).orElse(Optional.empty()))//
.orElseGet(() -> delegate.invokeFindById(id));
Supplier<Optional<T>> viaLookup = () -> (Optional<T>) lookup.flatMap(it -> it.lookupEntity(id));
Supplier<Optional<T>> fallback = () -> delegate.invokeFindById(id);
return Optionals.firstNonEmpty(viaLookup, fallback);
}
/*