Simplify computation

restructure key computation parts.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java

@@ -1470,26 +1470,21 @@ protected String mapPropertyName(MongoPersistentProperty property) {
 					return mappedName.toString();
 				}
 
-				int i = 1;
-				String nextToken = pathParts.get(currentIndex + i);
-				if(isPositionalParameter(nextToken)) {
-					while (isPositionalParameter(nextToken)) {
-						mappedName.append(".").append(nextToken);
-						i++;
-						nextToken = currentIndex + i < pathParts.size() ?  pathParts.get(currentIndex + i) : "";
-					}
-					currentIndex += i;
-					return mappedName.toString();
-				}
-
+				String nextToken = nextToken();
 				if (property.isMap()) {
 
 					mappedName.append(".").append(nextToken);
 					currentIndex += 2;
 					return mappedName.toString();
 				}
 
-				currentIndex++;
+				int i = 1;
+				while (isPositionalParameter(nextToken)) {
+					mappedName.append(".").append(nextToken);
+					i++;
+					nextToken = currentIndex + i < pathParts.size() ?  pathParts.get(currentIndex + i) : "";
+				}
+				currentIndex += i;
 				return mappedName.toString();
 			}