Fix invalid parameter names for extensions and customTypeMappings #964 (#979)

Author: kobylynskyi

src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java

@@ -24,14 +24,14 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.kobylynskyi.graphql.codegen.model.DataModelFields.INITIALIZE_NULLABLE_TYPES;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.CLASS_NAME;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.ENUM_IMPORT_IT_SELF_IN_SCALA;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.GENERATED_ANNOTATION;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.GENERATED_INFO;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.GENERATE_MODEL_OPEN_CLASSES;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.IMPLEMENTS;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.IMPORTS;
+import static com.kobylynskyi.graphql.codegen.model.DataModelFields.INITIALIZE_NULLABLE_TYPES;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.JAVA_DOC;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.OPERATIONS;
 import static com.kobylynskyi.graphql.codegen.model.DataModelFields.PACKAGE;
@@ -225,7 +225,7 @@ private List<ParameterDefinition> getOperationParameters(MappingContext mappingC
             String parentObjectParamType = graphQLTypeMapper
                     .getLanguageType(mappingContext, new TypeName(parentTypeName));
             String parentObjectParamName = dataModelMapper
-                    .capitalizeIfRestricted(mappingContext, Utils.unCapitalize(parentObjectParamType));
+                    .capitalizeIfRestricted(mappingContext, Utils.unCapitalize(parentTypeName));
             ParameterDefinition parameterDefinition = new ParameterDefinition();
             parameterDefinition.setType(parentObjectParamType);
             parameterDefinition.setName(parentObjectParamName);

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

@@ -70,4 +70,23 @@ void generate_CustomTypeMapping_ScalarOnQueryOnly() throws Exception {
                 getFileByName(files, "ResponseContainingDate.java"));
     }
 
+    /**
+     * See #964
+     */
+    @Test
+    void generate_CustomTypeMapping_ForExtensionProperty() throws Exception {
+        mappingConfig.setGenerateExtensionFieldsResolvers(true);
+        mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("External", "com.example.External")));
+        mappingConfig.setGenerateClient(false);
+
+        new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/external-type-extend.graphqls"),
+                outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate();
+
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+
+        assertSameTrimmedContent(
+                new File("src/test/resources/expected-classes/custom-type/ExternalResolver.java.txt"),
+                getFileByName(files, "ExternalResolver.java"));
+    }
+
 }

src/test/resources/expected-classes/AcceptTopicSuggestionPayloadResolver.java.txt

@@ -10,6 +10,6 @@ package com.github.graphql;
 )
 public interface AcceptTopicSuggestionPayloadResolver {
 
-    GithubTopicTO topic(GithubAcceptTopicSuggestionPayloadTO githubAcceptTopicSuggestionPayloadTO, graphql.schema.DataFetchingEnvironment env) throws Exception;
+    GithubTopicTO topic(GithubAcceptTopicSuggestionPayloadTO acceptTopicSuggestionPayload, graphql.schema.DataFetchingEnvironment env) throws Exception;
 
 }

src/test/resources/expected-classes/custom-type/ExternalResolver.java.txt

@@ -0,0 +1,15 @@
+package com.kobylynskyi.graphql.test1;
+
+
+/**
+ * Resolver for External
+ */
+@javax.annotation.Generated(
+    value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
+    date = "2020-12-31T23:59:59-0500"
+)
+public interface ExternalResolver {
+
+    int age(com.example.External external) throws Exception;
+
+}

src/test/resources/expected-classes/kt/field-resolver/AcceptTopicSuggestionPayloadResolver.kt.txt

@@ -11,6 +11,6 @@ package com.github.graphql
 interface AcceptTopicSuggestionPayloadResolver {
 
     @Throws(Exception::class)
-    fun topic(githubAcceptTopicSuggestionPayloadTO: GithubAcceptTopicSuggestionPayloadTO, env: graphql.schema.DataFetchingEnvironment): GithubTopicTO?
+    fun topic(acceptTopicSuggestionPayload: GithubAcceptTopicSuggestionPayloadTO, env: graphql.schema.DataFetchingEnvironment): GithubTopicTO?
 
 }

src/test/resources/expected-classes/parent-interfaces/EventResolver.java.txt

@@ -10,20 +10,20 @@ package com.kobylynskyi.graphql.interfaces;
 )
 public interface EventResolver extends graphql.kickstart.tools.GraphQLResolver<EventTO> {
 
-    String id(EventTO eventTO) throws Exception;
+    String id(EventTO event) throws Exception;
 
-    String categoryId(EventTO eventTO) throws Exception;
+    String categoryId(EventTO event) throws Exception;
 
-    java.util.List<EventPropertyTO> properties(EventTO eventTO) throws Exception;
+    java.util.List<EventPropertyTO> properties(EventTO event) throws Exception;
 
-    EventStatusTO status(EventTO eventTO) throws Exception;
+    EventStatusTO status(EventTO event) throws Exception;
 
-    String createdBy(EventTO eventTO) throws Exception;
+    String createdBy(EventTO event) throws Exception;
 
-    String createdDateTime(EventTO eventTO) throws Exception;
+    String createdDateTime(EventTO event) throws Exception;
 
-    Boolean active(EventTO eventTO) throws Exception;
+    Boolean active(EventTO event) throws Exception;
 
-    Integer rating(EventTO eventTO) throws Exception;
+    Integer rating(EventTO event) throws Exception;
 
 }

src/test/resources/schemas/external-type-extend.graphqls

@@ -0,0 +1,16 @@
+schema {
+    query: Query
+}
+
+type Query {
+    external(name: String!): External!
+}
+
+# This is expected to be defined elsewhere and configured via a custom type mapping
+# type External {
+#     name: String!
+# }
+
+extend type External {
+    age: Int!
+}