Objects serialized as references using IDs (#298)

- handling `JsonIdentityReference` annotation also on properties

Author: vojtechhabarta

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

@@ -137,9 +137,9 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                         propertyType = Utils.replaceRawClassInType(propertyType, Map.class);
                     }
                 }
-                
+
                 // @JsonIdentityInfo and @JsonIdentityReference
-                propertyType = processIdentity(propertyType);
+                propertyType = processIdentity(propertyType, beanPropertyWriter);
 
                 if (!isAnnotatedPropertyIncluded(beanPropertyWriter::getAnnotation, sourceClass.type.getName() + "." + beanPropertyWriter.getName())) {
                     continue;
@@ -201,29 +201,31 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         return new BeanModel(sourceClass.type, superclass, taggedUnionClasses, discriminantProperty, discriminantLiteral, interfaces, properties, null);
     }
 
-    private Type processIdentity(Type propertyType) {
+    private Type processIdentity(Type propertyType, BeanPropertyWriter propertyWriter) {
         final Class<?> cls = Utils.getRawClassOrNull(propertyType);
         if (cls != null) {
             final JsonIdentityInfo identityInfo = cls.getAnnotation(JsonIdentityInfo.class);
             if (identityInfo == null) {
                 return propertyType;
             }
-            final JsonIdentityReference identityReference = cls.getAnnotation(JsonIdentityReference.class);
+            final JsonIdentityReference identityReferenceC = cls.getAnnotation(JsonIdentityReference.class);
+            final JsonIdentityReference identityReferenceP = propertyWriter.getAnnotation(JsonIdentityReference.class);
+            final JsonIdentityReference identityReference = identityReferenceP != null ? identityReferenceP : identityReferenceC;
             final boolean alwaysAsId = identityReference != null && identityReference.alwaysAsId();
 
             final Type idType;
             if (identityInfo.generator() == ObjectIdGenerators.None.class) {
                 return propertyType;
             } else if (identityInfo.generator() == ObjectIdGenerators.PropertyGenerator.class) {
                 final BeanPropertyWriter[] properties = getBeanHelper(cls).getProperties();
-                final Optional<BeanPropertyWriter> property = Stream.of(properties)
+                final Optional<BeanPropertyWriter> idProperty = Stream.of(properties)
                         .filter(p -> p.getName().equals(identityInfo.property()))
                         .findFirst();
-                if (property.isPresent()) {
-                    final BeanPropertyWriter beanPropertyWriter = property.get();
-                    final Member propertyMember = beanPropertyWriter.getMember().getMember();
-                    checkMember(propertyMember, beanPropertyWriter.getName(), cls);
-                    idType = getGenericType(propertyMember);
+                if (idProperty.isPresent()) {
+                    final BeanPropertyWriter idPropertyWriter = idProperty.get();
+                    final Member idPropertyMember = idPropertyWriter.getMember().getMember();
+                    checkMember(idPropertyMember, idPropertyWriter.getName(), cls);
+                    idType = getGenericType(idPropertyMember);
                 } else {
                     return propertyType;
                 }

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

@@ -20,13 +20,16 @@ public void testJackson() throws JsonProcessingException {
         final TestObjectA testObjectA = new TestObjectA();
         final TestObjectB testObjectB = new TestObjectB();
         final TestObjectC<String> testObjectC = new TestObjectC<>("valueC");
+        final TestObjectD testObjectD = new TestObjectD();
         final Wrapper wrapper = new Wrapper();
         wrapper.testObjectA1 = testObjectA;
         wrapper.testObjectA2 = testObjectA;
         wrapper.testObjectB1 = testObjectB;
         wrapper.testObjectB2 = testObjectB;
         wrapper.testObjectC1 = testObjectC;
         wrapper.testObjectC2 = testObjectC;
+        wrapper.testObjectD1 = testObjectD;
+        wrapper.testObjectD2 = testObjectD;
         final ObjectMapper objectMapper = Utils.getObjectMapper();
         objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
         final String json = objectMapper.writeValueAsString(wrapper);
@@ -35,7 +38,9 @@ public void testJackson() throws JsonProcessingException {
         Assert.assertTrue(json.contains("\"testObjectB1\": {"));
         Assert.assertTrue(json.contains("\"testObjectB2\": \"id2\""));
         Assert.assertTrue(json.contains("\"testObjectC1\": {"));
-        Assert.assertTrue(json.contains("\"testObjectC2\": \"id2\""));
+        Assert.assertTrue(json.contains("\"testObjectC2\": \"id3\""));
+        Assert.assertTrue(json.contains("\"testObjectD1\": \"id4\""));
+        Assert.assertTrue(json.contains("\"testObjectD2\": \"id4\""));
     }
 
     @Test
@@ -45,9 +50,11 @@ public void test() {
         Assert.assertTrue(output.contains("testObjectA1: string"));
         Assert.assertTrue(output.contains("testObjectB1: TestObjectB | string"));
         Assert.assertTrue(output.contains("testObjectC1: TestObjectC<string> | string"));
+        Assert.assertTrue(output.contains("testObjectD1: string"));
         Assert.assertTrue(!output.contains("interface TestObjectA"));
         Assert.assertTrue(output.contains("interface TestObjectB"));
         Assert.assertTrue(output.contains("interface TestObjectC<T>"));
+        Assert.assertTrue(!output.contains("interface TestObjectD"));
     }
 
     @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "@@@id")
@@ -73,7 +80,7 @@ private static class TestObjectB {
     private static class TestObjectC<T> {
 
         @JsonProperty("@@@id")
-        public String myIdentification = "id2";
+        public String myIdentification = "id3";
 
         public T myProperty;
 
@@ -82,13 +89,24 @@ public TestObjectC(T myProperty) {
         }
     }
 
+    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "@@@id")
+    private static class TestObjectD {
+
+        @JsonProperty("@@@id")
+        public String myIdentification = "id4";
+
+        public String myProperty = "valueD";
+    }
+
     private static class Wrapper {
         public TestObjectA testObjectA1;
         public TestObjectA testObjectA2;
         public TestObjectB testObjectB1;
         public TestObjectB testObjectB2;
         public TestObjectC<String> testObjectC1;
         public TestObjectC<String> testObjectC2;
+        public @JsonIdentityReference(alwaysAsId = true) TestObjectD testObjectD1;
+        public @JsonIdentityReference(alwaysAsId = true) TestObjectD testObjectD2;
     }
 
 }