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

DATAREST-1261 - Fixed invalid fallback to default delegate in UnwrappingRepositoryInvoker.invokeFindById(…).

Browse Source 
Previously we fell back to the default by-id lookup even if a custom entity lookup was defined but returned an empty result.
This commit is contained in:
Oliver Gierke
2018-07-12 22:36:56 +02:00
parent 429706a77e
commit 781e1affe2
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ 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;
@@ -30,7 +29,6 @@ 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;
@@ -91,10 +89,9 @@ public class UnwrappingRepositoryInvokerFactory implements RepositoryInvokerFact
@SuppressWarnings("unchecked")
public <T> Optional<T> invokeFindById(Object 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);
return lookup.isPresent() //
? (Optional<T>) lookup.flatMap(it -> it.lookupEntity(id)) //
: delegate.invokeFindById(id);
}
/*

3
spring-data-rest-core/src/test/java/org/springframework/data/rest/core/support/UnwrappingRepositoryInvokerFactoryUnitTests.java
View File

@@ -76,7 +76,7 @@ public class UnwrappingRepositoryInvokerFactoryUnitTests {
});
}
@Test // DATAREST-724
@Test // DATAREST-724, DATAREST-1261
@SuppressWarnings("unchecked")
public void usesRegisteredEntityLookup() {
@@ -89,6 +89,7 @@ public class UnwrappingRepositoryInvokerFactoryUnitTests {
factory.getInvokerFor(Profile.class).invokeFindById(1L);
verify(lookup, times(1)).lookupEntity(eq(1L));
verify(invoker, never()).invokeFindById(eq(1L)); // DATAREST-1261
}
private static Consumer<AbstractOptionalAssert<?, Object>> $(Consumer<AbstractOptionalAssert<?, Object>> consumer) {