Use Optional<> in models

Author: Frederick888

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "java"
+    id "war"
     id "idea"
     id "ivy-publish"
     id "jacoco"
@@ -23,6 +24,7 @@ dependencies {
     compileOnly "org.freemarker:freemarker:2.3.31"
     compileOnly "com.graphql-java:graphql-java:16.2"
     compileOnly "com.fasterxml.jackson.core:jackson-databind:2.12.1"
+    providedCompile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.1"
     compileOnly "com.typesafe:config:1.4.1"
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"

src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLCodegen.java

@@ -47,11 +47,11 @@ protected void initCustomTypeMappings(Collection<ExtendedScalarTypeDefinition> s
         mappingConfig.putCustomTypeMappingIfAbsent("ID", String.class.getSimpleName());
         mappingConfig.putCustomTypeMappingIfAbsent("String", String.class.getSimpleName());
         mappingConfig.putCustomTypeMappingIfAbsent("Int", Integer.class.getSimpleName());
-        mappingConfig.putCustomTypeMappingIfAbsent("Int!", "int");
+        mappingConfig.putCustomTypeMappingIfAbsent("Int!", "Integer");
         mappingConfig.putCustomTypeMappingIfAbsent("Float", Double.class.getSimpleName());
-        mappingConfig.putCustomTypeMappingIfAbsent("Float!", "double");
+        mappingConfig.putCustomTypeMappingIfAbsent("Float!", "Double");
         mappingConfig.putCustomTypeMappingIfAbsent("Boolean", Boolean.class.getSimpleName());
-        mappingConfig.putCustomTypeMappingIfAbsent("Boolean!", "boolean");
+        mappingConfig.putCustomTypeMappingIfAbsent("Boolean!", "Boolean");
     }
 
 }

src/main/java/com/kobylynskyi/graphql/codegen/utils/Utils.java

@@ -1,6 +1,7 @@
 package com.kobylynskyi.graphql.codegen.utils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.kobylynskyi.graphql.codegen.model.exception.UnableToCreateDirectoryException;
 import com.kobylynskyi.graphql.codegen.model.exception.UnableToDeleteDirectoryException;
 import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLOperation;
@@ -20,6 +21,9 @@
 public final class Utils {
 
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    static {
+        OBJECT_MAPPER.registerModule(new Jdk8Module());
+    }
 
     private Utils() {
     }

src/main/resources/templates/java-lang/javaClassGraphqlType.ftl

@@ -17,6 +17,10 @@ import java.util.Objects;
 <#if toString>
 import java.util.StringJoiner;
 </#if>
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 <#if javaDoc?has_content>
 /**
@@ -34,6 +38,7 @@ import java.util.StringJoiner;
 <#list annotations as annotation>
 @${annotation}
 </#list>
+@JsonInclude(Include.NON_NULL)
 public class ${className} implements java.io.Serializable<#if implements?has_content><#list implements as interface>, ${interface}<#if interface_has_next></#if></#list></#if> {
 
 <#if fields?has_content>
@@ -44,7 +49,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
         <#list field.annotations as annotation>
     @${annotation}
         </#list>
-    private ${field.type} ${field.name}<#if field.defaultValue?has_content> = ${field.defaultValue}</#if>;
+    private Optional<${field.type}> ${field.name}<#if field.defaultValue?has_content> = ${field.defaultValue}</#if>;
     </#list>
 </#if>
 
@@ -53,6 +58,12 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
 
 <#if fields?has_content>
     public ${className}(<#list fields as field>${field.type} ${field.name}<#if field_has_next>, </#if></#list>) {
+    <#list fields as field>
+        this.${field.name} = Optional.ofNullable(${field.name});
+    </#list>
+    }
+
+    public ${className}(<#list fields as field>Optional<${field.type}> ${field.name}<#if field_has_next>, </#if></#list>) {
     <#list fields as field>
         this.${field.name} = ${field.name};
     </#list>
@@ -72,7 +83,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
     @${field.deprecated.annotation}
         </#if>
     public <#if field.mandatory && field.definitionInParentType?has_content && !field.definitionInParentType.mandatory>${field.definitionInParentType.type}<#else>${field.type}</#if> get${field.name?cap_first}() {
-        return ${field.name};
+        return (${field.name} == null || ${field.name}.isEmpty()) ? null : ${field.name}.get();
     }
         <#if !immutableModels>
             <#if field.javaDoc?has_content>
@@ -86,7 +97,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
     @${field.deprecated.annotation}
             </#if>
     public void set${field.name?cap_first}(${field.type} ${field.name}) {
-        this.${field.name} = ${field.name};
+        this.${field.name} = Optional.ofNullable(${field.name});
     }
         </#if>
 
@@ -133,7 +144,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
         joiner.add("${field.originalName}: " + ${field.name});
                 </#if>
             <#else>
-        if (${field.name} != null) {
+        if (${field.name} != null && ${field.name}.isPresent()) {
                 <#if toStringForRequest>
             joiner.add("${field.originalName}: " + GraphQLRequestSerializer.getEntry(${field.name}<#if field.serializeUsingObjectMapper>, true</#if>));
                 <#else>
@@ -160,7 +171,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
 
     <#if fields?has_content>
         <#list fields as field>
-        private ${field.type} ${field.name}<#if field.defaultValue?has_content> = ${field.defaultValue}</#if>;
+        private Optional<${field.type}> ${field.name}<#if field.defaultValue?has_content> = Optional.ofNullable(${field.defaultValue})</#if>;
         </#list>
     </#if>
 
@@ -180,7 +191,7 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
         @${field.deprecated.annotation}
             </#if>
         public Builder set${field.name?cap_first}(${field.type} ${field.name}) {
-            this.${field.name} = ${field.name};
+            this.${field.name} = Optional.ofNullable(${field.name});
             return this;
         }