apitool parser complex map types parsing

vokl0313 · vokl0313 · commit 1a0db172cf0b · 2019-06-14T22:49:18.000+03:00
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
@@ -213,7 +213,6 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 class TypeJsonDeserializer extends JsonDeserializer<Type> {
@@ -243,8 +242,8 @@ private static List<Type> parse(final ClassLoader loader, final String type, fin
       if (ch == '<') {
         Type owner = BytecodeRouteParser.loadType(loader, singleType.toString());
         List<Type> parameters = parse(loader, type, i + 1);
-        return Arrays.asList(
-                Types.newParameterizedType(owner, parameters.toArray(new Type[parameters.size()])));
+        types.add(Types.newParameterizedType(owner, parameters.toArray(new Type[parameters.size()])));
+        return types;
       } else if (ch == ',') {
         Type element = BytecodeRouteParser.loadType(loader, singleType.toString());
         types.add(element);
diff --git a/modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/ComplexMapTypesTest.java b/modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/ComplexMapTypesTest.java
@@ -0,0 +1,60 @@
+package org.jooby.internal.apitool;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.util.Types;
+import org.junit.Test;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+public class ComplexMapTypesTest {
+
+    public static class TypeWrapper {
+        private Type type;
+
+        public Type getType() {
+            return type;
+        }
+
+        public void setType(Type type) {
+            this.type = type;
+        }
+    }
+
+    @Test
+    public void shouldDeserializeMapWithListProperly() throws Exception {
+        ObjectMapper mapper = BytecodeRouteParser.mapper;
+        TypeWrapper expected = new TypeWrapper();
+        ParameterizedType type = Types.mapOf(UUID.class, Types.listOf(Integer.class));
+        expected.setType(type);
+        String json = mapper.writeValueAsString(expected);
+        TypeWrapper actual = mapper.readValue(json, TypeWrapper.class);
+        assertEquals(expected.getType(), actual.getType());
+    }
+
+  @Test
+  public void shouldDeserializeMapWithMapWithListProperly() throws Exception {
+    ObjectMapper mapper = BytecodeRouteParser.mapper;
+    TypeWrapper expected = new TypeWrapper();
+    ParameterizedType type = Types.mapOf(UUID.class, Types.mapOf(UUID.class, Types.listOf(Integer.class)));
+    expected.setType(type);
+    String json = mapper.writeValueAsString(expected);
+    TypeWrapper actual = mapper.readValue(json, TypeWrapper.class);
+    assertEquals(expected.getType(), actual.getType());
+  }
+
+  @Test
+  public void shouldDeserializeListWithMapWithListProperly() throws Exception {
+    ObjectMapper mapper = BytecodeRouteParser.mapper;
+    TypeWrapper expected = new TypeWrapper();
+    ParameterizedType type = Types.listOf(Types.mapOf(UUID.class, Types.mapOf(UUID.class, Types.listOf(Integer.class))));
+    expected.setType(type);
+    String json = mapper.writeValueAsString(expected);
+    TypeWrapper actual = mapper.readValue(json, TypeWrapper.class);
+    assertEquals(expected.getType(), actual.getType());
+  }
+
+}
