recursively instantiate beans in arguments

koenpunt · koenpunt · commit b7037d76ece8 · 2021-09-30T15:53:18.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
@@ -89,7 +89,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
`@@ -89,7 +89,9 @@ else if (value != null && CollectionFactory.isApproximableCollectionType(value.g`
`89`	`89`	`Class<?> elementType = typeDescriptor.getElementTypeDescriptor().getType();`
`90`	`90`	`args[i] = instantiateCollection(elementType, (Collection<Object>) value);`
`91`	`91`	`}`
`92`		`- else {`
	`92`	`+ else if (value instanceof Map) {`
	`93`	`+ args[i] = this.instantiate((Map<String, Object>) value, methodParam.getParameterType());`
	`94`	`+ } else {`
`93`	`95`	`args[i] = this.converter.convertIfNecessary(value, paramTypes[i], methodParam);`
`94`	`96`	`}`
`95`	`97`	`}`