Feature/inherited json identity info (#946)

* Add subclass of `JsonIdentityInfo` class.

Represent the current (buggy) state in the unit test.

Note: that Jackson treats the subclass as a `JsonIdentityInfo` even
though the annotation is not inherited.

* Update tests for correct behavior.

Subclasses of `JsonIdentityInfo` class should be treated like
`JsonIdentityInfo` classes.

* Update `Jackson2Parser.java` to handle "inheried" `JsonIdentityInfo`.

The parser needs to walk the class hierarchy looking for
`JsonIdentityInfo` because the annotation is not marked as `Inherited`,
but Jackson observes the `JsonIdentityInfo` behavior on subclasses
regardless.

Author: kschaefe

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

@@ -365,6 +365,20 @@ private static Integer getCreatorIndex(BeanProperty beanProperty) {
         }
     }
 
+    private <T extends Annotation> T findClassAnnotation(Class<?> cls, Class<T> annotation) {
+        T identityInfo = cls.getAnnotation(annotation);
+
+        if (identityInfo == null) {
+            Class<?> parent = cls.getSuperclass();
+
+            if (parent != null) {
+                return findClassAnnotation(parent, annotation);
+            }
+        }
+
+        return identityInfo;
+    }
+
     // @JsonIdentityInfo and @JsonIdentityReference
     private Type processIdentity(Type propertyType, BeanProperty beanProperty) {
 
@@ -373,13 +387,13 @@ private Type processIdentity(Type propertyType, BeanProperty beanProperty) {
         final Class<?> cls = clsT != null ? clsT : clsW;
 
         if (cls != null) {
-            final JsonIdentityInfo identityInfoC = cls.getAnnotation(JsonIdentityInfo.class);
+            final JsonIdentityInfo identityInfoC = this.findClassAnnotation(cls, JsonIdentityInfo.class);
             final JsonIdentityInfo identityInfoP = beanProperty.getAnnotation(JsonIdentityInfo.class);
             final JsonIdentityInfo identityInfo = identityInfoP != null ? identityInfoP : identityInfoC;
             if (identityInfo == null) {
                 return null;
             }
-            final JsonIdentityReference identityReferenceC = cls.getAnnotation(JsonIdentityReference.class);
+            final JsonIdentityReference identityReferenceC = this.findClassAnnotation(cls, JsonIdentityReference.class);
             final JsonIdentityReference identityReferenceP = beanProperty.getAnnotation(JsonIdentityReference.class);
             final JsonIdentityReference identityReference = identityReferenceP != null ? identityReferenceP : identityReferenceC;
             final boolean alwaysAsId = identityReference != null && identityReference.alwaysAsId();

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

@@ -26,13 +26,15 @@ public class ObjectAsIdTest {
     @Test
     public void testJackson() throws JsonProcessingException {
         final TestObjectA testObjectA = new TestObjectA();
+        final TestObjectSubA testObjectSubA = new TestObjectSubA();
         final TestObjectB testObjectB = new TestObjectB();
         final TestObjectC<String> testObjectC = new TestObjectC<>("valueC");
         final TestObjectD testObjectD = new TestObjectD();
         final TestObjectE testObjectE = new TestObjectE();
         final Wrapper wrapper = new Wrapper();
         wrapper.testObjectA1 = testObjectA;
         wrapper.testObjectA2 = testObjectA;
+        wrapper.testObjectSubA = testObjectSubA;
         wrapper.testObjectB1 = testObjectB;
         wrapper.testObjectB2 = testObjectB;
         wrapper.testObjectC1 = testObjectC;
@@ -47,6 +49,7 @@ public void testJackson() throws JsonProcessingException {
         final String json = objectMapper.writeValueAsString(wrapper);
         Assertions.assertTrue(json.contains("\"testObjectA1\": \"id1\""));
         Assertions.assertTrue(json.contains("\"testObjectA2\": \"id1\""));
+        Assertions.assertTrue(json.contains("\"testObjectSubA\": \"id1\""));
         Assertions.assertTrue(json.contains("\"testObjectB1\": {"));
         Assertions.assertTrue(json.contains("\"testObjectB2\": \"id2\""));
         Assertions.assertTrue(json.contains("\"testObjectC1\": {"));
@@ -121,13 +124,15 @@ public void test() {
         final Settings settings = TestUtils.settings();
         final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Wrapper.class));
         Assertions.assertTrue(output.contains("testObjectA1: string"));
+        Assertions.assertTrue(output.contains("testObjectSubA: string"));
         Assertions.assertTrue(output.contains("testObjectB1: TestObjectB | string"));
         Assertions.assertTrue(output.contains("testObjectC1: TestObjectC<string> | string"));
         Assertions.assertTrue(output.contains("testObjectD1: string"));
         Assertions.assertTrue(output.contains("testObjectE1: string"));
         Assertions.assertTrue(output.contains("testObjectE2: TestObjectE | string"));
         Assertions.assertTrue(output.contains("testObjectE3: TestObjectE"));
         Assertions.assertTrue(!output.contains("interface TestObjectA"));
+        Assertions.assertTrue(!output.contains("interface TestObjectSubA"));
         Assertions.assertTrue(output.contains("interface TestObjectB"));
         Assertions.assertTrue(output.contains("interface TestObjectC<T>"));
         Assertions.assertTrue(!output.contains("interface TestObjectD"));
@@ -197,6 +202,10 @@ private static class TestObjectA {
         public String myProperty = "valueA";
     }
 
+    private static class TestObjectSubA extends TestObjectA {
+        public String subProperty = "valueSubA";
+    }
+
     @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "@@@id")
     private static class TestObjectB {
 
@@ -277,6 +286,7 @@ private static class TestObjectE {
     private static class Wrapper {
         public TestObjectA testObjectA1;
         public TestObjectA testObjectA2;
+        public TestObjectSubA testObjectSubA;
         public TestObjectB testObjectB1;
         public TestObjectB testObjectB2;
         public TestObjectC<String> testObjectC1;