Fix property value conversion in query mapper for nested values.

Author: christophstrobl

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

@@ -463,6 +463,15 @@ public <T> T getPropertyValue(MongoPersistentProperty property) {
 				return collection.stream().map(it -> valueConverter.write(it, conversionContext)).collect(Collectors.toList());
 			}
 
+			if(!documentField.getProperty().isMap() && sourceValue instanceof Document document) {
+				return new Document(document.entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey(), entry -> {
+					if(isKeyword(entry.getKey())) {
+						return getMappedValue(documentField, entry.getValue());
+					}
+					return entry.getValue();
+				})));
+			}
+
 			return valueConverter.write(value, conversionContext);
 		}
 

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

@@ -1528,6 +1528,24 @@ void mappingShouldRetainMapKeyOrder() {
 		assertThat(target.get("simpleMap", Map.class)).containsExactlyEntriesOf(sourceMap);
 	}
 
+	@Test // GH-4510
+	void convertsNestedOperatorValueForPropertyThatHasValueConverter() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(query(where("text").gt("spring").lt( "data")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedObject).isEqualTo("{ 'text' : {  $gt : 'gnirps', $lt : 'atad' } }");
+	}
+
+	@Test // GH-4510
+	void convertsNestedOperatorValueForPropertyContainingListThatHasValueConverter() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(query(where("text").gt("spring").in( "data")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedObject).isEqualTo("{ 'text' : {  $gt : 'gnirps', $in : [ 'atad' ] } }");
+	}
+
 	class WithSimpleMap {
 		Map<String, String> simpleMap;
 	}