Jackson2 enums with JsonFormat.Shape.OBJECT (refs #140)

Author: vojtechhabarta

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

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator.parser;
 
+import cz.habarta.typescript.generator.util.Utils;
 import java.lang.reflect.Type;
 import java.util.*;
 
@@ -20,7 +21,7 @@ public BeanModel(Class<?> origin, Type parent, List<Class<?>> taggedUnionClasses
         this.taggedUnionClasses = taggedUnionClasses;
         this.discriminantProperty = discriminantProperty;
         this.discriminantLiteral = discriminantLiteral;
-        this.interfaces = interfaces;
+        this.interfaces = Utils.listFromNullable(interfaces);
         this.properties = properties;
     }
 

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

@@ -34,7 +34,15 @@ public boolean isHandled(Annotation ann) {
     }
 
     @Override
-    protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
+    protected DeclarationModel parseClass(SourceType<Class<?>> sourceClass) {
+        if (sourceClass.type.isEnum()) {
+            return ModelParser.parseEnum(sourceClass);
+        } else {
+            return parseBean(sourceClass);
+        }
+    }
+
+    private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         final List<PropertyModel> properties = new ArrayList<>();
 
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);

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

@@ -48,7 +48,15 @@ public Jackson2Parser(Settings settings, TypeProcessor typeProcessor, boolean us
     }
 
     @Override
-    protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
+    protected DeclarationModel parseClass(SourceType<Class<?>> sourceClass) {
+        if (sourceClass.type.isEnum()) {
+            return parseEnumOrObjectEnum(sourceClass);
+        } else {
+            return parseBean(sourceClass);
+        }
+    }
+
+    private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
         final List<PropertyModel> properties = new ArrayList<>();
 
         final BeanHelper beanHelper = getBeanHelper(sourceClass.type);
@@ -92,6 +100,9 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                 properties.add(processTypeAndCreateProperty(beanPropertyWriter.getName(), propertyType, optional, sourceClass.type, originalMember, pullProperties));
             }
         }
+        if (sourceClass.type.isEnum()) {
+            return new BeanModel(sourceClass.type, null, null, null, null, null, properties, null);
+        }
 
         final String discriminantProperty;
         final String discriminantLiteral;
@@ -252,9 +263,11 @@ public BeanPropertyWriter[] getProperties() {
 
     }
 
-    @Override
-    protected EnumModel<?> parseEnum(SourceType<Class<?>> sourceClass) {
+    private DeclarationModel parseEnumOrObjectEnum(SourceType<Class<?>> sourceClass) {
         final JsonFormat jsonFormat = sourceClass.type.getAnnotation(JsonFormat.class);
+        if (jsonFormat != null && jsonFormat.shape() == JsonFormat.Shape.OBJECT) {
+            return parseBean(sourceClass);
+        }
         final boolean isNumberBased = jsonFormat != null && (
                 jsonFormat.shape() == JsonFormat.Shape.NUMBER ||
                 jsonFormat.shape() == JsonFormat.Shape.NUMBER_FLOAT ||

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

@@ -60,12 +60,13 @@ private Model parseQueue() {
                     final Class<?> cls = (Class<?>) sourceType.type;
                     System.out.println("Parsing '" + cls.getName() + "'" +
                             (sourceType.usedInClass != null ? " used in '" + sourceType.usedInClass.getSimpleName() + "." + sourceType.usedInMember + "'" : ""));
-                    if (cls.isEnum()) {
-                        final EnumModel<?> enumModel = parseEnum(sourceType.asSourceClass());
-                        enums.add(enumModel);
+                    final DeclarationModel model = parseClass(sourceType.asSourceClass());
+                    if (model instanceof EnumModel) {
+                        enums.add((EnumModel) model);
+                    } else if (model instanceof BeanModel) {
+                        beans.add((BeanModel) model);
                     } else {
-                        final BeanModel bean = parseBean(sourceType.asSourceClass());
-                        beans.add(bean);
+                        throw new RuntimeException();
                     }
                 }
                 for (Class<?> cls : result.getDiscoveredClasses()) {
@@ -76,9 +77,9 @@ private Model parseQueue() {
         return new Model(beans, enums, jaxrsApplicationParser.getModel());
     }
 
-    protected abstract BeanModel parseBean(SourceType<Class<?>> sourceClass);
+    protected abstract DeclarationModel parseClass(SourceType<Class<?>> sourceClass);
 
-    protected EnumModel<?> parseEnum(SourceType<Class<?>> sourceClass) {
+    protected static DeclarationModel parseEnum(SourceType<Class<?>> sourceClass) {
         final List<EnumMemberModel<String>> values = new ArrayList<>();
         if (sourceClass.type.isEnum()) {
             @SuppressWarnings("unchecked")

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

@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
@@ -114,6 +116,19 @@ public void testExcludeObjectEnum() {
         assertTrue(!output.contains("StatusType"));
     }
 
+    @Test
+    public void testObjectEnum() {
+        final Settings settings = TestUtils.settings();
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(StatusType.class));
+        System.out.println(output);
+        final String expected = "" +
+                "interface StatusType {\n" +
+                "    code: number;\n" +
+                "    label: string;\n" +
+                "}";
+        assertEquals(expected.trim(), output.trim());
+    }
+
     private static class AClass {
         public Direction direction;
     }