Add QueryMapper.getMappedObjectRecurse.

Author: Ryan Gibb

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

@@ -71,6 +71,7 @@
  * @author Mark Paluch
  * @author David Julia
  * @author Divya Srivastava
+ * @author Ryan Gibb
  */
 public class QueryMapper {
 
@@ -120,6 +121,15 @@ public Document getMappedObject(Bson query, Optional<? extends MongoPersistentEn
 	 */
 	@SuppressWarnings("deprecation")
 	public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> entity) {
+	  return getMappedObjectRecurse(query, entity);
+	}
+
+	protected Document getMappedObjectRecurse(Bson query, Optional<? extends MongoPersistentEntity<?>> entity) {
+	  return getMappedObjectRecurse(query, entity.orElse(null));
+	}
+
+	@SuppressWarnings("deprecation")
+	protected Document getMappedObjectRecurse(Bson query, @Nullable MongoPersistentEntity<?> entity) {
 
 		if (isNestedKeyword(query)) {
 			return getMappedKeyword(new Keyword(query), entity);
@@ -317,7 +327,7 @@ protected Entry<String, Object> getMappedObjectForField(Field field, Object rawV
 		Object value;
 
 		if (rawValue instanceof MongoExpression) {
-			return createMapEntry(key, getMappedObject(((MongoExpression) rawValue).toDocument(), field.getEntity()));
+			return createMapEntry(key, getMappedObjectRecurse(((MongoExpression) rawValue).toDocument(), field.getEntity()));
 		}
 
 		if (isNestedKeyword(rawValue) && !field.isIdField()) {
@@ -366,7 +376,7 @@ protected Document getMappedKeyword(Keyword keyword, @Nullable MongoPersistentEn
 			List<Object> newConditions = new ArrayList<>();
 
 			for (Object condition : conditions) {
-				newConditions.add(isDocument(condition) ? getMappedObject((Document) condition, entity)
+				newConditions.add(isDocument(condition) ? getMappedObjectRecurse((Document) condition, entity)
 						: convertSimpleOrDocument(condition, entity));
 			}
 
@@ -437,7 +447,7 @@ protected Object getMappedValue(Field documentField, Object sourceValue) {
 				} else if (valueDbo.containsField("$ne")) {
 					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
 				} else {
-					return getMappedObject(resultDbo, Optional.empty());
+					return getMappedObjectRecurse(resultDbo, Optional.empty());
 				}
 				return resultDbo;
 			}
@@ -456,7 +466,7 @@ else if (isDocument(value)) {
 				} else if (valueDbo.containsKey("$ne")) {
 					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
 				} else {
-					return getMappedObject(resultDbo, Optional.empty());
+					return getMappedObjectRecurse(resultDbo, Optional.empty());
 				}
 				return resultDbo;
 
@@ -542,15 +552,15 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
 		}
 
 		if (isDocument(source)) {
-			return getMappedObject((Document) source, entity);
+			return getMappedObjectRecurse((Document) source, entity);
 		}
 
 		if (source instanceof BasicDBList) {
 			return delegateConvertToMongoType(source, entity);
 		}
 
 		if (isDBObject(source)) {
-			return getMappedObject((BasicDBObject) source, entity);
+			return getMappedObjectRecurse((BasicDBObject) source, entity);
 		}
 
 		if (source instanceof BsonValue) {
@@ -566,7 +576,7 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
 				String key = ObjectUtils.nullSafeToString(converter.convertToMongoType(it.getKey()));
 
 				if (it.getValue() instanceof Document) {
-					map.put(key, getMappedObject((Document) it.getValue(), entity));
+					map.put(key, getMappedObjectRecurse((Document) it.getValue(), entity));
 				} else {
 					map.put(key, delegateConvertToMongoType(it.getValue(), entity));
 				}

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

@@ -42,6 +42,7 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Ryan Gibb
  */
 public class UpdateMapper extends QueryMapper {
 
@@ -63,9 +64,9 @@ public UpdateMapper(MongoConverter converter) {
 	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObject(Bson, MongoPersistentEntity)
 	 */
 	@Override
-	public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> entity) {
+	protected Document getMappedObjectRecurse(Bson query, @Nullable MongoPersistentEntity<?> entity) {
 
-		Document document = super.getMappedObject(query, entity);
+		Document document = super.getMappedObjectRecurse(query, entity);
 
 		boolean hasOperators = false;
 		boolean hasFields = false;
@@ -156,7 +157,7 @@ protected Entry<String, Object> getMappedObjectForField(Field field, Object rawV
 
 		if (isQuery(rawValue)) {
 			return createMapEntry(field,
-					super.getMappedObject(((Query) rawValue).getQueryObject(), field.getPropertyEntity()));
+					super.getMappedObjectRecurse(((Query) rawValue).getQueryObject(), field.getPropertyEntity()));
 		}
 
 		if (isUpdateModifier(rawValue)) {