DATAJDBC-518 - Polishing.

Tweak Javadoc to reflect the used type. Create Criteria objects via Criteria.from(…) to expose the Criteria API without the need of casting.

Original pull request: #205.

Author: mp911de

spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Criteria.java

@@ -113,7 +113,7 @@ public static Criteria empty() {
 	 *
 	 * @return new {@link Criteria}.
 	 */
-	public static CriteriaDefinition from(CriteriaDefinition... criteria) {
+	public static Criteria from(Criteria... criteria) {
 
 		Assert.notNull(criteria, "Criteria must not be null");
 		Assert.noNullElements(criteria, "Criteria must not contain null elements");
@@ -126,7 +126,7 @@ public static CriteriaDefinition from(CriteriaDefinition... criteria) {
 	 *
 	 * @return new {@link Criteria}.
 	 */
-	public static CriteriaDefinition from(List<CriteriaDefinition> criteria) {
+	public static Criteria from(List<Criteria> criteria) {
 
 		Assert.notNull(criteria, "Criteria must not be null");
 		Assert.noNullElements(criteria, "Criteria must not contain null elements");
@@ -168,7 +168,7 @@ public CriteriaStep and(String column) {
 		SqlIdentifier identifier = SqlIdentifier.unquoted(column);
 		return new DefaultCriteriaStep(identifier) {
 			@Override
-			protected Criteria createCriteria(Comparator comparator, Object value) {
+			protected Criteria createCriteria(Comparator comparator, @Nullable Object value) {
 				return new Criteria(Criteria.this, Combinator.AND, Collections.emptyList(), identifier, comparator, value);
 			}
 		};
@@ -194,11 +194,12 @@ public Criteria and(CriteriaDefinition criteria) {
 	 * @param criteria criteria objects.
 	 * @return a new {@link Criteria} object.
 	 */
-	public Criteria and(List<CriteriaDefinition> criteria) {
+	@SuppressWarnings("unchecked")
+	public Criteria and(List<? extends CriteriaDefinition> criteria) {
 
 		Assert.notNull(criteria, "Criteria must not be null!");
 
-		return new Criteria(Criteria.this, Combinator.AND, criteria);
+		return new Criteria(Criteria.this, Combinator.AND, (List<CriteriaDefinition>) criteria);
 	}
 
 	/**
@@ -214,7 +215,7 @@ public CriteriaStep or(String column) {
 		SqlIdentifier identifier = SqlIdentifier.unquoted(column);
 		return new DefaultCriteriaStep(identifier) {
 			@Override
-			protected Criteria createCriteria(Comparator comparator, Object value) {
+			protected Criteria createCriteria(Comparator comparator, @Nullable Object value) {
 				return new Criteria(Criteria.this, Combinator.OR, Collections.emptyList(), identifier, comparator, value);
 			}
 		};
@@ -241,11 +242,12 @@ public Criteria or(CriteriaDefinition criteria) {
 	 * @return a new {@link Criteria} object.
 	 * @since 1.1
 	 */
-	public Criteria or(List<CriteriaDefinition> criteria) {
+	@SuppressWarnings("unchecked")
+	public Criteria or(List<? extends CriteriaDefinition> criteria) {
 
 		Assert.notNull(criteria, "Criteria must not be null!");
 
-		return new Criteria(Criteria.this, Combinator.OR, criteria);
+		return new Criteria(Criteria.this, Combinator.OR, (List<CriteriaDefinition>) criteria);
 	}
 
 	/**
@@ -336,6 +338,7 @@ public Combinator getCombinator() {
 		return combinator;
 	}
 
+	@Override
 	public List<CriteriaDefinition> getGroup() {
 		return group;
 	}
@@ -858,7 +861,7 @@ public Criteria isFalse() {
 			return createCriteria(Comparator.IS_FALSE, null);
 		}
 
-		protected Criteria createCriteria(Comparator comparator, Object value) {
+		protected Criteria createCriteria(Comparator comparator, @Nullable Object value) {
 			return new Criteria(this.property, comparator, value);
 		}
 	}

spring-data-relational/src/main/java/org/springframework/data/relational/core/query/CriteriaDefinition.java

@@ -33,18 +33,19 @@
 public interface CriteriaDefinition {
 
 	/**
-	 * Static factory method to create an empty Criteria.
+	 * Static factory method to create an empty {@link CriteriaDefinition}.
 	 *
-	 * @return an empty {@link Criteria}.
+	 * @return an empty {@link CriteriaDefinition}.
 	 */
 	static CriteriaDefinition empty() {
 		return Criteria.EMPTY;
 	}
 
 	/**
-	 * Create a new {@link Criteria} and combine it as group with {@code AND} using the provided {@link List Criterias}.
+	 * Create a new {@link CriteriaDefinition} and combine it as group with {@code AND} using the provided {@link List
+	 * Criterias}.
 	 *
-	 * @return new {@link Criteria}.
+	 * @return new {@link CriteriaDefinition}.
 	 */
 	static CriteriaDefinition from(CriteriaDefinition... criteria) {
 
@@ -55,12 +56,13 @@ static CriteriaDefinition from(CriteriaDefinition... criteria) {
 	}
 
 	/**
-	 * Create a new {@link Criteria} and combine it as group with {@code AND} using the provided {@link List Criterias}.
+	 * Create a new {@link CriteriaDefinition} and combine it as group with {@code AND} using the provided {@link List
+	 * Criterias}.
 	 *
-	 * @return new {@link Criteria}.
+	 * @return new {@link CriteriaDefinition}.
 	 * @since 1.1
 	 */
-	static CriteriaDefinition from(List<CriteriaDefinition> criteria) {
+	static CriteriaDefinition from(List<? extends CriteriaDefinition> criteria) {
 
 		Assert.notNull(criteria, "Criteria must not be null");
 		Assert.noNullElements(criteria, "Criteria must not contain null elements");