DATACMNS-867 - Additional Java 8 language feature cleanup.
Make use of lambdas and method references though out the codebase. Remove no longer required generic type parameters. Additionally remove unused imports and replace single element list initialization with dedicated singletonList. Use Assertion overloads taking Supplier for dynamic assertion error messages.
This commit is contained in:
committed by
Oliver Gierke
parent
aa4c51e1ea
commit
be347eaaab
@@ -15,7 +15,6 @@
|
||||
*/
|
||||
package org.springframework.data.querydsl;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -120,7 +120,7 @@ public class QuerydslBindingsFactoryUnitTests {
|
||||
|
||||
@Override
|
||||
public void customize(QuerydslBindings bindings, QUser user) {
|
||||
bindings.bind(QUser.user.firstname).firstOptional((path, value) -> value.map(it -> path.contains(it)));
|
||||
bindings.bind(QUser.user.firstname).firstOptional((path, value) -> value.map(path::contains));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,9 +53,7 @@ public class QuerydslDefaultBindingUnitTests {
|
||||
|
||||
Optional<Predicate> predicate = binding.bind(QUser.user.address.city, Collections.singleton("two rivers"));
|
||||
|
||||
assertThat(predicate).hasValueSatisfying(it -> {
|
||||
assertThat(it.toString()).isEqualTo(QUser.user.address.city.eq("two rivers").toString());
|
||||
});
|
||||
assertThat(predicate).hasValueSatisfying(it -> assertThat(it.toString()).isEqualTo(QUser.user.address.city.eq("two rivers").toString()));
|
||||
}
|
||||
|
||||
@Test // DATACMNS-669
|
||||
|
||||
@@ -59,7 +59,7 @@ public class QuerydslPredicateBuilderUnitTests {
|
||||
public void setUp() {
|
||||
this.builder = new QuerydslPredicateBuilder(new DefaultFormattingConversionService(),
|
||||
SimpleEntityPathResolver.INSTANCE);
|
||||
this.values = new LinkedMultiValueMap<String, String>();
|
||||
this.values = new LinkedMultiValueMap<>();
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class) // DATACMNS-669
|
||||
@@ -122,7 +122,7 @@ public class QuerydslPredicateBuilderUnitTests {
|
||||
values.add("lastname", null);
|
||||
|
||||
QuerydslBindings bindings = new QuerydslBindings();
|
||||
bindings.bind(QUser.user.lastname).firstOptional((path, value) -> value.map(it -> path.contains(it)));
|
||||
bindings.bind(QUser.user.lastname).firstOptional((path, value) -> value.map(path::contains));
|
||||
|
||||
builder.getPredicate(USER_TYPE, values, bindings);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user