Java Optional<T> properties marked optional in TS (refs #159, #93)

Author: vojtechhabarta

typescript-generator-core/pom.xml

@@ -31,7 +31,7 @@
         <!--<dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>2.6.3</version>
+            <version>2.8.6</version>
         </dependency>-->
         <dependency>
             <groupId>javax.ws.rs</groupId>

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

@@ -38,7 +38,7 @@ public Result processType(Type javaType, Context context) {
             if (javaClass.getName().equals("java.util.OptionalInt") ||
                     javaClass.getName().equals("java.util.OptionalLong") ||
                     javaClass.getName().equals("java.util.OptionalDouble")) {
-                return new Result(TsType.Number);
+                return new Result(TsType.Number.optional());
             }
             // generic structural type used without type arguments
             if (javaClass.getTypeParameters().length > 0) {
@@ -64,7 +64,8 @@ public Result processType(Type javaType, Context context) {
                     return new Result(new TsType.IndexedArrayType(TsType.String, result.getTsType()), result.getDiscoveredClasses());
                 }
                 if (javaClass.getName().equals("java.util.Optional")) {
-                    return context.processType(parameterizedType.getActualTypeArguments()[0]);
+                    final Result result = context.processType(parameterizedType.getActualTypeArguments()[0]);
+                    return new Result(result.getTsType().optional(), result.getDiscoveredClasses());
                 }
                 // generic structural type
                 final List<Class<?>> discoveredClasses = new ArrayList<>();

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

@@ -6,6 +6,7 @@
 //import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 //import java.util.Objects;
 //import java.util.Optional;
+//import java.util.OptionalInt;
 //import org.junit.Assert;
 //import org.junit.Test;
 
@@ -21,7 +22,8 @@ public class OptionalTest {
 //        Assert.assertEquals(
 //                "interface Person {\n" +
 //                "    name: string;\n" +
-//                "    email: string;\n" +
+//                "    email?: string;\n" +
+//                "    age?: number;\n" +
 //                "}",
 //                output.trim());
 //    }
@@ -52,6 +54,7 @@ public class OptionalTest {
 //    private static class Person {
 //        public String name;
 //        public Optional<String> email;
+//        public OptionalInt age;
 //
 //        public Person() {
 //        }