Hacking: More intermediate types for path mapping

fix issues with property path vs mongo path mapping by introducing segments that can represent various combinations

Author: christophstrobl

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

@@ -36,7 +36,6 @@
 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.annotation.Reference;
@@ -57,14 +56,9 @@
 import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter.NestedDocument;
 import org.springframework.data.mongodb.core.mapping.FieldName;
-import org.springframework.data.mongodb.core.mapping.MongoPath.MappedMongoPath;
-import org.springframework.data.mongodb.core.mapping.MongoPath.MappedMongoPath.MappedSegment;
 import org.springframework.data.mongodb.core.mapping.MongoPath;
 import org.springframework.data.mongodb.core.mapping.MongoPath.PathSegment;
 import org.springframework.data.mongodb.core.mapping.MongoPaths;
-import org.springframework.data.mongodb.core.mapping.MongoPath.RawMongoPath;
-import org.springframework.data.mongodb.core.mapping.MongoPath.RawMongoPath.Segment;
-import org.springframework.data.mongodb.core.mapping.MongoPath.RawMongoPath.TargetType;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Query;
@@ -1140,7 +1134,8 @@ public Class<?> getFieldType() {
 	 */
 	@Nullable
 	public PropertyPath toPropertyPath(
-		MongoPath mongoPath, MongoPersistentEntity<?> persistentEntity) {
+
+			MongoPath mongoPath, MongoPersistentEntity<?> persistentEntity) {
 
 		StringBuilder path = new StringBuilder();
 		MongoPersistentEntity<?> entity = persistentEntity;
@@ -1184,7 +1179,6 @@ public PropertyPath toPropertyPath(
 		return PropertyPath.from(path.toString(), persistentEntity.getType());
 	}
 
-
 	/**
 	 * Extension of {@link Field} to be backed with mapping metadata.
 	 *
@@ -1331,7 +1325,6 @@ public String getMappedKey() {
 			return name;
 		}
 
-
 		@Nullable
 		protected PersistentPropertyPath<MongoPersistentProperty> getPath() {
 			return propertyPath;
@@ -1351,7 +1344,7 @@ private PersistentPropertyPath<MongoPersistentProperty> getPath(MongoPath mongoP
 						PropertyPath.from(Pattern.quote(sourceProperty.getName()), entity.getTypeInformation()));
 			}
 
-			PropertyPath path = toPropertyPath(mongoPath, entity);
+			PropertyPath path = paths.mappedPath(mongoPath, entity.getTypeInformation()).propertyPath();
 
 			if (path == null || isPathToJavaLangClassProperty(path)) {
 				return null;