Consider primitive types in ParametrizedInput classes #421

Author: kobylynskyi

src/main/java/com/kobylynskyi/graphql/codegen/model/OperationDefinition.java

@@ -13,7 +13,7 @@
 public class OperationDefinition {
 
     /**
-     * Normalized name using {@link DataModelMapper#capitalizeIfRestricted(String) MapperUtils.capitalizeIfRestricted() }
+     * Normalized name using {@link DataModelMapper#capitalizeIfRestricted(MappingContext, String)} }
      */
     private String name;
     /**

src/main/java/com/kobylynskyi/graphql/codegen/model/ParameterDefinition.java

@@ -20,7 +20,7 @@ public class ParameterDefinition {
 
     private String type;
     /**
-     * Normalized name using {@link DataModelMapper#capitalizeIfRestricted(String) MapperUtils.capitalizeIfRestricted() }
+     * Normalized name using {@link DataModelMapper#capitalizeIfRestricted(MappingContext, String)} }
      */
     private String name;
     /**

src/main/resources/templates/javaClassGraphqlParametrizedInput.ftl

@@ -1,3 +1,4 @@
+<#assign MapperUtil=statics["com.kobylynskyi.graphql.codegen.java.JavaGraphQLTypeMapper"]>
 <#if package?has_content>
 package ${package};
 
@@ -102,9 +103,13 @@ public class ${className} implements GraphQLParametrizedInput {
         StringJoiner joiner = new StringJoiner(", ", "(", ")");
 <#if fields?has_content>
 <#list fields as field>
+<#if MapperUtil.isJavaPrimitive(field.type)>
+        joiner.add("${field.originalName}: " + GraphQLRequestSerializer.getEntry(${field.name}));
+<#else>
         if (${field.name} != null) {
             joiner.add("${field.originalName}: " + GraphQLRequestSerializer.getEntry(${field.name}));
         }
+</#if>
 </#list>
 </#if>
         return joiner.toString();

src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenRequestTest.java

@@ -77,6 +77,17 @@ void generate_WithModelSuffix() throws Exception {
                 getFileByName(files, "EventPropertyParentParametrizedInput.java"));
     }
 
+    @Test
+    void generate_PrimitivesInsideParametrizedInput() throws Exception {
+        new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/parametrized-input-client.graphqls"),
+                outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
+
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+
+        assertSameTrimmedContent(new File("src/test/resources/expected-classes/request/ClientDataParametrizedInput.java.txt"),
+                getFileByName(files, "ClientDataParametrizedInput.java"));
+    }
+
     @Test
     void generate_RequestAndResponseProjections_github() throws Exception {
         new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/github.graphqls"),

src/test/resources/expected-classes/request/ClientDataParametrizedInput.java.txt

@@ -0,0 +1,55 @@
+package com.github.graphql;
+
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLParametrizedInput;
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer;
+import java.util.StringJoiner;
+import java.util.Objects;
+
+/**
+ * Parametrized input for field data in type Client
+ */
+@javax.annotation.Generated(
+    value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
+    date = "2020-12-31T23:59:59-0500"
+)
+public class ClientDataParametrizedInput implements GraphQLParametrizedInput {
+
+    private int ID;
+
+    public ClientDataParametrizedInput() {
+    }
+
+    public ClientDataParametrizedInput(int ID) {
+        this.ID = ID;
+    }
+
+    public ClientDataParametrizedInput ID(int ID) {
+        this.ID = ID;
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        final ClientDataParametrizedInput that = (ClientDataParametrizedInput) obj;
+        return Objects.equals(ID, that.ID);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(ID);
+    }
+
+    @Override
+    public String toString() {
+        StringJoiner joiner = new StringJoiner(", ", "(", ")");
+        joiner.add("ID: " + GraphQLRequestSerializer.getEntry(ID));
+        return joiner.toString();
+    }
+
+}

src/test/resources/schemas/parametrized-input-client.graphqls

@@ -2,6 +2,8 @@ type Query {
     product(
         companyId: ID!
     ): Product!
+
+    clients: [Client!]!
 }
 
 interface Product {
@@ -13,3 +15,9 @@ interface Product {
 type LinkCode {
     html: String
 }
+
+type Client {
+    data(ID: Int!): Data!
+}
+
+enum Data { A B C }