diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java index 5c8211edf..1718683e5 100644 --- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactory.java @@ -26,7 +26,6 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.data.querydsl.EntityPathResolver; import org.springframework.data.repository.support.Repositories; import org.springframework.data.util.TypeInformation; -import org.springframework.data.web.querydsl.QuerydslPredicate; import org.springframework.util.Assert; import org.springframework.util.ConcurrentReferenceHashMap; diff --git a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicate.java similarity index 93% rename from src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java rename to src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicate.java index ef3a48dfa..d8167c61c 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java +++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicate.java @@ -13,15 +13,13 @@ * 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.annotation.ElementType; 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 1287f28ae..2a2395acc 100644 --- a/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolver.java @@ -24,6 +24,7 @@ import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; import org.springframework.data.querydsl.binding.QuerydslBindings; import org.springframework.data.querydsl.binding.QuerydslBindingsFactory; +import org.springframework.data.querydsl.binding.QuerydslPredicate; import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java index 5912ddd93..69dd1ec18 100644 --- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslBindingsFactoryUnitTests.java @@ -33,7 +33,6 @@ import org.springframework.data.querydsl.User; 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.test.util.ReflectionTestUtils; import org.springframework.web.servlet.ModelAndView; 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 bf0b8fa82..98baeb3a6 100644 --- a/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java @@ -32,6 +32,7 @@ import org.springframework.data.querydsl.User; import org.springframework.data.querydsl.binding.QuerydslBinderCustomizer; import org.springframework.data.querydsl.binding.QuerydslBindings; import org.springframework.data.querydsl.binding.QuerydslBindingsFactory; +import org.springframework.data.querydsl.binding.QuerydslPredicate; import org.springframework.data.querydsl.binding.SingleValueBinding; import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation;