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

GH-2343 - Adapt to changes in FluentQuery.

Browse Source 
See: #2343
Original pull request: #2360.
This commit is contained in:
Mark Paluch
2021-09-06 10:17:59 +02:00
parent de187219a9
commit 607a45fa0a
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/neo4j/repository/query/FetchableFluentQueryByExample.java
View File

@@ -110,7 +110,7 @@ final class FetchableFluentQueryByExample<S, R> extends FluentQuerySupport<R> im
}
@Override
public R one() {
public R oneValue() {
return findOperation.find(example.getProbeType())
.as(resultType)
@@ -120,7 +120,7 @@ final class FetchableFluentQueryByExample<S, R> extends FluentQuerySupport<R> im
}
@Override
public R first() {
public R firstValue() {
List<R> all = all();
return all.isEmpty() ? null : all.get(0);

4
src/main/java/org/springframework/data/neo4j/repository/query/FetchableFluentQueryByPredicate.java
View File

@@ -112,7 +112,7 @@ final class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<R>
}
@Override
public R one() {
public R oneValue() {
return findOperation.find(metaData.getType())
.as(resultType)
@@ -126,7 +126,7 @@ final class FetchableFluentQueryByPredicate<S, R> extends FluentQuerySupport<R>
}
@Override
public R first() {
public R firstValue() {
List<R> all = all();
return all.isEmpty() ? null : all.get(0);

4
src/test/java/org/springframework/data/neo4j/integration/imperative/QuerydslNeo4jPredicateExecutorIT.java
View File

@@ -92,7 +92,7 @@ class QuerydslNeo4jPredicateExecutorIT {
void fluentFindOneShouldWork(@Autowired QueryDSLPersonRepository repository) {
Predicate predicate = Expressions.predicate(Ops.EQ, firstNamePath, Expressions.asString("Helge"));
Person person = repository.findBy(predicate, q -> q.one());
Person person = repository.findBy(predicate, q -> q.oneValue());
assertThat(person).isNotNull();
assertThat(person).extracting(Person::getLastName).isEqualTo("Schneider");
@@ -174,7 +174,7 @@ class QuerydslNeo4jPredicateExecutorIT {
void fluentFindFirstShouldWork(@Autowired QueryDSLPersonRepository repository) {
Predicate predicate = Expressions.TRUE.isTrue();
Person person = repository.findBy(predicate, q -> q.sortBy(Sort.by(Sort.Direction.DESC, "lastName")).first());
Person person = repository.findBy(predicate, q -> q.sortBy(Sort.by(Sort.Direction.DESC, "lastName")).firstValue());
assertThat(person).isNotNull();
assertThat(person).extracting(Person::getFirstName).isEqualTo("Helge");

4
src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java
View File

@@ -2679,7 +2679,7 @@ class RepositoryIT {
Example<PersonWithAllConstructor> example = Example.of(person1,
ExampleMatcher.matchingAll().withIgnoreNullValues());
PersonWithAllConstructor person = repository.findBy(example, q -> q.one());
PersonWithAllConstructor person = repository.findBy(example, q -> q.oneValue());
assertThat(person).isNotNull();
assertThat(person).isEqualTo(person1);
@@ -2759,7 +2759,7 @@ class RepositoryIT {
Example<PersonWithAllConstructor> example = Example.of(person1,
ExampleMatcher.matchingAll().withIgnoreNullValues());
PersonWithAllConstructor person = repository.findBy(example, q -> q.sortBy(Sort.by(Sort.Direction.DESC, "name")).first());
PersonWithAllConstructor person = repository.findBy(example, q -> q.sortBy(Sort.by(Sort.Direction.DESC, "name")).firstValue());
assertThat(person).isNotNull();
assertThat(person).isEqualTo(person1);