revert ResponseEntity handling from #396 (#370)

Author: svpace

typescript-generator-spring/src/main/java/cz/habarta/typescript/generator/spring/SpringApplicationParser.java

@@ -236,11 +236,11 @@ private void parseControllerMethod(JaxrsApplicationParser.Result result, JaxrsAp
     }
 
     private Type parseReturnType(Class<?> controllerClass, Method method) {
-        Type modelReturnType = method.getGenericReturnType();
+        final Type modelReturnType = method.getGenericReturnType();
         if(modelReturnType instanceof TypeVariable) {
             return GenericTypeResolver.resolveReturnType(method, controllerClass);
         } else if (modelReturnType instanceof  ParameterizedType && ((ParameterizedType) modelReturnType).getRawType() == ResponseEntity.class) {
-            return GenericTypeResolver.resolveReturnTypeArgument(method, ResponseEntity.class);
+            return ((ParameterizedType) modelReturnType).getActualTypeArguments()[0];
         } else {
             return modelReturnType;
         }

typescript-generator-spring/src/test/java/cz/habarta/typescript/generator/spring/SpringTest.java

@@ -8,6 +8,8 @@
 import cz.habarta.typescript.generator.TypeScriptGenerator;
 import cz.habarta.typescript.generator.util.Utils;
 import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.core.annotation.AnnotatedElementUtils;
@@ -207,4 +209,21 @@ public Page<String> post(Pageable page) {
             return null;
         }
     }
+
+    @Test
+    public void testDoubleGenericController() {
+        final Settings settings = TestUtils.settings();
+        settings.outputFileType = TypeScriptFileType.implementationFile;
+        settings.generateSpringApplicationClient = true;
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(DoubleGenericController.class));
+        Assert.assertTrue(output.contains(" get(): RestResponse<string[]>"));
+    }
+
+    @RestController
+    public class DoubleGenericController  {
+        @GetMapping("/generic2")
+        public ResponseEntity<List<String>> get () {
+            return ResponseEntity.ok(Arrays.asList( "a" , "b" , "c" ));
+        }
+    }
 }