DATAREST-1064 - Adapt to API changes in repository interfaces.

Additional cleanups in QuerydslAwareRootResourceInformationHandlerMethodArgumentResolver to make sure a QuerydslRepositoryInvokerAdapter is only applied if the QuerydslPredicateBuilder actually exposes a predicate. Extracted a couple of methods to make sure the mapping pipeline reads nicely.
This commit is contained in:
Oliver Gierke
2017-05-03 17:22:54 +02:00
parent 632ca25998
commit f906695e7a
26 changed files with 104 additions and 89 deletions

View File

@@ -105,7 +105,7 @@ public class UriToEntityConverterUnitTests {
Entity reference = new Entity();
RepositoryInvoker invoker = mock(RepositoryInvoker.class);
doReturn(Optional.of(reference)).when(invoker).invokeFindOne("1");
doReturn(Optional.of(reference)).when(invoker).invokeFindById("1");
doReturn(invoker).when(invokerFactory).getInvokerFor(ENTITY_TYPE.getType());
assertThat(converter.convert(URI.create("/foo/bar/1"), URI_TYPE, ENTITY_TYPE)).isEqualTo((Object) reference);

View File

@@ -32,10 +32,10 @@ public interface OrderRepository extends CrudRepository<Order, UUID> {
@Override
<S extends Order> S save(S entity);
/*
/*
* (non-Javadoc)
* @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable)
* @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object)
*/
@Override
Optional<Order> findOne(UUID id);
Optional<Order> findById(UUID id);
}

View File

@@ -152,7 +152,7 @@ public class CrudMethodsSupportedHttpMethodsUnitTests {
@Override
@RestResource(exported = false)
Optional<Object> findOne(Long id);
Optional<Object> findById(Long id);
}
interface NoFindOne extends Repository<Object, Long> {

View File

@@ -86,7 +86,7 @@ public class UnwrappingRepositoryInvokerFactoryUnitTests {
when(delegate.getInvokerFor(Profile.class)).thenReturn(invoker);
factory = new UnwrappingRepositoryInvokerFactory(delegate, Arrays.asList(lookup));
factory.getInvokerFor(Profile.class).invokeFindOne(1L);
factory.getInvokerFor(Profile.class).invokeFindById(1L);
verify(lookup, times(1)).lookupEntity(eq(1L));
}