fixed duplicate property added by @JsonTypeInfo (fixes #55)

Author: vojtechhabarta

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

@@ -37,11 +37,6 @@ public boolean isHandled(Annotation ann) {
     protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         final List<PropertyModel> properties = new ArrayList<>();
 
-        final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
-        if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
-            properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
-        }
-
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
         if (beanHelper != null) {
             for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
@@ -63,6 +58,13 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
             }
         }
 
+        final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
+        if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
+            if (!containsProperty(properties, jsonTypeInfo.property())) {
+                properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
+            }
+        }
+
         final JsonSubTypes jsonSubTypes = sourceClass.type.getAnnotation(JsonSubTypes.class);
         if (jsonSubTypes != null) {
             for (JsonSubTypes.Type type : jsonSubTypes.value()) {

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

@@ -24,11 +24,6 @@ public Jackson2Parser(Settings settings, TypeProcessor typeProcessor) {
     protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         final List<PropertyModel> properties = new ArrayList<>();
 
-        final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
-        if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
-            properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
-        }
-
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
         if (beanHelper != null) {
             for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
@@ -50,6 +45,13 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
             }
         }
 
+        final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
+        if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
+            if (!containsProperty(properties, jsonTypeInfo.property())) {
+                properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
+            }
+        }
+
         final JsonSubTypes jsonSubTypes = sourceClass.type.getAnnotation(JsonSubTypes.class);
         if (jsonSubTypes != null) {
             for (JsonSubTypes.Type type : jsonSubTypes.value()) {

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

@@ -99,4 +99,13 @@ private TypeProcessor.Result processType(Type type) {
         return typeProcessor.processType(type, new TypeProcessor.Context(new SymbolTable(settings), typeProcessor));
     }
 
+    public static boolean containsProperty(List<PropertyModel> properties, String propertyName) {
+        for (PropertyModel property : properties) {
+            if (property.getName().equals(propertyName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

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

@@ -2,7 +2,7 @@
 package cz.habarta.typescript.generator;
 
 import cz.habarta.typescript.generator.parser.*;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -16,7 +16,6 @@ public void test() {
         final Model model = jacksonParser.parseModel(bean);
         Assert.assertTrue(model.getBeans().size() > 0);
         final BeanModel beanModel = model.getBeans().get(0);
-        System.out.println("beanModel: " + beanModel);
         Assert.assertEquals("DummyBean", beanModel.getBeanClass().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
         Assert.assertEquals("firstProperty", beanModel.getProperties().get(0).getName());
@@ -25,16 +24,23 @@ public void test() {
     @Test
     public void testChangedNameProperty() {
         final Jackson2Parser jacksonParser = getJackson2Parser();
-        final Class<?> bean = DummyBeanJackson2.class;
-        final Model model = jacksonParser.parseModel(bean);
+        final Model model = jacksonParser.parseModel(DummyBeanJackson2.class);
         Assert.assertTrue(model.getBeans().size() > 0);
         final BeanModel beanModel = model.getBeans().get(0);
-        System.out.println("beanModel: " + beanModel);
         Assert.assertEquals("DummyBeanJackson2", beanModel.getBeanClass().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
         Assert.assertEquals("changedNameProperty", beanModel.getProperties().get(0).getName());
     }
 
+    @Test
+    public void testConflictingJsonTypeInfoProperty() {
+        final Jackson2Parser jacksonParser = getJackson2Parser();
+        final Model model = jacksonParser.parseModel(InheritedClass.class);
+        Assert.assertTrue(model.getBeans().size() > 0);
+        final BeanModel beanModel = model.getBeans().get(0);
+        Assert.assertEquals(1, beanModel.getProperties().size());
+    }
+
     static Jackson2Parser getJackson2Parser() {
         final Settings settings = new Settings();
         return new Jackson2Parser(settings, new DefaultTypeProcessor());
@@ -47,4 +53,9 @@ public static class DummyBeanJackson2 {
 
     }
 
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+    public class InheritedClass {
+        public String type;
+    }
+
 }