Support @JsonUnwrapped used on backing fields (refs #247)

Author: vojtechhabarta

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

@@ -113,15 +113,11 @@ public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
                         });
                 // @JsonUnwrapped
                 PropertyModel.PullProperties pullProperties = null;
-                final Member originalMember = beanPropertyWriter.getMember().getMember();
-                if (originalMember instanceof AccessibleObject) {
-                    final AccessibleObject accessibleObject = (AccessibleObject) originalMember;
-                    final JsonUnwrapped annotation = accessibleObject.getAnnotation(JsonUnwrapped.class);
-                    if (annotation != null && annotation.enabled()) {
-                        pullProperties = new PropertyModel.PullProperties(annotation.prefix(), annotation.suffix());
-                    }
+                final JsonUnwrapped annotation = beanPropertyWriter.getAnnotation(JsonUnwrapped.class);
+                if (annotation != null && annotation.enabled()) {
+                    pullProperties = new PropertyModel.PullProperties(annotation.prefix(), annotation.suffix());
                 }
-                properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, optional, sourceClass.type, originalMember, pullProperties));
+                properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, optional, sourceClass.type, propertyMember, pullProperties));
             }
         }
         if (sourceClass.type.isEnum()) {

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

@@ -48,6 +48,24 @@ public void test() {
         Assert.assertEquals(expected.trim(), output.trim());
     }
 
+    @Test
+    public void testPrivateField() {
+        final Settings settings = TestUtils.settings();
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Person2.class));
+        final String expected = "\n"
+                + "interface Person2 {\n"
+                + "    first: string;\n"
+                + "    last: string;\n"
+                + "}\n"
+                + "\n"
+                + "interface Name {\n"
+                + "    first: string;\n"
+                + "    last: string;\n"
+                + "}\n"
+                + "";
+        Assert.assertEquals(expected.trim(), output.trim());
+    }
+
     public static class Person {
         @JsonUnwrapped(prefix = "A", suffix = "A")
         public Parent parentA;
@@ -69,6 +87,15 @@ public static class Name {
         public String first, last;
     }
 
+    public static class Person2 {
+        @JsonUnwrapped
+        private Name name;
+
+        public Name getName() {
+            return name;
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         final Parent parent = new Parent();
         parent.age = 18;
@@ -84,10 +111,13 @@ public static void main(String[] args) throws Exception {
         final Person person = new Person();
         person.parentA = parent;
         person.parentB = parent;
+        final Person2 person2 = new Person2();
+        person2.name = parent.name;
         final ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
         objectMapper.setDefaultPrettyPrinter(new StandardJsonPrettyPrinter());
         System.out.println(objectMapper.writeValueAsString(person));
+        System.out.println(objectMapper.writeValueAsString(person2));
     }
 
 }