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

DATACMNS-669 - Ignore non-reachable paths for Querydsl parameter binding.

Browse Source 
We now ignore invalid PropertyPaths on property binding to Querydsl Predicates. Those may occur since the request also holds non-property-related arguments, such as pagination parameters.

Fixed two potential NullPointerExceptions along the way since we no longer depend on the presence of @QuerydslPredicate.

Original pull request: #132.
This commit is contained in:
Christoph Strobl
2015-07-15 09:51:55 +02:00
committed by Oliver Gierke
parent 5db3def79b
commit dc49101850
4 changed files with 69 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.data.web.querydsl;
import static org.hamcrest.core.Is.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -25,7 +25,10 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.querydsl.QUser;
import org.springframework.data.querydsl.User;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.context.request.ServletWebRequest;
import com.mysema.query.types.Predicate;
@@ -202,6 +205,31 @@ public class QuerydslPredicateArgumentResolverUnitTests {
assertThat(predicate.toString(), is(QUser.user.inceptionYear.eq(973L).toString()));
}
/**
* @see DATACMNS-669
*/
@Test
public void createBindingContextShouldUseQuerydslPredicationAnntotationDefaultBindingIfNotAnnotated() {
Object bindings = ReflectionTestUtils.invokeMethod(resolver, "createBindings",
getMethodParameterFor("predicateWithoutAnnotation", Predicate.class));
assertThat(bindings, is(instanceOf(QuerydslBindings.class)));
}
/**
* @see DATACMNS-669
*/
@Test
@SuppressWarnings("rawtypes")
public void extractTypeInformationShouldUseTypeExtractedFromMethodReturnTypeIfPredicateNotAnnotated() {
TypeInformation<?> type = ReflectionTestUtils.invokeMethod(resolver, "extractTypeInfo",
getMethodParameterFor("predicateWithoutAnnotation", Predicate.class));
assertThat(type, is((TypeInformation) ClassTypeInformation.from(User.class)));
}
private static MethodParameter getMethodParameterFor(String methodName, Class<?>... args) throws RuntimeException {
try {
@@ -249,5 +277,4 @@ public class QuerydslPredicateArgumentResolverUnitTests {
User specificFind(@QuerydslPredicate(bindings = SpecificBinding.class) Predicate predicate);
}
}

15
src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilderUnitTests.java
View File

@@ -30,6 +30,8 @@ import org.springframework.data.querydsl.QUser;
import org.springframework.data.querydsl.User;
import org.springframework.data.querydsl.Users;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import com.mysema.query.BooleanBuilder;
import com.mysema.query.collections.CollQueryFactory;
@@ -111,4 +113,17 @@ public class QuerydslPredicateBuilderUnitTests {
assertThat(result, hasSize(1));
assertThat(result, hasItem(Users.CHRISTOPH));
}
@Test
public void ignoresNonDomainTypeProperties() {
MultiValueMap<String, String> values = new LinkedMultiValueMap<String, String>();
values.add("firstname", "rand");
values.add("lastname".toUpperCase(), "al'thor");
Predicate predicate = builder.getPredicate(new MutablePropertyValues(values), new QuerydslBindings(),
ClassTypeInformation.from(User.class));
assertThat(predicate, is((Predicate) QUser.user.firstname.eq("rand")));
}
}