Handle POJO generation when GraphQL type has field named "class" #994

kobylynskyi · kobylynskyi · commit a1c9f20fe36d · 2022-09-05T15:27:18.000-04:00
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionToParameterMapper.java
@@ -141,6 +141,8 @@ private ParameterDefinition mapField(MappingContext mappingContext,
         parameter.setDeprecated(DeprecatedDefinitionBuilder.build(mappingContext, fieldDef));
         parameter.setMandatory(namedDefinition.isMandatory());
         parameter.setSerializeUsingObjectMapper(namedDefinition.isSerializeUsingObjectMapper());
+        parameter.setGetterMethodName(dataModelMapper.capitalizeMethodNameIfRestricted(mappingContext,
+                "get" + Utils.capitalize(fieldDef.getName())));
 
         if (Boolean.TRUE.equals(mappingContext.getGenerateParameterizedFieldsResolvers())) {
             parameter.setInputParameters(inputValueDefinitionToParameterMapper.map(
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java
@@ -231,6 +231,8 @@ private List<ParameterDefinition> getOperationParameters(MappingContext mappingC
             parameterDefinition.setName(parentObjectParamName);
             parameterDefinition.setOriginalName(parentObjectParamName);
             parameterDefinition.setDeprecated(DeprecatedDefinitionBuilder.build(mappingContext, resolvedField));
+            parameterDefinition.setGetterMethodName(dataModelMapper.capitalizeMethodNameIfRestricted(mappingContext,
+                    "get" + Utils.capitalize(parentObjectParamName)));
             parameters.add(parameterDefinition);
         }
 
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/InputValueDefinitionToParameterMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/InputValueDefinitionToParameterMapper.java
@@ -4,6 +4,7 @@
 import com.kobylynskyi.graphql.codegen.model.NamedDefinition;
 import com.kobylynskyi.graphql.codegen.model.ParameterDefinition;
 import com.kobylynskyi.graphql.codegen.model.builders.DeprecatedDefinitionBuilder;
+import com.kobylynskyi.graphql.codegen.utils.Utils;
 import graphql.language.InputValueDefinition;
 
 import java.util.List;
@@ -70,6 +71,8 @@ private ParameterDefinition map(MappingContext mappingContext, InputValueDefinit
         parameter.setDeprecated(DeprecatedDefinitionBuilder.build(mappingContext, inputValueDefinition));
         parameter.setMandatory(namedDefinition.isMandatory());
         parameter.setSerializeUsingObjectMapper(namedDefinition.isSerializeUsingObjectMapper());
+        parameter.setGetterMethodName(dataModelMapper.capitalizeMethodNameIfRestricted(mappingContext,
+                "get" + Utils.capitalize(inputValueDefinition.getName())));
         return parameter;
     }
 
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/UnknownFieldsSupport.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/UnknownFieldsSupport.java
@@ -2,6 +2,7 @@
 
 import com.kobylynskyi.graphql.codegen.model.MappingContext;
 import com.kobylynskyi.graphql.codegen.model.ParameterDefinition;
+import com.kobylynskyi.graphql.codegen.utils.Utils;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -21,12 +22,13 @@ public interface UnknownFieldsSupport {
      *
      * @param mappingContext The context of the mapping process.
      * @return If {@link MappingContext#isSupportUnknownFields()} is true, it returns a monad containing
-     *         the instance of {@link ParameterDefinition}. {@link Optional#empty()} otherwise.
+     * the instance of {@link ParameterDefinition}. {@link Optional#empty()} otherwise.
      */
     default Optional<ParameterDefinition> createUnknownFields(MappingContext mappingContext) {
         if (Boolean.TRUE.equals(mappingContext.isSupportUnknownFields())) {
             ParameterDefinition unknownFields = new ParameterDefinition();
             unknownFields.setName(mappingContext.getUnknownFieldsPropertyName());
+            unknownFields.setGetterMethodName("get" + Utils.capitalize(mappingContext.getUnknownFieldsPropertyName()));
             unknownFields.setOriginalName(mappingContext.getUnknownFieldsPropertyName());
             unknownFields.setType("java.util.Map<String, Object>");
             unknownFields.setAnnotations(Arrays.asList(
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/ParameterDefinition.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/ParameterDefinition.java
@@ -31,6 +31,7 @@ public class ParameterDefinition {
     private List<String> javaDoc = new ArrayList<>();
     private DeprecatedDefinition deprecated;
     private boolean serializeUsingObjectMapper;
+    private String getterMethodName;
     /**
      * If the type is parametrized then input parameters will be defined here
      */
@@ -121,6 +122,14 @@ public void setSerializeUsingObjectMapper(boolean serializeUsingObjectMapper) {
         this.serializeUsingObjectMapper = serializeUsingObjectMapper;
     }
 
+    public String getGetterMethodName() {
+        return getterMethodName;
+    }
+
+    public void setGetterMethodName(String getterMethodName) {
+        this.getterMethodName = getterMethodName;
+    }
+
     public ParameterDefinition getDefinitionInParentType() {
         return definitionInParentType;
     }
diff --git a/src/main/resources/templates/java-lang/type.ftl b/src/main/resources/templates/java-lang/type.ftl
@@ -73,7 +73,11 @@ public class ${className} implements java.io.Serializable<#if implements?has_con
         <#if field.deprecated?has_content>
     @${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}() {
+        <#if field.mandatory && field.definitionInParentType?has_content && !field.definitionInParentType.mandatory>
+    public ${field.definitionInParentType.type} ${field.getterMethodName}() {
+        <#else>
+    public ${field.type} ${field.getterMethodName}() {
+        </#if>
         return ${field.name};
     }
         <#if !immutableModels>
diff --git a/src/test/resources/expected-classes/restricted-words/Synchronized.java.txt b/src/test/resources/expected-classes/restricted-words/Synchronized.java.txt
@@ -14,13 +14,15 @@ public class Synchronized implements java.io.Serializable {
 
     private String Void;
     private Char wait;
+    private String Class;
 
     public Synchronized() {
     }
 
-    public Synchronized(String Void, Char wait) {
+    public Synchronized(String Void, Char wait, String Class) {
         this.Void = Void;
         this.wait = wait;
+        this.Class = Class;
     }
 
     public String getVoid() {
@@ -37,6 +39,13 @@ public class Synchronized implements java.io.Serializable {
         this.wait = wait;
     }
 
+    public String GetClass() {
+        return Class;
+    }
+    public void setClass(String Class) {
+        this.Class = Class;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -47,12 +56,13 @@ public class Synchronized implements java.io.Serializable {
         }
         final Synchronized that = (Synchronized) obj;
         return Objects.equals(Void, that.Void)
-            && Objects.equals(wait, that.wait);
+            && Objects.equals(wait, that.wait)
+            && Objects.equals(Class, that.Class);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(Void, wait);
+        return Objects.hash(Void, wait, Class);
     }
 
     @Override
@@ -64,6 +74,9 @@ public class Synchronized implements java.io.Serializable {
         if (wait != null) {
             joiner.add("wait: " + GraphQLRequestSerializer.getEntry(wait));
         }
+        if (Class != null) {
+            joiner.add("class: " + GraphQLRequestSerializer.getEntry(Class));
+        }
         return joiner.toString();
     }
 
@@ -75,6 +88,7 @@ public class Synchronized implements java.io.Serializable {
 
         private String Void;
         private Char wait;
+        private String Class;
 
         public Builder() {
         }
@@ -89,10 +103,15 @@ public class Synchronized implements java.io.Serializable {
             return this;
         }
 
+        public Builder setClass(String Class) {
+            this.Class = Class;
+            return this;
+        }
+
 
         public Synchronized build() {
-            return new Synchronized(Void, wait);
+            return new Synchronized(Void, wait, Class);
         }
 
     }
-}
+}
diff --git a/src/test/resources/expected-classes/restricted-words/SynchronizedResponseProjection.java.txt b/src/test/resources/expected-classes/restricted-words/SynchronizedResponseProjection.java.txt
@@ -30,6 +30,7 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {
             projectionDepthOnFields.put("SynchronizedResponseProjection.CharResponseProjection.Wait", projectionDepthOnFields.getOrDefault("SynchronizedResponseProjection.CharResponseProjection.Wait", 0) + 1);
             this.Wait(new CharResponseProjection().all$(maxDepth - projectionDepthOnFields.getOrDefault("SynchronizedResponseProjection.CharResponseProjection.Wait", 0)));
         }
+        this.Class();
         this.typename();
         return this;
     }
@@ -52,6 +53,15 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {
         return this;
     }
 
+    public SynchronizedResponseProjection Class() {
+        return Class(null);
+    }
+
+    public SynchronizedResponseProjection Class(String alias) {
+        fields.add(new GraphQLResponseField("class").alias(alias));
+        return this;
+    }
+
     public SynchronizedResponseProjection typename() {
         return typename(null);
     }
@@ -78,4 +88,4 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {
         return Objects.hash(fields);
     }
 
-}
+}
diff --git a/src/test/resources/schemas/restricted-words.graphqls b/src/test/resources/schemas/restricted-words.graphqls
@@ -11,6 +11,7 @@ type Query {
 type Synchronized {
     void: String
     wait: char
+    class: String
 }
 
 enum TestEnum {

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,8 @@ private List<ParameterDefinition> getOperationParameters(MappingContext mappingC`
`231`	`231`	`parameterDefinition.setName(parentObjectParamName);`
`232`	`232`	`parameterDefinition.setOriginalName(parentObjectParamName);`
`233`	`233`	`parameterDefinition.setDeprecated(DeprecatedDefinitionBuilder.build(mappingContext, resolvedField));`
	`234`	`+ parameterDefinition.setGetterMethodName(dataModelMapper.capitalizeMethodNameIfRestricted(mappingContext,`
	`235`	`+ "get" + Utils.capitalize(parentObjectParamName)));`
`234`	`236`	`parameters.add(parameterDefinition);`
`235`	`237`	`}`
`236`	`238`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {`
`30`	`30`	`projectionDepthOnFields.put("SynchronizedResponseProjection.CharResponseProjection.Wait", projectionDepthOnFields.getOrDefault("SynchronizedResponseProjection.CharResponseProjection.Wait", 0) + 1);`
`31`	`31`	`this.Wait(new CharResponseProjection().all$(maxDepth - projectionDepthOnFields.getOrDefault("SynchronizedResponseProjection.CharResponseProjection.Wait", 0)));`
`32`	`32`	`}`
	`33`	`+ this.Class();`
`33`	`34`	`this.typename();`
`34`	`35`	`return this;`
`35`	`36`	`}`
`@@ -52,6 +53,15 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {`
`52`	`53`	`return this;`
`53`	`54`	`}`
`54`	`55`
	`56`	`+ public SynchronizedResponseProjection Class() {`
	`57`	`+ return Class(null);`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ public SynchronizedResponseProjection Class(String alias) {`
	`61`	`+ fields.add(new GraphQLResponseField("class").alias(alias));`
	`62`	`+ return this;`
	`63`	`+ }`
	`64`	`+`
`55`	`65`	`public SynchronizedResponseProjection typename() {`
`56`	`66`	`return typename(null);`
`57`	`67`	`}`
`@@ -78,4 +88,4 @@ public class SynchronizedResponseProjection extends GraphQLResponseProjection {`
`78`	`88`	`return Objects.hash(fields);`
`79`	`89`	`}`
`80`	`90`
`81`		`-}`
	`91`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ type Query {`
`11`	`11`	`type Synchronized {`
`12`	`12`	`void: String`
`13`	`13`	`wait: char`
	`14`	`+ class: String`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`enum TestEnum {`