mvc: keep annotation name (don't lower case it) Fix jooby-project#1199

jknack · jknack · commit 1fc96c495c1d · 2018-07-08T10:46:25.000-03:00
diff --git a/jooby/src/main/java/org/jooby/Route.java b/jooby/src/main/java/org/jooby/Route.java
@@ -1575,7 +1575,7 @@ private boolean valid(final Object value) {
       if (value instanceof String || value instanceof Enum || value instanceof Class) {
         return true;
       }
-      if (value.getClass().isArray()) {
+      if (value.getClass().isArray() && Array.getLength(value) > 0) {
         return valid(Array.get(value, 0));
       }
       if (value instanceof Map && ((Map) value).size() > 0) {
diff --git a/jooby/src/main/java/org/jooby/internal/mvc/MvcRoutes.java b/jooby/src/main/java/org/jooby/internal/mvc/MvcRoutes.java
@@ -203,7 +203,6 @@
  */
 package org.jooby.internal.mvc;
 
-import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableSet;
 import org.jooby.Env;
 import org.jooby.MediaType;
@@ -391,8 +390,7 @@ private static Map<String, Object> attrs(final Annotation annotation) {
   private static String attrName(final Annotation annotation, final Method attr) {
     String name = attr.getName();
     if (name.equals("value")) {
-      return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL,
-          annotation.annotationType().getSimpleName());
+      return annotation.annotationType().getSimpleName();
     }
     return annotation.annotationType().getSimpleName() + "." + name;
   }
diff --git a/jooby/src/test/java/org/jooby/internal/mvc/MvcHandlerTest.java b/jooby/src/test/java/org/jooby/internal/mvc/MvcHandlerTest.java
@@ -1,12 +1,6 @@
 package org.jooby.internal.mvc;
 
 import static org.easymock.EasyMock.expect;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
 import org.jooby.Request;
 import org.jooby.Response;
 import org.jooby.Route;
@@ -17,6 +11,11 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({MvcHandler.class })
 public class MvcHandlerTest {
@@ -120,7 +119,7 @@ public void handleException() throws Exception {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked" })
-  @Test(expected = RuntimeException.class)
+  @Test(expected = Throwable.class)
   public void throwableException() throws Exception {
     Class handlerClass = MvcHandlerTest.class;
     MvcHandlerTest handler = new MvcHandlerTest();
diff --git a/modules/coverage-report/src/test/java/org/jooby/issues/Issue346.java b/modules/coverage-report/src/test/java/org/jooby/issues/Issue346.java
@@ -68,7 +68,7 @@ public Object admin(final Request req) {
     });
 
     use("/3", (req, rsp) -> {
-      assertEquals(ImmutableMap.of("SitemapUrl.priority", 0.5, "SitemapUrl.changefreq", "always", "role", "admin"),
+      assertEquals(ImmutableMap.of("SitemapUrl.priority", 0.5, "SitemapUrl.changefreq", "always", "Role", "admin"),
           req.route().attributes());
     });
     use(Resource.class);
@@ -91,7 +91,7 @@ public void mvcAttrs() throws Exception {
     request().get("/3")
         .expect(value -> {
           Map<String, Object> hash = toMap(value.substring(1, value.length() - 1));
-          assertEquals(ImmutableMap.of("SitemapUrl.priority", "0.5", "SitemapUrl.changefreq", "always", "role", "admin"),
+          assertEquals(ImmutableMap.of("SitemapUrl.priority", "0.5", "SitemapUrl.changefreq", "always", "Role", "admin"),
               hash);
         });
   }
diff --git a/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/SwaggerBuilder.java b/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/SwaggerBuilder.java
@@ -451,7 +451,7 @@ public Swagger build(Swagger base, final List<RouteMethod> routes) throws Except
 
   private void buildResponse(RouteMethod route, Function<Type, Model> modelFactory,
       Consumer<ResponseWithStatusCode> consumer) {
-    Object[] apiResponses = (Object[]) route.attributes().get("apiResponses");
+    Object[] apiResponses = (Object[]) route.attributes().get("ApiResponses");
     if (apiResponses != null) {
       /** ApiResponses annotation: */
       Set<Integer> codes = new HashSet<>();
@@ -572,7 +572,7 @@ private String description(RouteMethod route, String summary) {
   }
 
   private String summary(RouteMethod route) {
-    String summary = stringAttribute(route, "apiOperation");
+    String summary = stringAttribute(route, "ApiOperation");
     if (summary == null) {
       return route.description().map(description -> {
         int dot = description.indexOf('.');

Original file line number	Diff line number	Diff line change
`@@ -1575,7 +1575,7 @@ private boolean valid(final Object value) {`
`1575`	`1575`	`if (value instanceof String \|\| value instanceof Enum \|\| value instanceof Class) {`
`1576`	`1576`	`return true;`
`1577`	`1577`	`}`
`1578`		`- if (value.getClass().isArray()) {`
	`1578`	`+ if (value.getClass().isArray() && Array.getLength(value) > 0) {`
`1579`	`1579`	`return valid(Array.get(value, 0));`
`1580`	`1580`	`}`
`1581`	`1581`	`if (value instanceof Map && ((Map) value).size() > 0) {`