Nithanim
diff --git a/‎docs/codegen-options.md‎
Lines changed: 4 additions & 1 deletion b/‎docs/codegen-options.md‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java‎
Lines changed: 46 additions & 7 deletions b/‎plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java‎
Lines changed: 46 additions & 7 deletions
diff --git a/‎plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java‎
Lines changed: 41 additions & 2 deletions b/‎plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java‎
Lines changed: 41 additions & 2 deletions
@@ -17,18 +17,21 @@
 | `generateImmutableModels`                       | Boolean                                                            | False                                         | Specifies whether generated model classes should be immutable. |
 | `generateToString`                              | Boolean                                                            | False                                         | Specifies whether generated model classes should have toString method defined. |
 | `apiNamePrefix`                                 | String                                                             | Empty                                         | Sets the prefix for GraphQL api classes (query, mutation, subscription). |
-| `apiNameSuffix`                                 | String                                                             | Resolver                                      | Sets the suffix for GraphQL api classes (query, mutation, subscription). |
+| `apiNameSuffix`                                 | String                                                             | `Resolver`                                    | Sets the suffix for GraphQL api classes (query, mutation, subscription). |
 | `apiRootInterfaceStrategy`                      | *See [ApiRootInterfaceStrategy](#option-apirootinterfacestrategy)* | `SINGLE_INTERFACE`                            |  |
 | `apiNamePrefixStrategy`                         | *See [ApiNamePrefixStrategy](#option-apinameprefixstrategy)*       | `CONSTANT`                                    |  |
 | `modelNamePrefix`                               | String                                                             | Empty                                         | Sets the prefix for GraphQL model classes (type, input, interface, enum, union). |
 | `modelNameSuffix`                               | String                                                             | Empty                                         | Sets the suffix for GraphQL model classes (type, input, interface, enum, union). |
 | `modelValidationAnnotation`                     | String                                                             | @javax.validation.<br>constraints.NotNull     | Annotation for mandatory (NonNull) fields. Can be null/empty. |
+| `typeResolverPrefix`                            | String                                                             | Empty                                         | Sets the prefix for GraphQL type resolver classes. |
+| `typeResolverSuffix`                            | String                                                             | `Resolver`                                    | Sets the suffix for GraphQL type resolver classes. |
 | `customTypesMapping`                            | Map(String,String)                                                 | Empty                                         | Can be used to supply custom mappings for scalars. <br/> Supports:<br/> * Map of (GraphqlObjectName.fieldName) to (JavaType) <br/> * Map of (GraphqlType) to (JavaType) |
 | `customAnnotationsMapping`                      | Map(String,String)                                                 | Empty                                         | Can be used to supply custom annotations (serializers) for scalars. <br/> Supports:<br/> * Map of (GraphqlObjectName.fieldName) to (JavaAnnotation) <br/> * Map of (GraphqlType) to (JavaAnnotation) |
 | `fieldsWithResolvers`                           | Set(String)                                                        | Empty                                         | Fields that require Resolvers should be defined here in format: `TypeName.fieldName` or `TypeName`. |
 | `fieldsWithoutResolvers`                        | Set(String)                                                        | Empty                                         | Fields that DO NOT require Resolvers should be defined here in format: `TypeName.fieldName` or `TypeName`. Can be used in conjunction with `generateExtensionFieldsResolvers` option. |
 | `generateParameterizedFieldsResolvers`          | Boolean                                                            | True                                          | If true, then generate separate `Resolver` interface for parametrized fields. If false, then add field to the type definition and ignore field parameters. |
 | `generateExtensionFieldsResolvers`              | Boolean                                                            | False                                         | Specifies whether all fields in extensions (`extend type` and `extend interface`) should be present in Resolver interface instead of the type class itself. |
+| `generateModelsForRootTypes`                    | Boolean                                                            | False                                         | Specifies whether model classes should be generated for `type Query`, `type Subscription`, `type Mutation`. |
 | `subscriptionReturnType`                        | String                                                             | Empty                                         | Return type for subscription methods. For example: `org.reactivestreams.Publisher`, `io.reactivex.Observable`, etc. |
 | `generateClient`                                | Boolean                                                            | False                                         | Specifies whether client-side classes should be generated for each query, mutation and subscription. This includes: `Request` classes (contain input data), `ResponseProjection` classes for each type (contain response fields) and `Response` classes (contain response data). |
 | `requestSuffix`                                 | String                                                             | Request                                       | Sets the suffix for `Request` classes. |
 
@@ -50,7 +50,9 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
     private ApiNamePrefixStrategy apiNamePrefixStrategy = MappingConfigConstants.DEFAULT_API_NAME_PREFIX_STRATEGY;
     private ApiRootInterfaceStrategy apiRootInterfaceStrategy = MappingConfigConstants.DEFAULT_API_ROOT_INTERFACE_STRATEGY;
     private String apiNamePrefix;
-    private String apiNameSuffix;
+    private String apiNameSuffix = MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX;;
+    private String typeResolverPrefix;
+    private String typeResolverSuffix = MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX;
     private String modelPackageName;
     private String modelNamePrefix;
     private String modelNameSuffix;
@@ -65,6 +67,7 @@ public class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
     private Boolean generateParameterizedFieldsResolvers = MappingConfigConstants.DEFAULT_GENERATE_PARAMETERIZED_FIELDS_RESOLVERS;
     private Boolean generateExtensionFieldsResolvers = MappingConfigConstants.DEFAULT_GENERATE_EXTENSION_FIELDS_RESOLVERS;
     private Boolean generateDataFetchingEnvironmentArgumentInApis = MappingConfigConstants.DEFAULT_GENERATE_DATA_FETCHING_ENV;
+    private Boolean generateModelsForRootTypes = MappingConfigConstants.DEFAULT_GENERATE_MODELS_FOR_ROOT_TYPES;
     private Set<String> fieldsWithResolvers = new HashSet<>();
     private Set<String> fieldsWithoutResolvers = new HashSet<>();
 
@@ -86,7 +89,7 @@ public GraphQLCodegenGradleTask() {
     public void generate() throws Exception {
         MappingConfig mappingConfig = new MappingConfig();
         mappingConfig.setPackageName(packageName);
-        mappingConfig.setCustomTypesMapping(customTypesMapping);
+        mappingConfig.setCustomTypesMapping(customTypesMapping != null ? customTypesMapping : new HashMap<>());
         mappingConfig.setApiNameSuffix(apiNameSuffix);
         mappingConfig.setApiNamePrefix(apiNamePrefix);
         mappingConfig.setApiRootInterfaceStrategy(apiRootInterfaceStrategy);
@@ -97,18 +100,21 @@ public void generate() throws Exception {
         mappingConfig.setModelPackageName(modelPackageName);
         mappingConfig.setGenerateBuilder(generateBuilder);
         mappingConfig.setGenerateApis(generateApis);
+        mappingConfig.setTypeResolverSuffix(typeResolverSuffix);
+        mappingConfig.setTypeResolverPrefix(typeResolverPrefix);
         mappingConfig.setModelValidationAnnotation(modelValidationAnnotation);
-        mappingConfig.setSubscriptionReturnType(subscriptionReturnType);
-        mappingConfig.setCustomAnnotationsMapping(customAnnotationsMapping);
+        mappingConfig.setCustomAnnotationsMapping(customAnnotationsMapping != null ? customAnnotationsMapping : new HashMap<>());
         mappingConfig.setGenerateEqualsAndHashCode(generateEqualsAndHashCode);
         mappingConfig.setGenerateImmutableModels(generateImmutableModels);
         mappingConfig.setGenerateToString(generateToString);
+        mappingConfig.setSubscriptionReturnType(subscriptionReturnType);
         mappingConfig.setGenerateAsyncApi(generateAsyncApi);
         mappingConfig.setGenerateParameterizedFieldsResolvers(generateParameterizedFieldsResolvers);
-        mappingConfig.setGenerateExtensionFieldsResolvers(generateExtensionFieldsResolvers);
         mappingConfig.setGenerateDataFetchingEnvironmentArgumentInApis(generateDataFetchingEnvironmentArgumentInApis);
-        mappingConfig.setFieldsWithResolvers(fieldsWithResolvers);
-        mappingConfig.setFieldsWithoutResolvers(fieldsWithoutResolvers);
+        mappingConfig.setGenerateExtensionFieldsResolvers(generateExtensionFieldsResolvers);
+        mappingConfig.setGenerateModelsForRootTypes(generateModelsForRootTypes);
+        mappingConfig.setFieldsWithResolvers(fieldsWithResolvers != null ? fieldsWithResolvers : new HashSet<>());
+        mappingConfig.setFieldsWithoutResolvers(fieldsWithoutResolvers != null ? fieldsWithoutResolvers : new HashSet<>());
         mappingConfig.setGenerateClient(generateClient);
         mappingConfig.setRequestSuffix(requestSuffix);
         mappingConfig.setResponseSuffix(responseSuffix);
@@ -328,6 +334,17 @@ public void setGenerateApis(Boolean generateApis) {
         this.generateApis = generateApis;
     }
 
+    @Input
+    @Optional
+    @Override
+    public Boolean getGenerateModelsForRootTypes() {
+        return generateModelsForRootTypes;
+    }
+
+    public void setGenerateModelsForRootTypes(Boolean generateModelsForRootTypes) {
+        this.generateModelsForRootTypes = generateModelsForRootTypes;
+    }
+
     @Input
     @Optional
     @Override
@@ -416,6 +433,28 @@ public void setGenerateParameterizedFieldsResolvers(Boolean generateParameterize
         this.generateParameterizedFieldsResolvers = generateParameterizedFieldsResolvers;
     }
 
+    @Input
+    @Optional
+    @Override
+    public String getTypeResolverPrefix() {
+        return typeResolverPrefix;
+    }
+
+    public void setTypeResolverPrefix(String typeResolverPrefix) {
+        this.typeResolverPrefix = typeResolverPrefix;
+    }
+
+    @Input
+    @Optional
+    @Override
+    public String getTypeResolverSuffix() {
+        return typeResolverSuffix;
+    }
+
+    public void setTypeResolverSuffix(String typeResolverSuffix) {
+        this.typeResolverSuffix = typeResolverSuffix;
+    }
+
     @Input
     @Optional
     @Override
 
@@ -71,7 +71,7 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
     @Parameter
     private String apiNamePrefix;
 
-    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_API_NAME_SUFFIX)
+    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX)
     private String apiNameSuffix;
 
     @Parameter
@@ -83,6 +83,12 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
     @Parameter
     private String modelNameSuffix;
 
+    @Parameter
+    private String typeResolverPrefix;
+
+    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX)
+    private String typeResolverSuffix;
+
     @Parameter
     private String subscriptionReturnType;
 
@@ -107,6 +113,9 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
     @Parameter(defaultValue = MappingConfigConstants.DEFAULT_GENERATE_DATA_FETCHING_ENV_STRING)
     private boolean generateDataFetchingEnvironmentArgumentInApis;
 
+    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_GENERATE_MODELS_FOR_ROOT_TYPES_STRING)
+    private boolean generateModelsForRootTypes;
+
     @Parameter
     private Set<String> fieldsWithResolvers = new HashSet<>();
 
@@ -125,7 +134,7 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
     @Parameter(defaultValue = MappingConfigConstants.DEFAULT_RESPONSE_PROJECTION_SUFFIX)
     private String responseProjectionSuffix;
 
-    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_PARAMETRIZED_INPUT_SUFIX)
+    @Parameter(defaultValue = MappingConfigConstants.DEFAULT_PARAMETRIZED_INPUT_SUFFIX)
     private String parametrizedInputSuffix;
 
     @Parameter
@@ -157,6 +166,8 @@ public void execute() throws MojoExecutionException {
         mappingConfig.setModelPackageName(modelPackageName);
         mappingConfig.setGenerateBuilder(generateBuilder);
         mappingConfig.setGenerateApis(generateApis);
+        mappingConfig.setTypeResolverSuffix(typeResolverSuffix);
+        mappingConfig.setTypeResolverPrefix(typeResolverPrefix);
         mappingConfig.setModelValidationAnnotation(modelValidationAnnotation);
         mappingConfig.setCustomAnnotationsMapping(customAnnotationsMapping != null ? customAnnotationsMapping : new HashMap<>());
         mappingConfig.setGenerateEqualsAndHashCode(generateEqualsAndHashCode);
@@ -167,6 +178,7 @@ public void execute() throws MojoExecutionException {
         mappingConfig.setGenerateParameterizedFieldsResolvers(generateParameterizedFieldsResolvers);
         mappingConfig.setGenerateDataFetchingEnvironmentArgumentInApis(generateDataFetchingEnvironmentArgumentInApis);
         mappingConfig.setGenerateExtensionFieldsResolvers(generateExtensionFieldsResolvers);
+        mappingConfig.setGenerateModelsForRootTypes(generateModelsForRootTypes);
         mappingConfig.setFieldsWithResolvers(fieldsWithResolvers != null ? fieldsWithResolvers : new HashSet<>());
         mappingConfig.setFieldsWithoutResolvers(fieldsWithoutResolvers != null ? fieldsWithoutResolvers : new HashSet<>());
         mappingConfig.setGenerateClient(generateClient);
@@ -359,6 +371,15 @@ public void setGenerateApis(boolean generateApis) {
         this.generateApis = generateApis;
     }
 
+    @Override
+    public Boolean getGenerateModelsForRootTypes() {
+        return generateModelsForRootTypes;
+    }
+
+    public void setGenerateModelsForRootTypes(boolean generateModelsForRootTypes) {
+        this.generateModelsForRootTypes = generateModelsForRootTypes;
+    }
+
     @Override
     public Boolean getGenerateEqualsAndHashCode() {
         return generateEqualsAndHashCode;
@@ -422,6 +443,24 @@ public void setGenerateParameterizedFieldsResolvers(boolean generateParameterize
         this.generateParameterizedFieldsResolvers = generateParameterizedFieldsResolvers;
     }
 
+    @Override
+    public String getTypeResolverPrefix() {
+        return typeResolverPrefix;
+    }
+
+    public void setTypeResolverPrefix(String typeResolverPrefix) {
+        this.typeResolverPrefix = typeResolverPrefix;
+    }
+
+    @Override
+    public String getTypeResolverSuffix() {
+        return typeResolverSuffix;
+    }
+
+    public void setTypeResolverSuffix(String typeResolverSuffix) {
+        this.typeResolverSuffix = typeResolverSuffix;
+    }
+
     @Override
     public Boolean getGenerateDataFetchingEnvironmentArgumentInApis() {
         return generateDataFetchingEnvironmentArgumentInApis;