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

DATACMNS-1578 - Polishing.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-09-05 17:35:15 +02:00
parent 30dbac1bce
commit ac3fc2bddd
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java
View File

@@ -37,10 +37,8 @@ import com.querydsl.core.types.dsl.SimpleExpression;
*
* @author Christoph Strobl
* @author Oliver Gierke
* @since 1.11
*
* @author Colin Gao
* @since 2.1
* @since 1.11
*/
class QuerydslDefaultBinding implements MultiValueBinding<Path<? extends Object>, Object> {
@@ -72,16 +70,17 @@ class QuerydslDefaultBinding implements MultiValueBinding<Path<? extends Object>
if (path instanceof SimpleExpression) {
SimpleExpression expression = (SimpleExpression) path;
if (value.size() > 1) {
return Optional.of(((SimpleExpression) path).in(value));
return Optional.of(expression.in(value));
}
Object object = value.iterator().next();
if (object == null) {
return Optional.of(((SimpleExpression) path).isNull());
}
return Optional.of(((SimpleExpression) path).eq(object));
return Optional.of(object == null //
? expression.isNull() //
: expression.eq(object));
}
throw new IllegalArgumentException(

13
src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java
View File

@@ -54,7 +54,8 @@ 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
@@ -78,9 +79,13 @@ public class QuerydslDefaultBindingUnitTests {
assertThat(binding.bind(QUser.user.lastname, Collections.emptySet())).isNotPresent();
}
@Test //DATACMNS-1578
public void shouldCreatePredicateWithIsNullWhenPropertyIsAnNestedObjectAndValueIsNull() {
@Test // DATACMNS-1578
public void shouldCreatePredicateWithIsNullWhenPropertyIsANestedObjectAndValueIsNull() {
Optional<Predicate> predicate = binding.bind(QUser.user.address.city, Collections.singleton(null));
assertThat(predicate).hasValueSatisfying(it -> assertThat(it.toString()).isEqualTo(QUser.user.address.city.isNull().toString()));
assertThat(predicate).hasValueSatisfying(it -> {
assertThat(it.toString()).isEqualTo(QUser.user.address.city.isNull().toString());
});
}
}