apitool parser support response with wildcard types

modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/TypeJsonDeserializer.java

@@ -244,14 +244,19 @@ private static List<Type> parse(final ClassLoader loader, final String type, fin
  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.newParameterizedType(owner, parameters.toArray(new Type[parameters.size()])));
  } else if (ch == ',') {
  Type element = BytecodeRouteParser.loadType(loader, singleType.toString());
  types.add(element);
  singleType.setLength(0);
  } else if (ch == '>') {
  if (singleType.length() > 0) {
- Type element = BytecodeRouteParser.loadType(loader, singleType.toString());
+ Type element;
+ if (singleType.charAt(0) == '?') {
+ element = parseWildcardType(singleType, loader);
+ } else {
+ element = BytecodeRouteParser.loadType(loader, singleType.toString());
+ }
  types.add(element);
  singleType.setLength(0);
  }
@@ -272,4 +277,29 @@ private static List<Type> parse(final ClassLoader loader, final String type, fin
  }
  return types;
  }
+
+ private static Type parseWildcardType(final StringBuilder singleType, final ClassLoader loader) {
+ if(singleType.length() == 1) {
+ // Collection<?>
+ return new MoreTypes.WildcardTypeImpl(new Type[]{Object.class}, MoreTypes.EMPTY_TYPE_ARRAY);
+ }
+
+ Type type;
+ String typeStr;
+ switch (singleType.charAt(1)) {
+ case 'e':
+ // Collection<? extends <Clazz>>
+ typeStr = singleType.substring(8);
+ type = Types.subtypeOf(BytecodeRouteParser.loadType(loader, typeStr));
+ break;
+ case 's':
+ // Collection<? super <Clazz>>
+ typeStr = singleType.substring(6);
+ type = Types.supertypeOf(BytecodeRouteParser.loadType(loader, typeStr));
+ break;
+ default:
+ throw new UnsupportedOperationException("Unsupported wildcard type");
+ }
+ return type;
+ }
 }

modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/WildcardTypesTest.java

@@ -0,0 +1,59 @@
+package org.jooby.internal.apitool;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.internal.MoreTypes;
+import com.google.inject.util.Types;
+import org.junit.Test;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import static org.junit.Assert.assertEquals;
+
+public class WildcardTypesTest {
+
+ public static class TypeWrapper {
+ private Type type;
+
+ public Type getType() {
+ return type;
+ }
+
+ public void setType(Type type) {
+ this.type = type;
+ }
+ }
+
+ @Test
+ public void shouldDeserializeSubtypeProperly() throws Exception {
+ ObjectMapper mapper = BytecodeRouteParser.mapper;
+ TypeWrapper expected = new TypeWrapper();
+ ParameterizedType type = Types.listOf(Types.subtypeOf(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 shouldDeserializeSuperTypeProperly() throws Exception {
+ ObjectMapper mapper = BytecodeRouteParser.mapper;
+ TypeWrapper expected = new TypeWrapper();
+ ParameterizedType type = Types.listOf(Types.supertypeOf(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 shouldDeserializeUnknownTypeProperly() throws Exception {
+ ObjectMapper mapper = BytecodeRouteParser.mapper;
+ TypeWrapper expected = new TypeWrapper();
+ ParameterizedType type = Types.listOf(new MoreTypes.WildcardTypeImpl(new Type[]{Object.class}, MoreTypes.EMPTY_TYPE_ARRAY));
+ expected.setType(type);
+ String json = mapper.writeValueAsString(expected);
+ TypeWrapper actual = mapper.readValue(json, TypeWrapper.class);
+ assertEquals(expected.getType(), actual.getType());
+ }
+}