Improved test for Jackson2 tagged unions

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java

@@ -170,7 +170,7 @@ private String getDiscriminantPropertyName(JsonTypeInfo jsonTypeInfo) {
     private String getTypeName(final Class<?> cls) {
         // find @JsonTypeName recursively
         final JsonTypeName jsonTypeName = getAnnotationRecursive(cls, JsonTypeName.class);
-        if (jsonTypeName != null && ! jsonTypeName.value().isEmpty()) {
+        if (jsonTypeName != null && !jsonTypeName.value().isEmpty()) {
             return jsonTypeName.value();
         }
         // find @JsonSubTypes.Type recursively

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java

@@ -3,6 +3,8 @@
 
 import cz.habarta.typescript.generator.parser.*;
 import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -45,19 +47,21 @@ public void testConflictingJsonTypeInfoProperty() {
     public void testTaggedUnion() {
         final Jackson2Parser jacksonParser = getJackson2Parser();
         final Model model = jacksonParser.parseModel(SubTypeDiscriminatedByName1.class);
-        Assert.assertEquals(4, model.getBeans().size());
+        Assert.assertEquals(5, model.getBeans().size());
         final BeanModel bean0 = model.getBean(ParentWithNameDiscriminant.class);
         final BeanModel bean1 = model.getBean(SubTypeDiscriminatedByName1.class);
         final BeanModel bean2 = model.getBean(SubTypeDiscriminatedByName2.class);
         final BeanModel bean3 = model.getBean(SubTypeDiscriminatedByName3.class);
-        Assert.assertEquals(3, bean0.getTaggedUnionClasses().size());
+        final BeanModel bean4 = model.getBean(SubTypeDiscriminatedByName4.class);
+        Assert.assertEquals(4, bean0.getTaggedUnionClasses().size());
         Assert.assertNull(bean1.getTaggedUnionClasses());
         Assert.assertNull(bean2.getTaggedUnionClasses());
         Assert.assertNull(bean3.getTaggedUnionClasses());
         Assert.assertEquals("kind", bean0.getDiscriminantProperty());
         Assert.assertEquals("explicit-name1", bean1.getDiscriminantLiteral());
         Assert.assertEquals("SubType2", bean2.getDiscriminantLiteral());
         Assert.assertEquals("Jackson2ParserTest$SubTypeDiscriminatedByName3", bean3.getDiscriminantLiteral());
+        Assert.assertEquals("Jackson2ParserTest$SubTypeDiscriminatedByName4", bean4.getDiscriminantLiteral());
     }
 
     static Jackson2Parser getJackson2Parser() {
@@ -79,20 +83,30 @@ public class InheritedClass {
 
     @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind")
     @JsonSubTypes({
-        @JsonSubTypes.Type(value = SubTypeDiscriminatedByName1.class),
+        @JsonSubTypes.Type(value = SubTypeDiscriminatedByName1.class, name = "SubType1"), // value from @JsonTypeName is used
         @JsonSubTypes.Type(value = SubTypeDiscriminatedByName2.class, name = "SubType2"),
         @JsonSubTypes.Type(value = SubTypeDiscriminatedByName3.class),
+        @JsonSubTypes.Type(value = SubTypeDiscriminatedByName4.class),
     })
     private static interface ParentWithNameDiscriminant {
     }
 
     @JsonTypeName("explicit-name1")
     private static class SubTypeDiscriminatedByName1 implements ParentWithNameDiscriminant {
     }
-    @JsonTypeName(/* Default should be the simplename of the class */)
     private static class SubTypeDiscriminatedByName2 implements ParentWithNameDiscriminant {
     }
+    @JsonTypeName(/* Default should be the simplename of the class */)
     private static class SubTypeDiscriminatedByName3 implements ParentWithNameDiscriminant {
     }
+    private static class SubTypeDiscriminatedByName4 implements ParentWithNameDiscriminant {
+    }
+
+    public static void main(String[] args) throws JsonProcessingException {
+        System.out.println(new ObjectMapper().writeValueAsString(new SubTypeDiscriminatedByName1()));
+        System.out.println(new ObjectMapper().writeValueAsString(new SubTypeDiscriminatedByName2()));
+        System.out.println(new ObjectMapper().writeValueAsString(new SubTypeDiscriminatedByName3()));
+        System.out.println(new ObjectMapper().writeValueAsString(new SubTypeDiscriminatedByName4()));
+    }
 
 }