DATAMONGO-1564 - Polishing.

Fix JavaDoc references and minor a import formatting issue.

Original pull request: #429.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java

@@ -21,9 +21,10 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 
+import org.springframework.util.ObjectUtils;
+
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
-import org.springframework.util.ObjectUtils;
 
 /**
  * @author Christoph Strobl
@@ -45,6 +46,7 @@ public DBObject toDbObject(AggregationOperationContext context) {
 		return toDbObject(this.value, context);
 	}
 
+	@SuppressWarnings("unchecked")
 	public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 		Object valueToUse;
@@ -80,6 +82,7 @@ protected static List<Field> asFields(String... fieldRefs) {
 		return Fields.fields(fieldRefs).asList();
 	}
 
+	@SuppressWarnings("unchecked")
 	private Object unpack(Object value, AggregationOperationContext context) {
 
 		if (value instanceof AggregationExpression) {
@@ -123,13 +126,13 @@ protected List<Object> append(Object value) {
 		return Arrays.asList(this.value, value);
 	}
 
+	@SuppressWarnings("unchecked")
 	protected java.util.Map<String, Object> append(String key, Object value) {
 
 		if (!(this.value instanceof java.util.Map)) {
 			throw new IllegalArgumentException("o_O");
 		}
-		java.util.Map<String, Object> clone = new LinkedHashMap<String, Object>(
-				(java.util.Map<String, Object>) this.value);
+		java.util.Map<String, Object> clone = new LinkedHashMap<String, Object>((java.util.Map<String, Object>) this.value);
 		clone.put(key, value);
 		return clone;
 
@@ -143,7 +146,7 @@ protected List<Object> values() {
 		if (value instanceof java.util.Map) {
 			return new ArrayList<Object>(((java.util.Map) value).values());
 		}
-		return new ArrayList<Object>(Arrays.asList(value));
+		return new ArrayList<Object>(Collections.singletonList(value));
 	}
 
 	protected abstract String getMongoMethod();

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java

@@ -44,7 +44,7 @@ public static AccumulatorOperatorFactory valueOf(String fieldReference) {
 	/**
 	 * Take the numeric value referenced resulting from given {@link AggregationExpression}.
 	 *
-	 * @param fieldReference must not be {@literal null}.
+	 * @param expression must not be {@literal null}.
 	 * @return
 	 */
 	public static AccumulatorOperatorFactory valueOf(AggregationExpression expression) {
@@ -72,7 +72,7 @@ public AccumulatorOperatorFactory(String fieldReference) {
 		}
 
 		/**
-		 * Creates new {@link ArrayOperatorFactory} for given {@link AggregationExpression}.
+		 * Creates new {@link AccumulatorOperatorFactory} for given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
 		 */
@@ -84,7 +84,7 @@ public AccumulatorOperatorFactory(AggregationExpression expression) {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and calculates and
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates and
 		 * returns the sum.
 		 *
 		 * @return
@@ -94,7 +94,7 @@ public Sum sum() {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and returns the
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * average value.
 		 *
 		 * @return
@@ -104,7 +104,7 @@ public Avg avg() {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and returns the
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * maximum value.
 		 *
 		 * @return
@@ -114,7 +114,7 @@ public Max max() {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and returns the
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * minimum value.
 		 *
 		 * @return
@@ -124,7 +124,7 @@ public Min min() {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and calculates the
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
 		 * population standard deviation of the input values.
 		 *
 		 * @return
@@ -134,7 +134,7 @@ public StdDevPop stdDevPop() {
 		}
 
 		/**
-		 * Creates new {@link AggregationExpressions} that takes the associated numeric value expression and calculates the
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
 		 * sample standard deviation of the input values.
 		 *
 		 * @return
@@ -215,9 +215,10 @@ public Sum and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
@@ -297,9 +298,10 @@ public Avg and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
@@ -379,9 +381,10 @@ public Max and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
@@ -461,9 +464,10 @@ public Min and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
@@ -543,9 +547,10 @@ public StdDevPop and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {
@@ -625,9 +630,10 @@ public StdDevSamp and(AggregationExpression expression) {
 		}
 
 		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpressions.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDbObject(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */
 		@Override
+		@SuppressWarnings("unchecked")
 		public DBObject toDbObject(Object value, AggregationOperationContext context) {
 
 			if (value instanceof List) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java

@@ -31,7 +31,7 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @since 1.7
- * @deprecated since 1.10. Please use {@link AggregationExpressions} instead.
+ * @deprecated since 1.10. Please use {@link ArithmeticOperators} and {@link ComparisonOperators} instead.
  */
 @Deprecated
 public enum AggregationFunctionExpressions {