From 461b5f3568275c575513e52e0b1d8bdccaa63b15 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 4 Mar 2019 16:10:43 +0100
Subject: [PATCH] DATAMONGO-2054 - Polishing.

Slight naming tweaks.

Original pull request: #653.
---
 .../mongodb/core/convert/QueryMapper.java     | 20 ++++++++++++++-----
 .../core/convert/UpdateMapperUnitTests.java   |  6 +++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
index a39003ae7..8ed91eede 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
@@ -15,8 +15,17 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,6 +33,7 @@ import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
+
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.Example;
@@ -760,7 +770,7 @@ public class QueryMapper {
 	 */
 	protected static class Field {
 
-		protected static final Pattern POSITIONAL_PARM = Pattern.compile("\\$\\[.*\\]");
+		protected static final Pattern POSITIONAL_OPERATOR = Pattern.compile("\\$\\[.*\\]");
 
 		private static final String ID_KEY = "_id";
 
@@ -852,7 +862,7 @@ public class QueryMapper {
 
 		/**
 		 * Returns whether the field references a {@link java.util.Map}.
-		 * 
+		 *
 		 * @return {@literal true} if property information is available and references a {@link java.util.Map}.
 		 * @see PersistentProperty#isMap()
 		 */
@@ -1035,7 +1045,7 @@ public class QueryMapper {
 			try {
 
 				String rawPath = pathExpression.replaceAll("\\.\\d+", "") //
-						.replaceAll(POSITIONAL_PARM.pattern(), "");
+						.replaceAll(POSITIONAL_OPERATOR.pattern(), "");
 
 				PropertyPath path = PropertyPath.from(rawPath, entity.getTypeInformation());
 
@@ -1186,7 +1196,7 @@ public class QueryMapper {
 					return true;
 				}
 
-				Matcher matcher = POSITIONAL_PARM.matcher(partial);
+				Matcher matcher = POSITIONAL_OPERATOR.matcher(partial);
 				if (matcher.find()) {
 					return true;
 				}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
index 476e380b4..6f6f81d52 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
@@ -1035,13 +1035,13 @@ public class UpdateMapperUnitTests {
 		Update update = new Update().inc("grades.$[]", 10);
 
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
-				context.getPersistentEntity(EntityWithListOfSimple.class));
+				context.getPersistentEntity(EntityWithListOfIntegers.class));
 
 		assertThat(mappedUpdate).isEqualTo(new Document("$inc", new Document("grades.$[]", 10)));
 	}
 
 	@Test // DATAMONGO-2054
-	public void mappingShouldAllowPositionAllParameterWhenPopertyHasExplicitFieldName() {
+	public void mappingShouldAllowPositionAllParameterWhenPropertyHasExplicitFieldName() {
 
 		Update update = new Update().inc("list.$[]", 10);
 
@@ -1267,7 +1267,7 @@ public class UpdateMapperUnitTests {
 		List<EntityWithAliasedObject> list;
 	}
 
-	static class EntityWithListOfSimple {
+	static class EntityWithListOfIntegers {
 		List<Integer> grades;
 	}