Gson: support for optional properties (vojtechhabarta#676)

Author: vojtechhabarta

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

@@ -7,8 +7,10 @@
 import com.google.gson.annotations.SerializedName;
 import cz.habarta.typescript.generator.ExcludingTypeProcessor;
 import cz.habarta.typescript.generator.GsonConfiguration;
+import cz.habarta.typescript.generator.OptionalProperties;
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.TypeProcessor;
+import cz.habarta.typescript.generator.util.PropertyMember;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
@@ -92,7 +94,10 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                 if (serializedName != null) {
                     name = serializedName.value();
                 }
-                properties.add(new PropertyModel(name, field.getGenericType(), false, null, field, null, null, null));
+                final boolean optional = settings.optionalProperties == OptionalProperties.useLibraryDefinition
+                        ? true
+                        : isPropertyOptional(new PropertyMember(field, field.getGenericType(), field.getAnnotatedType(), null));
+                properties.add(new PropertyModel(name, field.getGenericType(), optional, null, field, null, null, null));
                 addBeanToQueue(new SourceType<>(field.getGenericType(), sourceClass.type, name));
             }
             cls = cls.getSuperclass();

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/parser/GsonParserTest.java

@@ -6,9 +6,13 @@
 import cz.habarta.typescript.generator.GsonConfiguration;
 import cz.habarta.typescript.generator.Input;
 import cz.habarta.typescript.generator.JsonLibrary;
+import cz.habarta.typescript.generator.OptionalProperties;
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.TestUtils;
 import cz.habarta.typescript.generator.TypeScriptGenerator;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -85,4 +89,44 @@ public void testStaticFieldIncluded() {
         Assert.assertTrue(output.contains("THIS_FIELD_SHOULD_NOT_BE_INCLUDED"));
     }
 
+    @Test
+    public void testOptionalProperties_Default() {
+        final String output = generate(settings, BeanWithOptionalProperty.class);
+        System.out.println(output);
+        Assert.assertTrue(output.contains("property1: string;"));
+    }
+
+    @Test
+    public void testOptionalProperties_All() {
+        settings.optionalProperties = OptionalProperties.all;
+        final String output = generate(settings, BeanWithOptionalProperty.class);
+        System.out.println(output);
+        Assert.assertTrue(output.contains("property1?: string;"));
+    }
+
+    @Test
+    public void testOptionalProperties_UseLibraryDefinition() {
+        settings.optionalProperties = OptionalProperties.useLibraryDefinition;
+        final String output = generate(settings, BeanWithOptionalProperty.class);
+        System.out.println(output);
+        Assert.assertTrue(output.contains("property1?: string;"));
+    }
+
+    @Test
+    public void testOptionalProperties_UseSpecifiedAnnotations() {
+        settings.optionalAnnotations = Arrays.asList(OptionalProperty.class);
+        final String output = generate(settings, BeanWithOptionalProperty.class);
+        System.out.println(output);
+        Assert.assertTrue(output.contains("property1?: string;"));
+    }
+
+    private static class BeanWithOptionalProperty {
+        @OptionalProperty
+        private String property1;
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface OptionalProperty {
+    }
+
 }