Fully Resolve generics to parameterized type name

Author: christophstrobl

src/main/java/org/springframework/data/javapoet/TypeNames.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.javapoet;
 
+import java.util.Arrays;
+
 import org.springframework.core.ResolvableType;
 import org.springframework.javapoet.ArrayTypeName;
 import org.springframework.javapoet.ClassName;
@@ -98,7 +100,8 @@ public static TypeName resolvedTypeName(ResolvableType resolvableType) {
 		}
 
 		if (resolvableType.hasResolvableGenerics()) {
-			return ParameterizedTypeName.get(resolvableType.toClass(), resolvableType.resolveGenerics());
+			return ParameterizedTypeName.get(ClassName.get(resolvableType.toClass()),
+					Arrays.stream(resolvableType.getGenerics()).map(TypeNames::resolvedTypeName).toArray(TypeName[]::new));
 		}
 
 		return ClassName.get(resolvableType.toClass());

src/test/java/org/springframework/data/javapoet/TypeNamesUnitTests.java

@@ -27,6 +27,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.GeoResult;
+import org.springframework.data.geo.Point;
 import org.springframework.javapoet.ClassName;
 import org.springframework.javapoet.ParameterizedTypeName;
 import org.springframework.javapoet.TypeName;
@@ -136,6 +139,20 @@ void resolvedTypeNamesForMethodParameters() {
 			assertThat(TypeNames.typeName(resolvedReturnType)).extracting(TypeName::toString).isEqualTo("RT");
 			assertThat(TypeNames.resolvedTypeName(resolvedReturnType)).isEqualTo(TypeName.get(Object.class));
 		});
+
+		ReflectionUtils.doWithMethods(Concrete.class, method -> {
+			if (!method.getName().contains("findByLocationNear")) {
+				return;
+			}
+
+			ResolvableType resolvedReturnType = ResolvableType.forMethodReturnType(method, Concrete.class);
+
+			assertThat(TypeNames.typeName(resolvedReturnType)).extracting(TypeName::toString).isEqualTo(
+					"java.util.List<org.springframework.data.geo.GeoResult<org.springframework.data.javapoet.TypeNamesUnitTests.MyType>>");
+			assertThat(TypeNames.resolvedTypeName(resolvedReturnType)).isEqualTo(ParameterizedTypeName
+					.get(ClassName.get(java.util.List.class), ParameterizedTypeName.get(GeoResult.class, MyType.class)));
+		});
+
 	}
 
 	interface GenericBase<T> {
@@ -147,6 +164,7 @@ interface GenericBase<T> {
 
 	interface Concrete extends GenericBase<MyType> {
 
+		List<GeoResult<MyType>> findByLocationNear(Point point, Distance maxDistance);
 	}
 
 	static class MyType {}