JAXBElement<T> mapped to T (refs #175)

Author: vojtechhabarta

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

@@ -6,6 +6,7 @@
 import java.lang.reflect.*;
 import java.math.*;
 import java.util.*;
+import javax.xml.bind.JAXBElement;
 
 
 public class DefaultTypeProcessor implements TypeProcessor {
@@ -19,6 +20,16 @@ public Result processType(Type javaType, Context context) {
                 return new Result(TsType.Date);
             }
         }
+        if (javaType instanceof ParameterizedType) {
+            final ParameterizedType parameterizedType = (ParameterizedType) javaType;
+            if (parameterizedType.getRawType() instanceof Class) {
+                final Class<?> javaClass = (Class<?>) parameterizedType.getRawType();
+                if (JAXBElement.class.isAssignableFrom(javaClass)) {
+                    final Result result = context.processType(parameterizedType.getActualTypeArguments()[0]);
+                    return new Result(result.getTsType(), result.getDiscoveredClasses());
+                }
+            }
+        }
         // map JAX-RS standard types to `any`
         for (Class<?> cls : JaxrsApplicationParser.getStandardEntityClasses()) {
             final Class<?> rawClass = Utils.getRawClassOrNull(javaType);

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

@@ -1,6 +1,7 @@
 
 package cz.habarta.typescript.generator;
 
+import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,4 +29,36 @@ private static class MyJaxbBean {
 
     }
 
+    @Test
+    public void testJAXBElement() {
+        final Settings settings = TestUtils.settings();
+        settings.jsonLibrary = JsonLibrary.jaxb;
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(ClassWithJAXBElements.class));
+        Assert.assertTrue(output.contains("ExternalReference: string"));
+        Assert.assertTrue(output.contains("UserInformation: UserType"));
+        Assert.assertTrue(output.contains("Source: EndPointType"));
+        Assert.assertTrue(output.contains("AdditionalContextInfo: AdditionalContextType"));
+    }
+
+    @XmlRootElement
+    private static class ClassWithJAXBElements {
+        @XmlElement(name = "ExternalReference")
+        protected String externalReference;
+        @XmlElementRef(name = "UserInformation", type = JAXBElement.class, required = false)
+        protected JAXBElement<UserType> userInformation;
+        @XmlElementRef(name = "Source", type = JAXBElement.class, required = false)
+        protected JAXBElement<EndPointType> source;
+        @XmlElementRef(name = "AdditionalContextInfo", type = JAXBElement.class, required = false)
+        protected JAXBElement<AdditionalContextType> additionalContextInfo;
+    }
+
+    private static class UserType {
+    }
+
+    private static class EndPointType {
+    }
+
+    private static class AdditionalContextType {
+    }
+
 }