DATAMONGO-1809 - Fix positional parameter detection for PropertyPaths.

We now make sure to capture all digits for positional parameters.

Original pull request: spring-projects#508.

Author: christophstrobl

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

@@ -930,7 +930,7 @@ private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpre
 
 			try {
 
-				PropertyPath path = PropertyPath.from(pathExpression.replaceAll("\\.\\d", ""), entity.getTypeInformation());
+				PropertyPath path = PropertyPath.from(pathExpression.replaceAll("\\.\\d+", ""), entity.getTypeInformation());
 				PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(path);
 
 				Iterator<MongoPersistentProperty> iterator = propertyPath.iterator();

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java

@@ -21,6 +21,9 @@
 import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
 import static org.springframework.data.mongodb.test.util.IsBsonObject.*;
 
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.Collections;
@@ -677,6 +680,23 @@ public void mappingShouldRetainTypeInformationOfNestedListWhenUpdatingConcreteyP
 				.containing("$set.concreteTypeWithListAttributeOfInterfaceType.models.[0]._class", ModelImpl.class.getName()));
 	}
 
+	@Test // DATAMONGO-1809
+	public void pathShouldIdentifyPositionalParameterWithMoreThanOneDigit() {
+
+		Document at2digitPosition = mapper.getMappedObject(new Update()
+				.addToSet("concreteInnerList.10.concreteTypeList", new SomeInterfaceImpl("szeth")).getUpdateObject(),
+				context.getPersistentEntity(Outer.class));
+
+		Document at3digitPosition = mapper.getMappedObject(new Update()
+				.addToSet("concreteInnerList.123.concreteTypeList", new SomeInterfaceImpl("lopen")).getUpdateObject(),
+				context.getPersistentEntity(Outer.class));
+
+		assertThat(at2digitPosition, is(equalTo(new Document("$addToSet",
+				new Document("concreteInnerList.10.concreteTypeList", new Document("value", "szeth"))))));
+		assertThat(at3digitPosition, is(equalTo(new Document("$addToSet",
+				new Document("concreteInnerList.123.concreteTypeList", new Document("value", "lopen"))))));
+	}
+
 	@Test // DATAMONGO-1236
 	public void mappingShouldRetainTypeInformationForObjectValues() {
 
@@ -1254,6 +1274,7 @@ static class Outer {
 	static class ConcreteInner {
 		List<SomeInterfaceType> interfaceTypeList;
 		List<SomeAbstractType> abstractTypeList;
+		List<SomeInterfaceImpl> concreteTypeList;
 	}
 
 	interface SomeInterfaceType {
@@ -1264,8 +1285,11 @@ static abstract class SomeAbstractType {
 
 	}
 
+	@AllArgsConstructor
+	@NoArgsConstructor
 	static class SomeInterfaceImpl extends SomeAbstractType implements SomeInterfaceType {
 
+		String value;
 	}
 
 }