#208 ensure support for generics in return types, especially from annotations

(closes #208)

Author: UnquietCode

src/main/java/unquietcode/tools/flapi/IntrospectorSupport.java

@@ -91,30 +91,38 @@ else if (parameterType.isArray()) {
 				typeName = parameterType.getName();
 			}
 
-			// raw type
-			signature.append(typeName);
-
-			// generics
+			// type
 			Class<?>[] generics = ResolvableType.forMethodParameter(MethodParameter.forMethodOrConstructor(method, i)).resolveGenerics();
+			signature.append(makeTypeWithGenerics(typeName, generics));
 
-			if (generics != null && generics.length > 0) {
-				signature.append("<");
+			// parameter name
+			signature.append(" p").append(i);
+		}
 
-				for (int p = 0; p < generics.length; ++p) {
-					if (p != 0) { signature.append(", "); }
+		signature.append(")");
+		return signature.toString();
+	}
 
-					Class<?> generic = generics[p];
-					signature.append(generic.getName());
-				}
+	protected static String makeTypeWithGenerics(Class<?> base, Class<?>[] generics) {
+		return makeTypeWithGenerics(base.getName(), generics);
+	}
 
-				signature.append("> ");
+	protected static String makeTypeWithGenerics(String base, Class<?>[] generics) {
+		StringBuilder sb = new StringBuilder(base);
+
+		if (generics != null && generics.length > 0) {
+			sb.append("<");
+
+			for (int p = 0; p < generics.length; ++p) {
+				if (p != 0) { sb.append(", "); }
+
+				Class<?> generic = generics[p];
+				sb.append(generic.getName());
 			}
 
-			// parameter name
-			signature.append(" p").append(i);
+			sb.append("> ");
 		}
 
-		signature.append(")");
-		return signature.toString();
+		return sb.toString();
 	}
 }

src/main/java/unquietcode/tools/flapi/annotations/AnnotationIntrospector.java

@@ -195,7 +195,8 @@ private void handleMethod(MethodOutline methodOutline, Method method) {
 			if (returnType == void.class) {
 				helper.last();
 			} else {
-				helper.last(returnType);
+				Class<?>[] generics = ResolvableType.forMethodReturnType(method).resolveGenerics();
+				helper.last(makeTypeWithGenerics(returnType, generics));
 			}
 		}
 

src/main/java/unquietcode/tools/flapi/graph/processors/ReturnTypeProcessor.java

@@ -18,6 +18,7 @@
 
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JType;
+import unquietcode.tools.flapi.MethodParser;
 import unquietcode.tools.flapi.generator.AbstractGenerator;
 import unquietcode.tools.flapi.generator.GeneratorContext;
 import unquietcode.tools.flapi.graph.TransitionVisitor;
@@ -64,10 +65,12 @@ public void visit(TerminalTransition transition) {
 							 ? Void.class.getName()
 							 : transition.getReturnType();
 
-				if (!clazz.equals(Void.class.getName()) || !transition.getStateChain().isEmpty()) {
-					initialType.set(ctx.model.ref(clazz));
-				} else {
+				if (clazz.equals(Void.class.getName()) && transition.getStateChain().isEmpty()) {
 					initialType.set(ctx.model.VOID);
+				} else {
+					MethodParser fakeParsed = new MethodParser(clazz+" fake()");
+					JType returnType = getType(fakeParsed.returnType);
+					initialType.set(returnType);
 				}
 			}
 		});

src/test/java/unquietcode/tools/flapi/MethodParser_T.java

@@ -293,6 +293,14 @@ public void multiDimensionalDuplicate() {
 		new MethodParser(methodSignature);
 	}
 
+	@Test
+	public void genericReturnType() {
+		MethodParser parsed = new MethodParser("List<String> method()");
+		assertEquals(1, parsed.returnType.typeParameters.size());
+		assertEquals("List", parsed.returnType.typeName);
+		assertEquals("String", parsed.returnType.typeParameters.get(0).typeName);
+	}
+
 	@Test
 	public void methodEqualityTests() {