DATAMONGO-2312 - Polishing.

Fix spelling and add missing operator to Sum aggregation operation.

Original pull request: #770.

Author: christophstrobl

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

@@ -213,6 +213,20 @@ public Sum and(AggregationExpression expression) {
 			return new Sum(append(expression));
 		}
 
+		/**
+		 * Creates new {@link Sum} with all previously added arguments appending the given one. <br />
+		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
+		 *
+		 * @param value the value to add.
+		 * @return new instance of {@link Sum}.
+		 * @since 2.2
+		 */
+		public Sum and(Number value) {
+
+			Assert.notNull(value, "Value must not be null!");
+			return new Sum(append(value));
+		}
+
 		/* (non-Javadoc)
 		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
 		 */

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java

@@ -127,7 +127,7 @@ public void arithmeticProjectionOperationWithoutAlias() {
 		ProjectionOperationBuilder operation = new ProjectionOperation().and(fieldName).plus(1);
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
-		Document oper = exctractOperation(fieldName, projectClause);
+		Document oper = extractOperation(fieldName, projectClause);
 
 		assertThat(oper.containsKey(ADD)).isTrue();
 		assertThat(oper.get(ADD)).isEqualTo(Arrays.<Object> asList("$a", 1));
@@ -142,7 +142,7 @@ public void arithmeticProjectionOperationPlus() {
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
 
-		Document oper = exctractOperation(fieldAlias, projectClause);
+		Document oper = extractOperation(fieldAlias, projectClause);
 		assertThat(oper.containsKey(ADD)).isTrue();
 		assertThat(oper.get(ADD)).isEqualTo(Arrays.<Object> asList("$a", 1));
 	}
@@ -155,7 +155,7 @@ public void arithmeticProjectionOperationMinus() {
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).minus(1).as(fieldAlias);
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
-		Document oper = exctractOperation(fieldAlias, projectClause);
+		Document oper = extractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsKey(SUBTRACT)).isTrue();
 		assertThat(oper.get(SUBTRACT)).isEqualTo(Arrays.<Object> asList("$a", 1));
@@ -169,7 +169,7 @@ public void arithmeticProjectionOperationMultiply() {
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).multiply(1).as(fieldAlias);
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
-		Document oper = exctractOperation(fieldAlias, projectClause);
+		Document oper = extractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsKey(MULTIPLY)).isTrue();
 		assertThat(oper.get(MULTIPLY)).isEqualTo(Arrays.<Object> asList("$a", 1));
@@ -183,7 +183,7 @@ public void arithmeticProjectionOperationDivide() {
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).divide(1).as(fieldAlias);
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
-		Document oper = exctractOperation(fieldAlias, projectClause);
+		Document oper = extractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsKey(DIVIDE)).isTrue();
 		assertThat(oper.get(DIVIDE)).isEqualTo(Arrays.<Object> asList("$a", 1));
@@ -202,7 +202,7 @@ public void arithmeticProjectionOperationMod() {
 		ProjectionOperation operation = new ProjectionOperation().and(fieldName).mod(3).as(fieldAlias);
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document projectClause = DocumentTestUtils.getAsDocument(document, PROJECT);
-		Document oper = exctractOperation(fieldAlias, projectClause);
+		Document oper = extractOperation(fieldAlias, projectClause);
 
 		assertThat(oper.containsKey(MOD)).isTrue();
 		assertThat(oper.get(MOD)).isEqualTo(Arrays.<Object> asList("$a", 3));
@@ -328,7 +328,7 @@ public void shouldRenderDateTimeFragmentExtractionsForSimpleFieldProjectionsCorr
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		assertThat(document).isNotNull();
 
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 
 		assertThat(projected.get("hour")).isEqualTo(new Document("$hour", Arrays.asList("$date")));
 		assertThat(projected.get("min")).isEqualTo(new Document("$minute", Arrays.asList("$date")));
@@ -354,7 +354,7 @@ public void shouldRenderDateTimeFragmentExtractionsForExpressionProjectionsCorre
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		assertThat(document).isNotNull();
 
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 		assertThat(projected.get("dayOfYearPlus1Day")).isEqualTo(
 				new Document("$dayOfYear", Arrays.asList(new Document("$add", Arrays.<Object> asList("$date", 86400000)))));
 	}
@@ -370,7 +370,7 @@ public void shouldRenderSizeExpressionInProjection() {
 
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 		assertThat(projected.get("tags_count")).isEqualTo(new Document("$size", Arrays.asList("$tags")));
 	}
 
@@ -384,7 +384,7 @@ public void shouldRenderGenericSizeExpressionInProjection() {
 
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 		assertThat(projected.get("tags_count")).isEqualTo(new Document("$size", Arrays.asList("$tags")));
 	}
 
@@ -394,7 +394,7 @@ public void shouldRenderSliceCorrectly() throws Exception {
 		ProjectionOperation operation = Aggregation.project().and("field").slice(10).as("renamed");
 
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 
 		assertThat(projected.get("renamed")).isEqualTo(new Document("$slice", Arrays.<Object> asList("$field", 10)));
 	}
@@ -405,7 +405,7 @@ public void shouldRenderSliceWithPositionCorrectly() throws Exception {
 		ProjectionOperation operation = Aggregation.project().and("field").slice(10, 5).as("renamed");
 
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
-		Document projected = exctractOperation("$project", document);
+		Document projected = extractOperation("$project", document);
 
 		assertThat(projected.get("renamed")).isEqualTo(new Document("$slice", Arrays.<Object> asList("$field", 5, 10)));
 	}
@@ -2219,7 +2219,7 @@ public void nestedMappedFieldReferenceInArrayField() {
 				"{ $project: { \"author\" : 1,  \"myArray\" : [ \"$ti_t_le\", \"plain - string\", { \"$sum\" : [\"$ti_t_le\", 10] } ] } } ] }"));
 	}
 
-	private static Document exctractOperation(String field, Document fromProjectClause) {
+	private static Document extractOperation(String field, Document fromProjectClause) {
 		return (Document) fromProjectClause.get(field);
 	}