Parameter for disabling @JsonIdentityInfo processing (#381)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Jackson2Configuration.java

@@ -56,4 +56,10 @@ public class Jackson2Configuration {
      */
     public boolean enumsUsingToString;
 
+    /**
+     * Disables processing of <code>@JsonIdentityInfo</code> and <code>@JsonIdentityReference</code> annotations.
+     * Can be useful for example when using JSOG library which uses IDs to serialize and deserialize object graphs.
+     */
+    public boolean disableObjectIdentityFeature;
+
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Jackson2ConfigurationResolved.java

@@ -17,6 +17,7 @@ public class Jackson2ConfigurationResolved {
     public JsonAutoDetect.Visibility creatorVisibility;
     public Map<Class<?>, JsonFormat.Shape> shapeConfigOverrides;
     public boolean enumsUsingToString;
+    public boolean disableObjectIdentityFeature;
 
     public static Jackson2ConfigurationResolved from(Jackson2Configuration configuration, ClassLoader classLoader) {
         final Jackson2ConfigurationResolved resolved = new Jackson2ConfigurationResolved();
@@ -28,6 +29,7 @@ public static Jackson2ConfigurationResolved from(Jackson2Configuration configura
         resolved.fieldVisibility = configuration.fieldVisibility;
         resolved.shapeConfigOverrides = resolveShapeConfigOverrides(configuration.shapeConfigOverrides, classLoader);
         resolved.enumsUsingToString = configuration.enumsUsingToString;
+        resolved.disableObjectIdentityFeature = configuration.disableObjectIdentityFeature;
         return resolved;
     }
 

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

@@ -154,9 +154,11 @@ private static TypeProcessor createSpecificTypeProcessor() {
                     public TypeProcessor.Result processType(Type javaType, TypeProcessor.Context context) {
                         if (context.getTypeContext() instanceof Jackson2TypeContext) {
                             final Jackson2TypeContext jackson2TypeContext = (Jackson2TypeContext) context.getTypeContext();
-                            final Type resultType = jackson2TypeContext.parser.processIdentity(javaType, jackson2TypeContext.beanPropertyWriter);
-                            if (resultType != null) {
-                                return context.withTypeContext(null).processType(resultType);
+                            if (!jackson2TypeContext.disableObjectIdentityFeature) {
+                                final Type resultType = jackson2TypeContext.parser.processIdentity(javaType, jackson2TypeContext.beanPropertyWriter);
+                                if (resultType != null) {
+                                    return context.withTypeContext(null).processType(resultType);
+                                }
                             }
                         }
                         return null;
@@ -168,10 +170,12 @@ public TypeProcessor.Result processType(Type javaType, TypeProcessor.Context con
     private static class Jackson2TypeContext {
         public final Jackson2Parser parser;
         public final BeanPropertyWriter beanPropertyWriter;
+        public final boolean disableObjectIdentityFeature;
 
-        public Jackson2TypeContext(Jackson2Parser parser, BeanPropertyWriter beanPropertyWriter) {
+        public Jackson2TypeContext(Jackson2Parser parser, BeanPropertyWriter beanPropertyWriter, boolean disableObjectIdentityFeature) {
             this.parser = parser;
             this.beanPropertyWriter = beanPropertyWriter;
+            this.disableObjectIdentityFeature = disableObjectIdentityFeature;
         }
     }
 
@@ -208,7 +212,10 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass, List<String> class
                     }
                 }
 
-                final Jackson2TypeContext jackson2TypeContext = new Jackson2TypeContext(this, beanPropertyWriter);
+                final Jackson2TypeContext jackson2TypeContext = new Jackson2TypeContext(
+                        this,
+                        beanPropertyWriter,
+                        settings.jackson2Configuration != null && settings.jackson2Configuration.disableObjectIdentityFeature);
 
                 if (!isAnnotatedPropertyIncluded(beanPropertyWriter::getAnnotation, sourceClass.type.getName() + "." + beanPropertyWriter.getName())) {
                     continue;

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

@@ -114,7 +114,6 @@ public void testAlternativeSyntax() {
         final Settings settings = TestUtils.settings();
         settings.customTypeMappings = Collections.singletonMap("cz.habarta.typescript.generator.GenericCustomTypeMappingsTest$Generic2[T1, T2]", "Test[T2, T1]");
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Usage.class));
-        System.out.println(output);
         Assert.assertTrue(output.contains("generic: Test<number, string>"));
     }
 

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

@@ -172,6 +172,18 @@ public void testGenerics() {
         Assert.assertTrue(output.contains("objectReference: string"));
     }
 
+    @Test
+    public void testDisableObjectIdentity() {
+        final Settings settings = TestUtils.settings();
+        settings.jackson2Configuration = new Jackson2ConfigurationResolved();
+        settings.jackson2Configuration.disableObjectIdentityFeature = true;
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Wrapper.class));
+        Assert.assertTrue(output.contains("testObjectA1: TestObjectA"));
+        Assert.assertTrue(output.contains("testObjectB1: TestObjectB"));
+        Assert.assertTrue(output.contains("testObjectC1: TestObjectC<string>"));
+        Assert.assertTrue(output.contains("testObjectD1: TestObjectD"));
+        Assert.assertTrue(output.contains("testObjectE1: TestObjectE"));
+    }
 
     @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "@@@id")
     @JsonIdentityReference(alwaysAsId = true)