Skip to content

ApiTool map type parsing issue #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jknack merged 2 commits into from
Jul 3, 2019
Merged

ApiTool map type parsing issue #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abd84a2
Merge pull request #1 from jooby-project/master
kliushnichenko Jun 6, 2019
1a0db17
apitool parser complex map types parsing
Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/TypeJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down Expand Up @@ -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);
Expand Down
60 changes: 60 additions & 0 deletions modules/jooby-apitool/src/test/java/org/jooby/internal/apitool/ComplexMapTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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());
}

}