Support for JSON classes written using JAXB (closes #5)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/JsonLibrary.java

@@ -3,5 +3,5 @@
 
 
 public enum JsonLibrary {
-    jackson1, jackson2
+    jackson1, jackson2, jaxb
 }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/TypeScriptGenerator.java

@@ -68,15 +68,24 @@ public TypeProcessor getTypeProcessor() {
 
     public ModelParser getModelParser() {
         if (modelParser == null) {
-            if (settings.jsonLibrary == JsonLibrary.jackson2) {
-                modelParser = new Jackson2Parser(settings, getTypeProcessor());
-            } else {
-                modelParser = new Jackson1Parser(settings, getTypeProcessor());
-            }
+            modelParser = createModelParser();
         }
         return modelParser;
     }
 
+    private ModelParser createModelParser() {
+        switch (settings.jsonLibrary) {
+            case jackson1:
+                return new Jackson1Parser(settings, getTypeProcessor());
+            case jackson2:
+                return new Jackson2Parser(settings, getTypeProcessor());
+            case jaxb:
+                return new Jackson2Parser(settings, getTypeProcessor(), /*useJaxbAnnotations*/ true);
+            default:
+                throw new RuntimeException();
+        }
+    }
+
     public ModelCompiler getModelCompiler() {
         if (modelCompiler == null) {
             modelCompiler = new ModelCompiler(settings, getTypeProcessor());

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

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ser.*;
+import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 import cz.habarta.typescript.generator.*;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
@@ -17,7 +18,15 @@ public class Jackson2Parser extends ModelParser {
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     public Jackson2Parser(Settings settings, TypeProcessor typeProcessor) {
+        this(settings, typeProcessor, false);
+    }
+
+    public Jackson2Parser(Settings settings, TypeProcessor typeProcessor, boolean useJaxbAnnotations) {
         super(settings, typeProcessor);
+        if (useJaxbAnnotations) {
+            AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(objectMapper.getTypeFactory());
+            objectMapper.setAnnotationIntrospector(introspector);
+        }
     }
 
     @Override

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

@@ -0,0 +1,31 @@
+
+package cz.habarta.typescript.generator;
+
+import javax.xml.bind.annotation.*;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class JaxbTest {
+
+    @Test
+    public void test() {
+        final Settings settings = TestUtils.settings();
+        settings.jsonLibrary = JsonLibrary.jaxb;
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(MyJaxbBean.class));
+        Assert.assertTrue(output.contains("king"));
+        Assert.assertFalse(output.contains("age"));
+    }
+
+    @XmlRootElement
+    private static class MyJaxbBean {
+
+        @XmlElement(name = "king")
+        public String name;
+
+        @XmlTransient
+        public int age;
+
+    }
+
+}

typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java

@@ -103,7 +103,10 @@ public class GenerateMojo extends AbstractMojo {
 
     /**
      * Library used in JSON classes.
-     * Supported values are 'jackson1', 'jackson2'.
+     * Supported values are
+     * 'jackson1' (annotations from 'org.codehaus.jackson.annotate' package),
+     * 'jackson2' (annotations from 'com.fasterxml.jackson.annotation' package),
+     * `jaxb` (annotations from 'javax.xml.bind.annotation' package).
      * Required parameter, recommended value is 'jackson2'.
      */
     @Parameter(required = true)