Jackson2 upgraded to version 2.8.6

Author: vojtechhabarta

typescript-generator-core/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.6.3</version>
+            <version>2.8.6</version>
         </dependency>
 <!--        <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

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

@@ -38,7 +38,7 @@ public Jackson2Parser(Settings settings, TypeProcessor typeProcessor, boolean us
         super(settings, typeProcessor);
         if (!settings.disableJackson2ModuleDiscovery) {
             objectMapper.registerModules(ObjectMapper.findModules(settings.classLoader));
-        }
+            }
         if (useJaxbAnnotations) {
             AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(objectMapper.getTypeFactory());
             objectMapper.setAnnotationIntrospector(introspector);
@@ -52,7 +52,8 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
         if (beanHelper != null) {
             for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
-                Type propertyType = beanPropertyWriter.getGenericPropertyType();
+                final Member propertyMember = beanPropertyWriter.getMember().getMember();
+                Type propertyType = getGenericType(propertyMember);
                 if (propertyType == JsonNode.class) {
                     propertyType = Object.class;
                 }
@@ -122,6 +123,16 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         return new BeanModel(sourceClass.type, superclass, taggedUnionClasses, discriminantProperty, discriminantLiteral, interfaces, properties, null);
     }
 
+    private static Type getGenericType(Member member) {
+        if (member instanceof Method) {
+            return ((Method) member).getGenericReturnType();
+        }
+        if (member instanceof Field) {
+            return ((Field) member).getGenericType();
+        }
+        return null;
+    }
+
     private static boolean isSupported(JsonTypeInfo jsonTypeInfo) {
         return jsonTypeInfo != null &&
                 jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY &&