Using BeanPropertyWriter.getAnnotation() (refs #202)

(instead of reading annotations directly from `Member`)

Author: vojtechhabarta

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

@@ -3,7 +3,6 @@
 
 import cz.habarta.typescript.generator.*;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Member;
 import java.lang.reflect.Type;
 import java.util.*;
@@ -48,7 +47,7 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
 
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
         if (beanHelper != null) {
-            for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
+            for (final BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 final Member propertyMember = beanPropertyWriter.getMember().getMember();
                 checkMember(propertyMember, beanPropertyWriter.getName(), sourceClass.type);
                 Type propertyType = beanPropertyWriter.getGenericPropertyType();
@@ -68,7 +67,12 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                         continue;
                     }
                 }
-                final boolean optional = isAnnotatedPropertyOptional((AnnotatedElement) propertyMember);
+                final boolean optional = isAnnotatedPropertyOptional(new AnnotatedProperty() {
+                    @Override
+                    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+                        return beanPropertyWriter.getAnnotation(annotationClass);
+                    }
+                });
                 final Member originalMember = beanPropertyWriter.getMember().getMember();
                 properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, optional, sourceClass.type, originalMember, null));
             }

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

@@ -20,7 +20,6 @@
 import java.beans.PropertyDescriptor;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
@@ -69,7 +68,7 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
 
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
         if (beanHelper != null) {
-            for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
+            for (final BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 final Member propertyMember = beanPropertyWriter.getMember().getMember();
                 checkMember(propertyMember, beanPropertyWriter.getName(), sourceClass.type);
                 Type propertyType = getGenericType(propertyMember);
@@ -91,7 +90,12 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                 }
                 final boolean optional = settings.optionalProperties == OptionalProperties.useLibraryDefinition
                         ? !beanPropertyWriter.isRequired()
-                        : isAnnotatedPropertyOptional((AnnotatedElement) propertyMember);
+                        : isAnnotatedPropertyOptional(new AnnotatedProperty() {
+                            @Override
+                            public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+                                return beanPropertyWriter.getAnnotation(annotationClass);
+                            }
+                        });
                 // @JsonUnwrapped
                 PropertyModel.PullProperties pullProperties = null;
                 final Member originalMember = beanPropertyWriter.getMember().getMember();

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

@@ -93,7 +93,12 @@ protected static void checkMember(Member propertyMember, String propertyName, Cl
         }
     }
 
-    protected boolean isAnnotatedPropertyOptional(AnnotatedElement annotatedProperty) {
+    // replace with lambda on Java8
+    protected static interface AnnotatedProperty {
+        public <T extends Annotation> T getAnnotation(Class<T> annotationClass);
+    }
+
+    protected boolean isAnnotatedPropertyOptional(AnnotatedProperty annotatedProperty) {
         if (settings.optionalProperties == OptionalProperties.all) {
             return true;
         }