Fix/get generic annotation

apitester-spring-mvc/src/main/java/com/cinefms/apitester/springmvc/crawlers/SpringAnnotationCrawler.java

@@ -2,6 +2,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
@@ -20,10 +21,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.ServletContextAware;
 
 import com.cinefms.apitester.annotations.ApiDescription;
@@ -110,21 +111,23 @@ public List<ApiCall> scanControllers(ApplicationContext ctx) {
 		if (ctx.getId() != null) {
 			namespace = ctx.getId();
 		}
-		List<ApiCall> outa = scanControllers(namespace, new ArrayList<Object>(ctx.getBeansWithAnnotation(Controller.class).values()));
-		List<ApiCall> outb = scanControllers(namespace, new ArrayList<Object>(ctx.getBeansWithAnnotation(RestController.class).values()));
-		outa.addAll(outb);
-		return outa;
+		return scanControllers(namespace, new ArrayList<Object>(ctx.getBeansWithAnnotation(Controller.class).values()));
 	}
 
+	public <T extends Annotation> T getClassAnnotation(Class<?> clazz, Class<T> annotationClass){
+		return AnnotationUtils.findAnnotation(clazz, annotationClass);
+	}
+
+	public <T extends Annotation> T getMethodAnnotation(Method method, Class<T> annotationClass){
+		return AnnotationUtils.findAnnotation(method, annotationClass);
+	}
+
 	public List<ApiCall> scanControllers(String namespace, List<Object> controllers) {
 
 		List<ApiCall> out = new ArrayList<ApiCall>();
 
 		for (Object controller : controllers) {
-
-			// com.cinefms.apitester.springmvc.crawlers.TestController2$$EnhancerByCGLIB$$84793797
-
-			Class<?> clazz = controller.getClass();
+			Class<?> clazz = controller.getClass();			
 
 			String handlerClass = clazz.getName();
 
@@ -135,16 +138,14 @@ public List<ApiCall> scanControllers(String namespace, List<Object> controllers)
 				} catch (ClassNotFoundException e) {
 				}
 			}
-
-
 
 			log.info(" ##  FOUND " + controllers.size() + " CONTROLLERS ... " + handlerClass);
 
 			Method[] methods = clazz.getMethods();
 
 			String[] classLevelPaths = new String[] { "" };
 
-			RequestMapping rmType = (RequestMapping) clazz.getAnnotation(RequestMapping.class);
+			RequestMapping rmType = getClassAnnotation(clazz, RequestMapping.class);
 			if (rmType != null) {
 				classLevelPaths = rmType.value();
 			}
@@ -157,10 +158,12 @@ public List<ApiCall> scanControllers(String namespace, List<Object> controllers)
 					String deprecatedSince = null;
 					String since = null;
 					boolean deprecated = false;
-					if (m.getAnnotation(Deprecated.class) != null) {
-						deprecated = true;
+
+					if(getMethodAnnotation(m, Deprecated.class)!=null){
+						deprecated = true;						
 					}
-					ApiDescription ad = m.getAnnotation(ApiDescription.class);
+
+					ApiDescription ad = getMethodAnnotation(m, ApiDescription.class);
 					if (ad != null) {
 						if (ad.deprecatedSince().length() > 0) {
 							deprecatedSince = ad.deprecatedSince();
@@ -173,13 +176,12 @@ public List<ApiCall> scanControllers(String namespace, List<Object> controllers)
 							description = ad.value();
 						}
 						if (ad.file().length() > 0) {
-							description = loadResource(clazz,
-									ad.file());
+							description = loadResource(clazz,ad.file());
 						}
 					}
 
 					String handlerMethod = m.getName();
-					RequestMapping rmm = m.getAnnotation(RequestMapping.class);
+					RequestMapping rmm = getMethodAnnotation(m, RequestMapping.class);
 
 					if (rmm != null) {
 

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/SpringAnnotationCrawlerTest.java

@@ -15,18 +15,27 @@
 
 import javax.servlet.ServletContext;
 
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.NoOp;
-
+import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
 import com.cinefms.apitester.core.ApitesterService;
 import com.cinefms.apitester.model.info.ApiCall;
+import com.cinefms.apitester.springmvc.crawlers.mapping.AbstractController2;
+import com.cinefms.apitester.springmvc.crawlers.mapping.AbstractControllerMethod;
+import com.cinefms.apitester.springmvc.crawlers.mapping.Controller3;
+import com.cinefms.apitester.springmvc.crawlers.mapping.ControllerImpl1;
+import com.cinefms.apitester.springmvc.crawlers.mapping.ControllerImpl2;
+import com.cinefms.apitester.springmvc.crawlers.mapping.ControllerImpl3;
+import com.cinefms.apitester.springmvc.crawlers.mapping.ControllerMethod;
+import com.cinefms.apitester.springmvc.crawlers.mapping.ControllerMethodImpl;
+
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.NoOp;
 
 public class SpringAnnotationCrawlerTest {
 
@@ -386,28 +395,64 @@ public void testDescriptionInFileExpectSuccess() {
 	}
 
 	@Test
-	public void testGenericController() {
-		ApplicationContext acc = mock(ApplicationContext.class);
-
-		Map<String,Object> cMap = new HashMap<String, Object>();
-		Map<String,Object> rcMap = new HashMap<String, Object>();
-		Object a = new GenericTestControllerImpl();
-		rcMap.put("a",a);
-
-		when(acc.getBeansWithAnnotation(Controller.class)).thenReturn(cMap);
-		when(acc.getBeansWithAnnotation(RestController.class)).thenReturn(rcMap);
-
+	public void testGenericControllerRequestMapping_implmenation(){
+		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
+		RequestMapping actual = sac.getClassAnnotation(ControllerImpl1.class, RequestMapping.class);
+
+		RequestMapping expect = ControllerImpl1.class.getAnnotation(RequestMapping.class);
+
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
+	}
+
+	@Test
+	public void testGenericControllerRequestMapping_abstract(){
+		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
+		RequestMapping actual = sac.getClassAnnotation(ControllerImpl2.class, RequestMapping.class);
+
+		RequestMapping expect = AbstractController2.class.getAnnotation(RequestMapping.class);
+
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
+	}
+
+	@Test
+	public void testGenericControllerRequestMapping_interface(){
+		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
+		RequestMapping actual = sac.getClassAnnotation(ControllerImpl3.class, RequestMapping.class);
+
+		RequestMapping expect = Controller3.class.getAnnotation(RequestMapping.class);
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
+	}
+
+	@Test
+	public void testGenericMethodRequestMapping_implmenation() throws NoSuchMethodException, SecurityException{
 		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
-		sac.setApplicationContext(acc);
-		sac.setService(new ApitesterService());
-
-		List<ApiCall> calls = sac.getApiCalls();
 
-		assertEquals(3, calls.size());
-		//assertEquals("java.lang.String", calls.get(0).getReturnType().getReturnClass().getClassName());
-		assertEquals("put", calls.get(1).getHandlerMethod());
-		assertEquals(1, calls.get(1).getPathParameters().size());
+		RequestMapping actual = sac.getMethodAnnotation(ControllerMethodImpl.class.getMethod("testMethod", String.class, String.class), RequestMapping.class);
+
+		RequestMapping expect = ControllerMethodImpl.class.getMethod("testMethod", String.class, String.class).getAnnotation(RequestMapping.class);
+
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
+	}
+
+	@Test
+	public void testGenericMethodRequestMapping_abstract() throws NoSuchMethodException, SecurityException{
+		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
 
+		RequestMapping actual = sac.getMethodAnnotation(ControllerMethodImpl.class.getMethod("testMethod", Long.class), RequestMapping.class);
+
+		RequestMapping expect = AbstractControllerMethod.class.getMethod("testMethod", Long.class).getAnnotation(RequestMapping.class);
+
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
 	}
 
+	@Test
+	public void testGenericMethodRequestMapping_interface() throws NoSuchMethodException, SecurityException{
+		SpringAnnotationCrawler sac = new SpringAnnotationCrawler();
+
+		RequestMapping actual = sac.getMethodAnnotation(ControllerMethodImpl.class.getMethod("testMethod", String.class), RequestMapping.class);
+
+		RequestMapping expect = ControllerMethod.class.getMethod("testMethod", String.class).getAnnotation(RequestMapping.class);
+
+		Assert.assertEquals(expect.value()[0], actual.value()[0]);
+	}
 }

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/AbstractController1.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/abstract1")
+public abstract class AbstractController1 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/AbstractController2.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/abstract2")
+public abstract class AbstractController2 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/AbstractController3.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/abstract3")
+public abstract class AbstractController3 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/AbstractControllerMethod.java

@@ -0,0 +1,10 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+public abstract class AbstractControllerMethod {
+
+	@RequestMapping("/api/method/implementation/id")
+	public abstract void testMethod(Long id);
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/Controller1.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/interface1")
+public interface Controller1 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/Controller2.java

@@ -0,0 +1,5 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+public interface Controller2 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/Controller3.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/interface3")
+public interface Controller3 {
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/ControllerImpl1.java

@@ -0,0 +1,8 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/test/api/implementation1")
+public class ControllerImpl1 extends AbstractController1 implements Controller1{
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/ControllerImpl2.java

@@ -0,0 +1,5 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+public class ControllerImpl2 extends AbstractController2 implements Controller2{
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/ControllerImpl3.java

@@ -0,0 +1,5 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+public class ControllerImpl3 extends AbstractController3 implements Controller3{
+
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/ControllerMethod.java

@@ -0,0 +1,12 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+public interface ControllerMethod {
+
+	@RequestMapping("/api/method/interface/a")
+	public void testMethod(String a);
+
+	@RequestMapping("/api/method/interface/a")
+	public void testMethod(String a, String b);
+}

apitester-spring-mvc/src/test/java/com/cinefms/apitester/springmvc/crawlers/mapping/ControllerMethodImpl.java

@@ -0,0 +1,22 @@
+package com.cinefms.apitester.springmvc.crawlers.mapping;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+public class ControllerMethodImpl extends AbstractControllerMethod implements ControllerMethod{
+
+	@Override
+	public void testMethod(String a) {
+
+	}
+
+	@Override
+	@RequestMapping("/api/method/implementation/ab")
+	public void testMethod(String a, String b) {
+
+	}
+
+	@Override
+	public void testMethod(Long id) {
+
+	}
+}