APITool: Nested list causes TypeBinding error fix jooby-project#1230

jknack · jknack · commit f1053c7f58e6 · 2019-01-19T16:12:57.000-03:00
diff --git a/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/BytecodeRouteParser.java b/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/BytecodeRouteParser.java
@@ -327,7 +327,7 @@ public class BytecodeRouteParser {
           .isPresent();
   static final Predicate<Parameter> SKIP = TYPE_TO_SKIP.and(ANNOTATION_TO_SKIP);
 
-  private static final ObjectMapper mapper = new ObjectMapper();
+  static final ObjectMapper mapper = new ObjectMapper();
   private static final String OBJECT = Type.getInternalName(Object.class);
   private static final String RETURN_OBJ = "L" + OBJECT + ";";
 
diff --git a/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/TypeJsonDeserializer.java b/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/TypeJsonDeserializer.java
@@ -250,8 +250,11 @@ private static List<Type> parse(final ClassLoader loader, final String type, fin
         types.add(element);
         singleType.setLength(0);
       } else if (ch == '>') {
-        Type element = BytecodeRouteParser.loadType(loader, singleType.toString());
-        types.add(element);
+        if (singleType.length() > 0) {
+          Type element = BytecodeRouteParser.loadType(loader, singleType.toString());
+          types.add(element);
+          singleType.setLength(0);
+        }
       } else if (ch == ']') {
         // java.lang.String[]
         singleType.setLength(singleType.length() - 1);
diff --git a/modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/Issue1230.java b/modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/Issue1230.java
@@ -0,0 +1,38 @@
+package org.jooby.internal.apitool;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.util.Types;
+import org.jooby.apitool.ApiToolFeature;
+import org.junit.Test;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import static org.junit.Assert.assertEquals;
+
+public class Issue1230 extends ApiToolFeature {
+
+  public static class I1230 {
+
+    private Type type;
+
+    public Type getType() {
+      return type;
+    }
+
+    public void setType(Type type) {
+      this.type = type;
+    }
+  }
+
+  @Test
+  public void shouldDeserializeComplexTypePropertly() throws Exception {
+    ObjectMapper mapper = BytecodeRouteParser.mapper;
+    I1230 expected = new I1230();
+    ParameterizedType type = Types.listOf(Types.listOf(Integer.class));
+    expected.setType(type);
+    String json = mapper.writeValueAsString(expected);
+    I1230 actual = mapper.readValue(json, I1230.class);
+    assertEquals(expected.getType(), actual.getType());
+  }
+}
