JsonTypeInfo used with interfaces (refs #91)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java

@@ -86,12 +86,11 @@ private TsModel processModel(SymbolTable symbolTable, Model model) {
     private Map<Type, List<BeanModel>> createChildrenMap(Model model) {
         final Map<Type, List<BeanModel>> children = new LinkedHashMap<>();
         for (BeanModel bean : model.getBeans()) {
-            final Type parent = bean.getParent();
-            if (parent != null) {
-                if (!children.containsKey(parent)) {
-                    children.put(parent, new ArrayList<BeanModel>());
+            for (Type ancestor : bean.getDirectAncestors()) {
+                if (!children.containsKey(ancestor)) {
+                    children.put(ancestor, new ArrayList<BeanModel>());
                 }
-                children.get(parent).add(bean);
+                children.get(ancestor).add(bean);
             }
         }
         return children;

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

@@ -2,7 +2,7 @@
 package cz.habarta.typescript.generator.parser;
 
 import java.lang.reflect.Type;
-import java.util.List;
+import java.util.*;
 
 
 public class BeanModel extends DeclarationModel {
@@ -44,6 +44,15 @@ public List<Type> getInterfaces() {
         return interfaces;
     }
 
+    public List<Type> getDirectAncestors() {
+        final List<Type> ancestors = new ArrayList<>();
+        if (parent != null) {
+            ancestors.add(parent);
+        }
+        ancestors.addAll(interfaces);
+        return ancestors;
+    }
+
     public List<PropertyModel> getProperties() {
         return properties;
     }

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

@@ -88,8 +88,8 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
             // this is parent
             discriminantProperty = getDiscriminantPropertyName(jsonTypeInfo);
             discriminantLiteral = null;
-        } else if (isSupported(parentJsonTypeInfo = getAnnotationRecursive(sourceClass.type, JsonTypeInfo.class))) {
-            // this is child
+        } else if (!sourceClass.type.isInterface() && isSupported(parentJsonTypeInfo = getAnnotationRecursive(sourceClass.type, JsonTypeInfo.class))) {
+            // this is child class
             discriminantProperty = getDiscriminantPropertyName(parentJsonTypeInfo);
             discriminantLiteral = getTypeName(sourceClass.type);
         } else {

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

@@ -40,6 +40,35 @@ private static class Circle extends Shape {
         public double radius;
     }
 
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind")
+    @JsonSubTypes({
+        @JsonSubTypes.Type(CSquare2.class),
+        @JsonSubTypes.Type(CRectangle2.class),
+        @JsonSubTypes.Type(CCircle2.class),
+    })
+    private static interface IShape2 {
+    }
+
+    private static interface IQuadrilateral2 extends IShape2 {
+    }
+
+    @JsonTypeName("square")
+    private static class CSquare2 implements IQuadrilateral2 {
+        public double size;
+    }
+
+    @JsonTypeName("rectangle")
+    private static class CRectangle2 implements IQuadrilateral2 {
+        public double width;
+        public double height;
+    }
+
+    @JsonTypeName("circle")
+    private static class CCircle2 implements IShape2 {
+        public double radius;
+    }
+
     @Test
     public void testTaggedUnions() {
         final Settings settings = TestUtils.settings();
@@ -76,6 +105,41 @@ public void testTaggedUnions() {
         Assert.assertEquals(expected, output);
     }
 
+    @Test
+    public void testTaggedUnionsWithInterfaces() {
+        final Settings settings = TestUtils.settings();
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(IShape2.class));
+        final String expected = (
+                "\n" +
+                "interface IShape2 {\n" +
+                "    kind: 'circle' | 'square' | 'rectangle';\n" +
+                "}\n" +
+                "\n" +
+                "interface CSquare2 extends IQuadrilateral2 {\n" +
+                "    kind: 'square';\n" +
+                "    size: number;\n" +
+                "}\n" +
+                "\n" +
+                "interface CRectangle2 extends IQuadrilateral2 {\n" +
+                "    kind: 'rectangle';\n" +
+                "    width: number;\n" +
+                "    height: number;\n" +
+                "}\n" +
+                "\n" +
+                "interface CCircle2 extends IShape2 {\n" +
+                "    kind: 'circle';\n" +
+                "    radius: number;\n" +
+                "}\n" +
+                "\n" +
+                "interface IQuadrilateral2 extends IShape2 {\n" +
+                "}\n" +
+                "\n" +
+                "type IShape2Union = CSquare2 | CRectangle2 | CCircle2;\n" +
+                ""
+                ).replace('\'', '"');
+        Assert.assertEquals(expected, output);
+    }
+
     @Test
     public void testTaggedUnionsDisabled() {
         final Settings settings = TestUtils.settings();

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

@@ -40,7 +40,7 @@ public void testInTypeScriptGenerator() {
         settings.addTypeNamePrefix = "Json";
         settings.extensions.add(new TypeGuardsForJackson2PolymorphismExtension());
         final String actual = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Point.class));
-        Assert.assertTrue(actual.contains("type: string;"));
+        Assert.assertTrue(actual.contains("type: \"cartesian\" | \"polar\";"));
         Assert.assertTrue(actual.contains("function isJsonCartesianPoint(jsonPoint: JsonPoint): jsonPoint is JsonCartesianPoint {"));
     }