DATACMNS-760 - Removed cyclic dependency in Querydsl packages.

Moved @QuerydslPredicate into the non-web-related Querydsl package to avoid a cyclic dependency.

src/main/java/org/springframework/data/web/querydsl/QuerydslPredicate.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.web.querydsl;
-
-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.
- * 
- * @author Christoph Strobl
- * @author Oliver Gierke
- * @since 1.11
- */
-@Target({ ElementType.PARAMETER, ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface QuerydslPredicate {
-
-	/**
-	 * The root type to create the {@link com.mysema.query.types.Predicate}. Specify this explictly if the type is not
-	 * contained in the controller method's return type.
-	 * 
-	 * @return
-	 */
-	Class<?>root() default Object.class;
-
-	/**
-	 * To customize the way individual properties' values should be bound to the predicate a
-	 * {@link QuerydslBinderCustomizer} can be specified here. We'll try to obtain a Spring bean of this type but fall
-	 * back to a plain instantiation if no bean is found in the current
-	 * {@link org.springframework.beans.factory.BeanFactory}.
-	 * 
-	 * @return
-	 */
-	@SuppressWarnings("rawtypes")
-	Class<? extends QuerydslBinderCustomizer>bindings() default QuerydslBinderCustomizer.class;
-}

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;