fixed crash on properties which type is interface type (e.g. java.tim…

…e.LocalDateTime#chronology)
vojtechhabarta · Oct 29, 2015 · cdd448d · cdd448d
1 parent 8ad4d61
commit cdd448d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/sample-gradle/build.gradle b/sample-gradle/build.gradle
@@ -30,7 +30,7 @@ generateTypeScript {
         'cz.habarta.typescript.generator.sample.Person'
     ]
     jsonLibrary = 'jackson2'
-    namespace = 'Rest';
+    namespace = 'GradleSample';
 //    module = 'my-module'
 //    declarePropertiesAsOptional = false
 //    removeTypeNameSuffix = 'Json'

diff --git a/sample-maven/pom.xml b/sample-maven/pom.xml
@@ -32,7 +32,9 @@
                             <classes>
                                 <class>cz.habarta.typescript.generator.sample.Person</class>
                             </classes>
+                            <jsonLibrary>jackson2</jsonLibrary>
                             <outputFile>target/sample.d.ts</outputFile>
+                            <namespace>MavenSample</namespace>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/ClassWithUsage.java b/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/ClassWithUsage.java
@@ -15,7 +15,7 @@ public ClassWithUsage(Class<?> beanClass, String usedInProperty, Class<?> usedIn
     }
 
     public String usage() {
-        return usedInClass.getSimpleName() + "." + usedInProperty;
+        return (usedInClass != null ? (usedInClass.getSimpleName() + ".") : "") + usedInProperty;
     }
 
 }
diff --git a/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson1Parser.java b/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson1Parser.java
@@ -28,7 +28,7 @@ protected BeanModel parseBean(ClassWithUsage classWithUsage) {
             for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 if (!isParentProperty(beanPropertyWriter.getName(), classWithUsage.beanClass)) {
                     Type propertyType = beanPropertyWriter.getGenericPropertyType();
-                    if (propertyType.equals(JsonNode.class)) {
+                    if (propertyType == JsonNode.class) {
                         propertyType = Object.class;
                     }
                     properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, classWithUsage.beanClass));
@@ -42,15 +42,15 @@ protected BeanModel parseBean(ClassWithUsage classWithUsage) {
                 addBeanToQueue(new ClassWithUsage(type.value(), "<subClass>", classWithUsage.beanClass));
             }
         }
-        final Class<?> superclass = classWithUsage.beanClass.getSuperclass().equals(Object.class) ? null : classWithUsage.beanClass.getSuperclass();
+        final Class<?> superclass = classWithUsage.beanClass.getSuperclass() == Object.class ? null : classWithUsage.beanClass.getSuperclass();
         if (superclass != null) {
             addBeanToQueue(new ClassWithUsage(superclass, "<superClass>", classWithUsage.beanClass));
         }
         return new BeanModel(classWithUsage.beanClass, superclass, properties);
     }
 
     private boolean isParentProperty(String property, Class<?> cls) {
-        if (cls.getSuperclass().equals(Object.class)) {
+        if (cls.getSuperclass() == Object.class) {
             return false;
         } else {
             final BeanHelper beanHelper = getBeanHelper(cls.getSuperclass());
@@ -66,6 +66,9 @@ private boolean isParentProperty(String property, Class<?> cls) {
     }
 
     private BeanHelper getBeanHelper(Class<?> beanClass) {
+        if (beanClass == null) {
+            return null;
+        }
         try {
             final SerializationConfig serializationConfig = objectMapper.getSerializationConfig();
             final JavaType simpleType = objectMapper.constructType(beanClass);

diff --git a/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java b/...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java
@@ -27,7 +27,7 @@ protected BeanModel parseBean(ClassWithUsage classWithUsage) {
             for (BeanPropertyWriter beanPropertyWriter : beanHelper.getProperties()) {
                 if (!isParentProperty(beanPropertyWriter.getName(), classWithUsage.beanClass)) {
                     Type propertyType = beanPropertyWriter.getGenericPropertyType();
-                    if (propertyType.equals(JsonNode.class)) {
+                    if (propertyType == JsonNode.class) {
                         propertyType = Object.class;
                     }
                     properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, classWithUsage.beanClass));
@@ -41,15 +41,15 @@ protected BeanModel parseBean(ClassWithUsage classWithUsage) {
                 addBeanToQueue(new ClassWithUsage(type.value(), "<subClass>", classWithUsage.beanClass));
             }
         }
-        final Class<?> superclass = classWithUsage.beanClass.getSuperclass().equals(Object.class) ? null : classWithUsage.beanClass.getSuperclass();
+        final Class<?> superclass = classWithUsage.beanClass.getSuperclass() == Object.class ? null : classWithUsage.beanClass.getSuperclass();
         if (superclass != null) {
             addBeanToQueue(new ClassWithUsage(superclass, "<superClass>", classWithUsage.beanClass));
         }
         return new BeanModel(classWithUsage.beanClass, superclass, properties);
     }
 
     private boolean isParentProperty(String property, Class<?> cls) {
-        if (cls.getSuperclass().equals(Object.class)) {
+        if (cls.getSuperclass() == Object.class) {
             return false;
         } else {
             final BeanHelper beanHelper = getBeanHelper(cls.getSuperclass());
@@ -65,6 +65,9 @@ private boolean isParentProperty(String property, Class<?> cls) {
     }
 
     private BeanHelper getBeanHelper(Class<?> beanClass) {
+        if (beanClass == null) {
+            return null;
+        }
         try {
             final DefaultSerializerProvider.Impl serializerProvider1 = (DefaultSerializerProvider.Impl) objectMapper.getSerializerProvider();
             final DefaultSerializerProvider.Impl serializerProvider2 = serializerProvider1.createInstance(objectMapper.getSerializationConfig(), objectMapper.getSerializerFactory());