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

DATACMNS-867 - API updates after rebase on latest changes.

Browse Source
This commit is contained in:
Oliver Gierke
2017-03-09 13:44:59 +01:00
parent e861d0343b
commit bdbdb46adb
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/repository/query/QueryMethod.java
View File

@@ -91,8 +91,8 @@ public class QueryMethod {
}
}
Assert.notNull(this.parameters, () ->
String.format("Parameters extracted from method '%s' must not be null!", method.getName()));
Assert.notNull(this.parameters,
() -> String.format("Parameters extracted from method '%s' must not be null!", method.getName()));
if (isPageQuery()) {
Assert.isTrue(this.parameters.hasPageableParameter(),
@@ -280,7 +280,7 @@ public class QueryMethod {
Assert.notEmpty(types, "Types must not be null or empty!");
TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
returnType = QueryExecutionConverters.isSingleValue(returnType.getType()) ? returnType.getComponentType()
returnType = QueryExecutionConverters.isSingleValue(returnType.getType()) ? returnType.getRequiredComponentType()
: returnType;
for (Class<?> type : types) {

3
src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportIntegrationTests.java
View File

@@ -63,7 +63,8 @@ public class RepositoryBeanDefinitionRegistrarSupportIntegrationTests {
@Test // DATACMNS-989
public void duplicateImplementationsMayBeExcludedViaFilters() {
assertThat(context.getBean(MyOtherRepository.class).getImplementationId(), is(MyOtherRepositoryImpl.class.getName()));
assertThat(context.getBean(MyOtherRepository.class).getImplementationId())
.isEqualTo(MyOtherRepositoryImpl.class.getName());
}
@Test // DATACMNS-47

10
src/test/java/org/springframework/data/repository/query/QueryMethodUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2016 the original author or authors.
* Copyright 2008-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@ public class QueryMethodUnitTests {
RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
Method method = SampleRepository.class.getMethod("returnsSeq");
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
}
/**
@@ -206,7 +206,7 @@ public class QueryMethodUnitTests {
RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
Method method = SampleRepository.class.getMethod("returnsFutureOfSeq");
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
}
/**
@@ -218,7 +218,7 @@ public class QueryMethodUnitTests {
RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
Method method = SampleRepository.class.getMethod("returnsFutureOfOption");
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(false));
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isFalse();
}
@Test // DATACMNS-1005
@@ -227,7 +227,7 @@ public class QueryMethodUnitTests {
RepositoryMetadata repositoryMetadata = new DefaultRepositoryMetadata(SampleRepository.class);
Method method = SampleRepository.class.getMethod("returnsSeq", Pageable.class);
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery(), is(true));
assertThat(new QueryMethod(method, repositoryMetadata, factory).isCollectionQuery()).isTrue();
}
interface SampleRepository extends Repository<User, Serializable> {