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

DATACMNS-867 - Update forward ported code.

Browse Source 
Polished method lookup in DefaultRepositoryInformation using Optionals.firstNonEmpty(…). Optimized creation of JavaSlang's Option type as we don't have to rely on reflection to call static methods on interfaces on Java 8. AssertJ updates in corresponding tests.
This commit is contained in:
Oliver Gierke
2016-11-24 18:44:36 +01:00
parent 2d282b2d7f
commit 1ad82cb82d
5 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
View File

@@ -242,11 +242,11 @@ public class DefaultRepositoryInformationUnitTests {
RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class);
RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class,
customImplementation.getClass());
Optional.of(customImplementation.getClass()));
Method method = FooRepository.class.getMethod("staticMethod");
assertThat(information.getQueryMethods(), not(hasItem(method)));
assertThat(information.getQueryMethods()).doesNotContain(method);
}
@Test // DATACMNS-939
@@ -254,11 +254,11 @@ public class DefaultRepositoryInformationUnitTests {
RepositoryMetadata metadata = new DefaultRepositoryMetadata(FooRepository.class);
RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class,
customImplementation.getClass());
Optional.of(customImplementation.getClass()));
Method method = FooRepository.class.getMethod("defaultMethod");
assertThat(information.getQueryMethods(), not(hasItem(method)));
assertThat(information.getQueryMethods()).doesNotContain(method);
}
@Test // DATACMNS-943

2
src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java
View File

@@ -281,7 +281,7 @@ public class RepositoryFactorySupportUnitTests {
ObjectRepository repository = factory.getRepository(ObjectRepository.class, customImplementation);
assertThat(repository.staticMethodDelegate(), is(equalTo("OK")));
assertThat(repository.staticMethodDelegate()).isEqualTo("OK");
verifyZeroInteractions(customImplementation);
verifyZeroInteractions(backingRepo);

2
src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java
View File

@@ -186,7 +186,7 @@ public class QueryExecutionConvertersUnitTests {
@SuppressWarnings("unchecked")
public void turnsNullIntoJavaslangOption() {
assertThat(conversionService.convert(new NullableWrapper(null), javaslang.control.Option.class))
.isEqualTo(optionNone());
.isEqualTo(javaslang.control.Option.none());
}
@Test // DATACMNS-937