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

DATACMNS-734 - Allow comma separated list of values to be bound to an array.

Browse Source 
We now convert comma separated values for an array property by splitting values and converting each of them. This allows to convert address.location=40.740337,-73.995146 to 

class Address {
  Double[] location;
}
This commit is contained in:
Christoph Strobl
2015-07-20 10:36:16 +02:00
committed by Oliver Gierke
parent ac080bacf7
commit 11056be292
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/java/org/springframework/data/querydsl/Address.java
View File

@@ -24,6 +24,7 @@ import com.mysema.query.annotations.QueryEntity;
public class Address {
public String street, city;
public Double[] lonLat;
public Address(String street, String city) {
this.street = street;

40
src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.data.querydsl.binding;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
import static org.springframework.test.util.ReflectionTestUtils.*;
import java.util.List;
@@ -28,14 +28,12 @@ import org.springframework.data.querydsl.QUser;
import org.springframework.data.querydsl.SimpleEntityPathResolver;
import org.springframework.data.querydsl.User;
import org.springframework.data.querydsl.Users;
import org.springframework.data.querydsl.binding.QuerydslBindings;
import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder;
import org.springframework.data.querydsl.binding.SingleValueBinding;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import com.mysema.query.collections.CollQueryFactory;
import com.mysema.query.types.Constant;
import com.mysema.query.types.Predicate;
import com.mysema.query.types.path.StringPath;
@@ -153,4 +151,38 @@ public class QuerydslPredicateBuilderUnitTests {
builder.getPredicate(USER_TYPE, values, bindings);
}
/**
* @see DATACMNS-734
*/
@Test
@SuppressWarnings("unchecked")
public void resolvesCommaSeparatedArgumentToArrayCorrectly() {
values.add("address.lonLat", "40.740337,-73.995146");
Predicate predicate = builder.getPredicate(USER_TYPE, values, DEFAULT_BINDINGS);
Constant<Object> constant = (Constant<Object>) ((List<?>) getField(getField(predicate, "mixin"), "args")).get(1);
assertThat(constant.getConstant(), instanceOf(Double[].class));
assertThat((Double[]) (constant.getConstant()), arrayContaining(40.740337D, -73.995146D));
}
/**
* @see DATACMNS-734
*/
@Test
@SuppressWarnings("unchecked")
public void leavesCommaSeparatedArgumentUntouchedWhenTargetIsNotAnArray() {
values.add("address.city", "rivers,two");
Predicate predicate = builder.getPredicate(USER_TYPE, values, DEFAULT_BINDINGS);
Constant<Object> constant = (Constant<Object>) ((List<?>) getField(getField(predicate, "mixin"), "args")).get(1);
assertThat(constant.getConstant(), instanceOf(String.class));
assertThat((String) (constant.getConstant()), equalTo("rivers,two"));
}
}