Reading annotations using Jackson method (#440)

Author: vojtechhabarta

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

@@ -83,7 +83,7 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         if (beanHelper != null) {
             for (final BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 final Member member = beanPropertyWriter.getMember().getMember();
-                final PropertyMember propertyMember = wrapMember(settings.getTypeParser(), member, beanPropertyWriter.getName(), sourceClass.type);
+                final PropertyMember propertyMember = wrapMember(settings.getTypeParser(), member, beanPropertyWriter::getAnnotation, beanPropertyWriter.getName(), sourceClass.type);
                 Type propertyType = beanPropertyWriter.getGenericPropertyType();
                 if (!isAnnotatedPropertyIncluded(beanPropertyWriter::getAnnotation, sourceClass.type.getName() + "." + beanPropertyWriter.getName())) {
                     continue;

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

@@ -213,7 +213,7 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass, List<String> class
         if (beanHelper != null) {
             for (final BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 final Member member = beanPropertyWriter.getMember().getMember();
-                final PropertyMember propertyMember = wrapMember(settings.getTypeParser(), member, beanPropertyWriter.getName(), sourceClass.type);
+                final PropertyMember propertyMember = wrapMember(settings.getTypeParser(), member, beanPropertyWriter::getAnnotation, beanPropertyWriter.getName(), sourceClass.type);
                 Type propertyType = propertyMember.getType();
                 final List<String> propertyComments = getComments(beanPropertyWriter.getAnnotation(JsonPropertyDescription.class));
 
@@ -323,7 +323,7 @@ private Type processIdentity(Type propertyType, BeanPropertyWriter propertyWrite
                 if (idProperty.isPresent()) {
                     final BeanPropertyWriter idPropertyWriter = idProperty.get();
                     final Member idMember = idPropertyWriter.getMember().getMember();
-                    final PropertyMember idPropertyMember = wrapMember(settings.getTypeParser(), idMember, idPropertyWriter.getName(), cls);
+                    final PropertyMember idPropertyMember = wrapMember(settings.getTypeParser(), idMember, idPropertyWriter::getAnnotation, idPropertyWriter.getName(), cls);
                     idType = idPropertyMember.getType();
                 } else {
                     return null;

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

@@ -8,6 +8,7 @@
 import cz.habarta.typescript.generator.TypeScriptGenerator;
 import cz.habarta.typescript.generator.compiler.EnumKind;
 import cz.habarta.typescript.generator.compiler.EnumMemberModel;
+import cz.habarta.typescript.generator.util.AnnotationGetter;
 import cz.habarta.typescript.generator.util.GenericsResolver;
 import cz.habarta.typescript.generator.util.PropertyMember;
 import cz.habarta.typescript.generator.util.Utils;
@@ -118,14 +119,15 @@ private Model parseQueue() {
 
     protected abstract DeclarationModel parseClass(SourceType<Class<?>> sourceClass);
 
-    protected static PropertyMember wrapMember(TypeParser typeParser, Member propertyMember, String propertyName, Class<?> sourceClass) {
+    protected static PropertyMember wrapMember(TypeParser typeParser, Member propertyMember, AnnotationGetter annotationGetter,
+            String propertyName, Class<?> sourceClass) {
         if (propertyMember instanceof Field) {
             final Field field = (Field) propertyMember;
-            return new PropertyMember.FieldPropertyMember(field, typeParser.getFieldType(field));
+            return new PropertyMember(field, typeParser.getFieldType(field), field.getAnnotatedType(), annotationGetter);
         }
         if (propertyMember instanceof Method) {
             final Method method = (Method) propertyMember;
-            return new PropertyMember.MethodPropertyMember(method, typeParser.getMethodReturnType(method));
+            return new PropertyMember(method, typeParser.getMethodReturnType(method), method.getAnnotatedReturnType(), annotationGetter);
         }
         throw new RuntimeException(String.format(
                 "Unexpected member type '%s' in property '%s' in class '%s'",

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/AnnotationGetter.java

@@ -0,0 +1,10 @@
+
+package cz.habarta.typescript.generator.util;
+
+import java.lang.annotation.Annotation;
+
+
+@FunctionalInterface
+public interface AnnotationGetter {
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass);
+}

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/util/PropertyMember.java

@@ -4,80 +4,35 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.AnnotatedType;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Objects;
 
 
-public abstract class PropertyMember {
+public class PropertyMember {
 
-    public abstract Type getType();
+    private final AnnotatedElement annotatedElement;
+    private final Type type;
+    private final AnnotatedType annotatedType;
+    private final AnnotationGetter annotationGetter;
 
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        final A annotation = getAnnotatedElement().getAnnotation(annotationClass);
-        return annotation != null
-                ? annotation
-                : getAnnotatedType().getAnnotation(annotationClass);
+    public PropertyMember(AnnotatedElement annotatedElement, Type type, AnnotatedType annotatedType, AnnotationGetter annotationGetter) {
+        this.annotatedElement = Objects.requireNonNull(annotatedElement);
+        this.type = Objects.requireNonNull(type);
+        this.annotatedType = Objects.requireNonNull(annotatedType);
+        this.annotationGetter = annotationGetter;
     }
 
-    protected abstract AnnotatedElement getAnnotatedElement();
-
-    protected abstract AnnotatedType getAnnotatedType();
-
-
-    public static class FieldPropertyMember extends PropertyMember {
-
-        private final Field field;
-        private final Type type;
-
-        public FieldPropertyMember(Field field, Type type) {
-            this.field = Objects.requireNonNull(field);
-            this.type = Objects.requireNonNull(type);
-        }
-
-        @Override
-        public Type getType() {
-            return type;
-        }
-
-        @Override
-        public AnnotatedElement getAnnotatedElement() {
-            return field;
-        }
-
-        @Override
-        public AnnotatedType getAnnotatedType() {
-            return field.getAnnotatedType();
-        }
-
+    public Type getType() {
+        return type;
     }
 
-    public static class MethodPropertyMember extends PropertyMember {
-
-        private final Method method;
-        private final Type type;
-
-        public MethodPropertyMember(Method method, Type type) {
-            this.method = Objects.requireNonNull(method);
-            this.type = Objects.requireNonNull(type);
-        }
-
-        @Override
-        public Type getType() {
-            return type;
-        }
-
-        @Override
-        public AnnotatedElement getAnnotatedElement() {
-            return method;
-        }
-
-        @Override
-        public AnnotatedType getAnnotatedType() {
-            return method.getAnnotatedReturnType();
-        }
-
+    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
+        final A annotation = annotationGetter != null
+                ? annotationGetter.getAnnotation(annotationClass)
+                : annotatedElement.getAnnotation(annotationClass);
+        return annotation != null
+                ? annotation
+                : annotatedType.getAnnotation(annotationClass);
     }
 
 }

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

@@ -132,4 +132,33 @@ public String getProperty2() {
         }
     }
 
+    @Test
+    public void testAnnotatedPrivateField() {
+        final Settings settings = TestUtils.settings();
+        settings.optionalAnnotations.add(TypescriptOptional.class);
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(SearchDTO.class));
+        Assert.assertTrue(output.contains("selectedId?: number;"));
+    }
+
+    public class SearchDTO {
+
+        private Integer year;
+
+        @TypescriptOptional
+        private Long selectedId;
+
+        public Integer getYear() {
+            return year;
+        }
+
+        public Long getSelectedId() {
+            return selectedId;
+        }
+
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface TypescriptOptional {
+    }
+
 }