Fix for vojtechhabarta#172 - Handling empty @JsonTypeName() correctly.

Yona-Appletree · Sep 18, 2017 · ce03e9e · ce03e9e
1 parent 880608f
commit ce03e9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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
@@ -170,7 +170,7 @@ private String getDiscriminantPropertyName(JsonTypeInfo jsonTypeInfo) {
     private String getTypeName(final Class<?> cls) {
         // find @JsonTypeName recursively
         final JsonTypeName jsonTypeName = getAnnotationRecursive(cls, JsonTypeName.class);
-        if (jsonTypeName != null) {
+        if (jsonTypeName != null && ! jsonTypeName.value().isEmpty()) {
             return jsonTypeName.value();
         }
         // find @JsonSubTypes.Type recursively

diff --git a/...ript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java b/...ript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java
@@ -89,6 +89,7 @@ private static interface ParentWithNameDiscriminant {
     @JsonTypeName("explicit-name1")
     private static class SubTypeDiscriminatedByName1 implements ParentWithNameDiscriminant {
     }
+    @JsonTypeName(/* Default should be the simplename of the class */)
     private static class SubTypeDiscriminatedByName2 implements ParentWithNameDiscriminant {
     }
     private static class SubTypeDiscriminatedByName3 implements ParentWithNameDiscriminant {