Detect Spring REST controllers using @Component annotation (#488)

Author: vojtechhabarta

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

@@ -39,12 +39,12 @@
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.ValueConstants;
 
 public class SpringApplicationParser extends RestApplicationParser {
@@ -113,9 +113,9 @@ public JaxrsApplicationParser.Result tryParse(SourceType<?> sourceType) {
         }
 
         // controller
-        final RestController controller = AnnotationUtils.findAnnotation(cls, RestController.class);
-        if (controller != null) {
-            TypeScriptGenerator.getLogger().verbose("Parsing Spring RestController: " + cls.getName());
+        final Component component = AnnotationUtils.findAnnotation(cls, Component.class);
+        if (component != null) {
+            TypeScriptGenerator.getLogger().verbose("Parsing Spring component: " + cls.getName());
             final JaxrsApplicationParser.Result result = new JaxrsApplicationParser.Result();
             final RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(cls, RequestMapping.class);
             final String path = requestMapping != null && requestMapping.path() != null && requestMapping.path().length != 0 ? requestMapping.path()[0] : null;
@@ -153,7 +153,7 @@ public List<Class<?>> findRestControllers() {
                             throw new RuntimeException(e);
                         }
                     })
-                    .filter(instance -> AnnotationUtils.findAnnotation(instance, RestController.class) != null)
+                    .filter(instance -> AnnotationUtils.findAnnotation(instance, Component.class) != null)
                     .collect(Collectors.toList());
                 return classes;
             }

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

@@ -7,6 +7,8 @@
 import cz.habarta.typescript.generator.TypeScriptFileType;
 import cz.habarta.typescript.generator.TypeScriptGenerator;
 import cz.habarta.typescript.generator.util.Utils;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
@@ -18,6 +20,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -360,4 +363,28 @@ public ResponseEntity<List<String>> get () {
             return ResponseEntity.ok(Arrays.asList( "a" , "b" , "c" ));
         }
     }
+
+    @Test
+    public void testCustomControllerAnnotaion() {
+        final Settings settings = TestUtils.settings();
+        settings.outputFileType = TypeScriptFileType.implementationFile;
+        settings.generateSpringApplicationClient = true;
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(CustomAnnotatedController.class));
+        System.out.println(output);
+        Assert.assertTrue(output.contains("getText(): RestResponse<string>"));
+    }
+
+    @MyRestController
+    public class CustomAnnotatedController {
+        @GetMapping("/text")
+        public String getText() {
+            return "";
+        }
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Component
+    public @interface MyRestController {
+    }
+
 }