recursively instantiate beans in arguments

koenpunt · koenpunt · commit b9dbaa6a05dc · 2021-09-29T18:50:05.000+02:00
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/GraphQlArgumentInstantiator.java b/spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/GraphQlArgumentInstantiator.java
@@ -82,7 +82,9 @@ else if (value != null && CollectionFactory.isApproximableCollectionType(value.g
 					Class<?> elementType = typeDescriptor.getElementTypeDescriptor().getType();
 					args[i] = instantiateCollection(elementType, (Collection<Object>) value);
 				}
-				else {
+				else if (value instanceof Map) {
+					args[i] = this.instantiate((Map<String, Object>) value, methodParam.getParameterType());
+				} else {
 					args[i] = this.converter.convertIfNecessary(value, paramTypes[i], methodParam);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ else if (value != null && CollectionFactory.isApproximableCollectionType(value.g`
`82`	`82`	`Class<?> elementType = typeDescriptor.getElementTypeDescriptor().getType();`
`83`	`83`	`args[i] = instantiateCollection(elementType, (Collection<Object>) value);`
`84`	`84`	`}`
`85`		`- else {`
	`85`	`+ else if (value instanceof Map) {`
	`86`	`+ args[i] = this.instantiate((Map<String, Object>) value, methodParam.getParameterType());`
	`87`	`+ } else {`
`86`	`88`	`args[i] = this.converter.convertIfNecessary(value, paramTypes[i], methodParam);`
`87`	`89`	`}`
`88`	`90`	`}`