Merge pull request androidannotations#1736 from simopete/1735_ResponseEntity_generation_error

WonderCsabo · WonderCsabo · commit fbfb2e59c78f · 2016-03-28T18:52:57.000+02:00
Fixes RestTemplate generation with ResponseEntity as return type
diff --git a/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java b/AndroidAnnotations/androidannotations-rest-spring/rest-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java
@@ -367,9 +367,19 @@ public IJExpression getResponseClass(Element element, RestHolder holder) {
 		IJExpression responseClassExpr = nullCastedToNarrowedClass(holder);
 		TypeMirror returnType = executableElement.getReturnType();
 		if (returnType.getKind() != TypeKind.VOID) {
-			if (getElementUtils().getTypeElement(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE) != null && !returnType.toString().startsWith(RestSpringClasses.RESPONSE_ENTITY)
-					&& checkIfParameterizedTypeReferenceShouldBeUsed(returnType)) {
-				return createParameterizedTypeReferenceAnonymousSubclassInstance(returnType);
+			if (getElementUtils().getTypeElement(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE) != null) {
+				if (returnType.toString().startsWith(RestSpringClasses.RESPONSE_ENTITY)) {
+
+					List<? extends TypeMirror> typeArguments = ((DeclaredType) returnType).getTypeArguments();
+
+					if (!typeArguments.isEmpty()) {
+						returnType = typeArguments.get(0);
+					}
+				}
+
+				if (checkIfParameterizedTypeReferenceShouldBeUsed(returnType)) {
+					return createParameterizedTypeReferenceAnonymousSubclassInstance(returnType);
+				}
 			}
 
 			AbstractJClass responseClass = retrieveResponseClass(returnType, holder);
