diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph index 8497439ea..3b2d2dff1 100644 --- a/Spring Data Commons.sonargraph +++ b/Spring Data Commons.sonargraph @@ -13,7 +13,15 @@ + + + + + + + + @@ -22,6 +30,7 @@ + @@ -88,6 +97,12 @@ + + + + + + @@ -181,11 +196,6 @@ - - - - - @@ -409,58 +419,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/springframework/data/web/querydsl/MultiValueBinding.java b/src/main/java/org/springframework/data/querydsl/binding/MultiValueBinding.java similarity index 97% rename from src/main/java/org/springframework/data/web/querydsl/MultiValueBinding.java rename to src/main/java/org/springframework/data/querydsl/binding/MultiValueBinding.java index 87c0620ad..24ed4b900 100644 --- a/src/main/java/org/springframework/data/web/querydsl/MultiValueBinding.java +++ b/src/main/java/org/springframework/data/querydsl/binding/MultiValueBinding.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import java.util.Collection; diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslBinderCustomizer.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBinderCustomizer.java similarity index 94% rename from src/main/java/org/springframework/data/web/querydsl/QuerydslBinderCustomizer.java rename to src/main/java/org/springframework/data/querydsl/binding/QuerydslBinderCustomizer.java index a4a3d9a6e..62369f9e5 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslBinderCustomizer.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBinderCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import com.mysema.query.types.EntityPath; diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslBindings.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java similarity index 98% rename from src/main/java/org/springframework/data/web/querydsl/QuerydslBindings.java rename to src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java index 9b708be37..ad8da4cf4 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslBindings.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import java.util.Arrays; import java.util.Collection; @@ -169,7 +169,7 @@ public class QuerydslBindings { * @return */ @SuppressWarnings("unchecked") - , T> MultiValueBinding getBindingForPath(PropertyPath path) { + public , T> MultiValueBinding getBindingForPath(PropertyPath path) { Assert.notNull(path, "PropertyPath must not be null!"); diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslDefaultBinding.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java similarity index 98% rename from src/main/java/org/springframework/data/web/querydsl/QuerydslDefaultBinding.java rename to src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java index 29b3c8432..41b887860 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslDefaultBinding.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslDefaultBinding.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import java.util.Collection; diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilder.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java similarity index 99% rename from src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilder.java rename to src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java index 8049c4d9b..9175963d6 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilder.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/main/java/org/springframework/data/web/querydsl/SingleValueBinding.java b/src/main/java/org/springframework/data/querydsl/binding/SingleValueBinding.java similarity index 96% rename from src/main/java/org/springframework/data/web/querydsl/SingleValueBinding.java rename to src/main/java/org/springframework/data/querydsl/binding/SingleValueBinding.java index c2c70ca59..5996411da 100644 --- a/src/main/java/org/springframework/data/web/querydsl/SingleValueBinding.java +++ b/src/main/java/org/springframework/data/querydsl/binding/SingleValueBinding.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import com.mysema.query.types.Path; import com.mysema.query.types.Predicate; diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java index 40c0b69bd..ef3a48dfa 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java +++ b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java @@ -20,6 +20,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; + /** * Annotation to customize the binding of HTTP request parameters to a Querydsl {@link com.mysema.query.types.Predicate} * in Spring MVC handler methods. diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java index 62c146693..82687a7b3 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java @@ -30,6 +30,9 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.querydsl.EntityPathResolver; import org.springframework.data.querydsl.SimpleEntityPathResolver; +import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; +import org.springframework.data.querydsl.binding.QuerydslBindings; +import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder; import org.springframework.data.repository.support.Repositories; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; diff --git a/src/test/java/org/springframework/data/web/querydsl/QuerydslBindingsUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/web/querydsl/QuerydslBindingsUnitTests.java rename to src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java index a31ad1bcf..4be21425f 100644 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslBindingsUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -25,6 +25,10 @@ import org.springframework.data.mapping.PropertyPath; import org.springframework.data.querydsl.QUser; import org.springframework.data.querydsl.SimpleEntityPathResolver; import org.springframework.data.querydsl.User; +import org.springframework.data.querydsl.binding.MultiValueBinding; +import org.springframework.data.querydsl.binding.QuerydslBindings; +import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder; +import org.springframework.data.querydsl.binding.SingleValueBinding; import org.springframework.test.util.ReflectionTestUtils; import com.mysema.query.types.Path; diff --git a/src/test/java/org/springframework/data/web/querydsl/QuerydslDefaultBindingUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/web/querydsl/QuerydslDefaultBindingUnitTests.java rename to src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java index 392379008..062234219 100644 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslDefaultBindingUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslDefaultBindingUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -27,6 +27,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.springframework.data.querydsl.QUser; +import org.springframework.data.querydsl.binding.QuerydslDefaultBinding; import com.mysema.query.types.Expression; import com.mysema.query.types.Predicate; diff --git a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilderUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java similarity index 94% rename from src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilderUnitTests.java rename to src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java index 7ab82bd89..87b5be713 100644 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateBuilderUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.web.querydsl; +package org.springframework.data.querydsl.binding; import static org.hamcrest.Matchers.*; import static org.hamcrest.core.Is.is; @@ -28,6 +28,9 @@ 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; diff --git a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java index 4ed672fce..b829af7a3 100644 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java @@ -33,9 +33,15 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.mapping.PropertyPath; import org.springframework.data.querydsl.QUser; import org.springframework.data.querydsl.User; +import org.springframework.data.querydsl.binding.MultiValueBinding; +import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; +import org.springframework.data.querydsl.binding.QuerydslBindings; +import org.springframework.data.querydsl.binding.SingleValueBinding; import org.springframework.data.repository.support.Repositories; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; +import org.springframework.data.web.querydsl.QuerydslPredicate; +import org.springframework.data.web.querydsl.QuerydslPredicateArgumentResolver; import org.springframework.hateoas.Resource; import org.springframework.http.HttpEntity; import org.springframework.http.ResponseEntity;