diff --git a/build.gradle b/build.gradle
index e50415ad2a86fa0f6fac8d99336449b67147a0a3..1275e32b7c383d3d5e650ef39e12afcadf0b6c71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ repositories {
 dependencies {
     implementation "org.freemarker:freemarker:2.3.30"
     implementation "com.graphql-java:graphql-java:15.0"
-    implementation "com.fasterxml.jackson.core:jackson-databind:2.11.0"
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.11.1"
 
     implementation "org.projectlombok:lombok:1.18.12"
     annotationProcessor "org.projectlombok:lombok:1.18.12"
@@ -46,6 +46,19 @@ task codeCoverageReport(type: JacocoReport) {
     }
 }
 
+test {
+    testLogging {
+        events "failed"
+
+        showExceptions true
+        exceptionFormat "full"
+        showCauses true
+        showStackTraces true
+
+        showStandardStreams = false
+    }
+}
+
 codeCoverageReport.dependsOn test
 
 
diff --git a/docs/codegen-options.md b/docs/codegen-options.md
index 46de1f4067339d6d7098311d61fad6db18a2dcb3..9992e62cc86054003868685233967d921f560bdc 100644
--- a/docs/codegen-options.md
+++ b/docs/codegen-options.md
@@ -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. |
diff --git a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java
index d3a2e576ff5dd5daf40d0bc0e3417e69a074f23a..3437ca998fea39bd501e82c810072126c83c775c 100644
--- a/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java
+++ b/plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/gradle/GraphQLCodegenGradleTask.java
@@ -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 class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
     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 class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
         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 class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
         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 class GraphQLCodegenGradleTask extends DefaultTask implements GraphQLCode
         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
diff --git a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java
index 50485e3677f12f3054158583afe9cfa3be3cffc9..cd805361a4e0fc7527275652a2b474fbfa601975 100644
--- a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java
+++ b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java
@@ -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 class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
         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 class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
         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 class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
         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 class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo
         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;
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java
index 0b69b2dbd25f29395b1cb57ca083b1e212ff383a..c172b4aef2328711901b12b299b1678734a7bbea 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java
@@ -82,10 +82,11 @@ public class GraphQLCodegen {
         this.mappingConfig = mappingConfig;
         this.mappingConfig.combine(externalMappingConfigSupplier != null ? externalMappingConfigSupplier.get() : null);
         initDefaultValues(mappingConfig);
+        validateConfigs(mappingConfig);
         this.generatedInformation = generatedInformation;
     }
 
-    private void initDefaultValues(MappingConfig mappingConfig) {
+    private static void initDefaultValues(MappingConfig mappingConfig) {
         if (mappingConfig.getModelValidationAnnotation() == null) {
             mappingConfig.setModelValidationAnnotation(MappingConfigConstants.DEFAULT_VALIDATION_ANNOTATION);
         }
@@ -108,7 +109,7 @@ public class GraphQLCodegen {
             mappingConfig.setResponseProjectionSuffix(MappingConfigConstants.DEFAULT_RESPONSE_PROJECTION_SUFFIX);
         }
         if (mappingConfig.getParametrizedInputSuffix() == null) {
-            mappingConfig.setParametrizedInputSuffix(MappingConfigConstants.DEFAULT_PARAMETRIZED_INPUT_SUFIX);
+            mappingConfig.setParametrizedInputSuffix(MappingConfigConstants.DEFAULT_PARAMETRIZED_INPUT_SUFFIX);
         }
         if (mappingConfig.getGenerateImmutableModels() == null) {
             mappingConfig.setGenerateImmutableModels(MappingConfigConstants.DEFAULT_GENERATE_IMMUTABLE_MODELS);
@@ -120,7 +121,10 @@ public class GraphQLCodegen {
             mappingConfig.setGenerateApis(MappingConfigConstants.DEFAULT_GENERATE_APIS);
         }
         if (mappingConfig.getApiNameSuffix() == null) {
-            mappingConfig.setApiNameSuffix(MappingConfigConstants.DEFAULT_API_NAME_SUFFIX);
+            mappingConfig.setApiNameSuffix(MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX);
+        }
+        if (mappingConfig.getTypeResolverSuffix() == null) {
+            mappingConfig.setTypeResolverSuffix(MappingConfigConstants.DEFAULT_RESOLVER_SUFFIX);
         }
         if (mappingConfig.getGenerateAsyncApi() == null) {
             mappingConfig.setGenerateAsyncApi(MappingConfigConstants.DEFAULT_GENERATE_ASYNC_APIS);
@@ -134,6 +138,9 @@ public class GraphQLCodegen {
         if (mappingConfig.getGenerateDataFetchingEnvironmentArgumentInApis() == null) {
             mappingConfig.setGenerateDataFetchingEnvironmentArgumentInApis(MappingConfigConstants.DEFAULT_GENERATE_DATA_FETCHING_ENV);
         }
+        if (mappingConfig.getGenerateModelsForRootTypes() == null) {
+            mappingConfig.setGenerateModelsForRootTypes(MappingConfigConstants.DEFAULT_GENERATE_MODELS_FOR_ROOT_TYPES);
+        }
         if (mappingConfig.getApiNamePrefixStrategy() == null) {
             mappingConfig.setApiNamePrefixStrategy(MappingConfigConstants.DEFAULT_API_NAME_PREFIX_STRATEGY);
         }
@@ -144,11 +151,30 @@ public class GraphQLCodegen {
             // required for request serialization
             mappingConfig.setGenerateToString(true);
         }
+    }
+
+    private static void validateConfigs(MappingConfig mappingConfig) {
         if (mappingConfig.getApiRootInterfaceStrategy() == ApiRootInterfaceStrategy.INTERFACE_PER_SCHEMA &&
                 mappingConfig.getApiNamePrefixStrategy() == ApiNamePrefixStrategy.CONSTANT) {
-            // that's because we will have a conflict in case there is "type Query" in multiple graphql schema files
+            // we will have a conflict in case there is "type Query" in multiple graphql schema files
             throw new IllegalArgumentException("API prefix should not be CONSTANT for INTERFACE_PER_SCHEMA option");
         }
+        if (mappingConfig.getGenerateApis() &&
+                mappingConfig.getGenerateModelsForRootTypes() &&
+                mappingConfig.getApiNamePrefixStrategy() == ApiNamePrefixStrategy.CONSTANT) {
+            // checking for conflict between root type model classes and api interfaces
+            if (Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNamePrefix(), mappingConfig.getModelNamePrefix()) &&
+                    Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNameSuffix(), mappingConfig.getModelNameSuffix())) {
+                // we will have a conflict between model pojo (Query.java) and api interface (Query.java)
+                throw new IllegalArgumentException("Either disable APIs generation or set different Prefix/Suffix for API classes and model classes");
+            }
+            // checking for conflict between root type model resolver classes and api interfaces
+            if (Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNamePrefix(), mappingConfig.getTypeResolverPrefix()) &&
+                    Utils.stringsEqualIgnoreSpaces(mappingConfig.getApiNameSuffix(), mappingConfig.getTypeResolverSuffix())) {
+                // we will have a conflict between model resolver interface (QueryResolver.java) and api interface resolver (QueryResolver.java)
+                throw new IllegalArgumentException("Either disable APIs generation or set different Prefix/Suffix for API classes and type resolver classes");
+            }
+        }
     }
 
     public List<File> generate() throws IOException {
@@ -156,7 +182,7 @@ public class GraphQLCodegen {
         long startTime = System.currentTimeMillis();
         List<File> generatedFiles = Collections.emptyList();
         if (!schemas.isEmpty()) {
-            ExtendedDocument document = GraphQLDocumentParser.getDocument(schemas);
+            ExtendedDocument document = GraphQLDocumentParser.getDocument(mappingConfig, schemas);
             initCustomTypeMappings(document.getScalarDefinitions());
             generatedFiles = processDefinitions(document);
         }
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenValidate.java b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenValidate.java
index 965e17832cd559c739d6920c36b6db8daf3a3f38..6c342227c02c69635cf1223a579e9dbcc4fb2cec 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenValidate.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenValidate.java
@@ -2,6 +2,8 @@ package com.kobylynskyi.graphql.codegen;
 
 import com.kobylynskyi.graphql.codegen.model.exception.SchemaValidationException;
 import graphql.GraphQLException;
+import graphql.parser.MultiSourceReader;
+import graphql.parser.Parser;
 import lombok.AllArgsConstructor;
 
 import java.io.IOException;
@@ -18,16 +20,15 @@ public class GraphQLCodegenValidate {
     private final List<String> schemas;
 
     public void validate() throws IOException {
-        for (String schema : schemas) {
-            try {
-                long startTime = System.currentTimeMillis();
-                GraphQLDocumentParser.getDocument(schema);
-                System.out.println(String.format("Validated schema '%s' in %d ms",
-                        schema, System.currentTimeMillis() - startTime));
-            } catch (GraphQLException e) {
-                throw new SchemaValidationException(e.getMessage());
-            }
+        long startTime = System.currentTimeMillis();
+        try (MultiSourceReader reader = GraphQLDocumentParser.createMultiSourceReader(schemas)) {
+            new Parser().parseDocument(reader);
+            System.out.println(String.format("Validated schemas '%s' in %d ms",
+                    schemas, System.currentTimeMillis() - startTime));
+        } catch (GraphQLException e) {
+            throw new SchemaValidationException(e.getMessage());
         }
+
     }
 
 }
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLDocumentParser.java b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLDocumentParser.java
index 72637340cfede492b492ad7e7ff7991cb9889ac5..283f5dfba3fdced790a3de02b536c015287060ee 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLDocumentParser.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLDocumentParser.java
@@ -1,5 +1,6 @@
 package com.kobylynskyi.graphql.codegen;
 
+import com.kobylynskyi.graphql.codegen.model.MappingConfig;
 import com.kobylynskyi.graphql.codegen.model.definitions.ExtendedDefinition;
 import com.kobylynskyi.graphql.codegen.model.definitions.ExtendedDocument;
 import com.kobylynskyi.graphql.codegen.model.definitions.ExtendedEnumTypeDefinition;
@@ -28,7 +29,6 @@ import graphql.parser.MultiSourceReader;
 import graphql.parser.Parser;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,11 +41,7 @@ class GraphQLDocumentParser {
     private GraphQLDocumentParser() {
     }
 
-    static ExtendedDocument getDocument(String schemaFilePath) throws IOException {
-        return getDocument(Collections.singletonList(schemaFilePath));
-    }
-
-    static ExtendedDocument getDocument(List<String> schemaPaths) throws IOException {
+    static ExtendedDocument getDocument(MappingConfig mappingConfig, List<String> schemaPaths) throws IOException {
         Document document = readDocument(schemaPaths);
 
         Map<String, ExtendedObjectTypeDefinition> operationDefinitions = new HashMap<>();
@@ -68,6 +64,11 @@ class GraphQLDocumentParser {
                     populateDefinition(operationDefinitions, definition, definitionName,
                             ObjectTypeDefinition.class, ObjectTypeExtensionDefinition.class,
                             s -> new ExtendedObjectTypeDefinition());
+                    if (Boolean.TRUE.equals(mappingConfig.getGenerateModelsForRootTypes())) {
+                        populateDefinition(typeDefinitions, definition, definitionName,
+                                ObjectTypeDefinition.class, ObjectTypeExtensionDefinition.class,
+                                s -> new ExtendedObjectTypeDefinition());
+                    }
                 } else {
                     populateDefinition(typeDefinitions, definition, definitionName,
                             ObjectTypeDefinition.class, ObjectTypeExtensionDefinition.class,
@@ -108,12 +109,15 @@ class GraphQLDocumentParser {
     }
 
     @SuppressWarnings("unchecked")
-    private static <D extends ExtendedDefinition<B, E>, B extends NamedNode<B>, E extends B> void populateDefinition(Map<String, D> definitionsMap,
-                                                                                                                     Definition<?> definition,
-                                                                                                                     String definitionName,
-                                                                                                                     Class<B> baseDefinitionClass,
-                                                                                                                     Class<E> extensionDefinitionClass,
-                                                                                                                     Function<String, D> mappingFunction) {
+    private static <
+            D extends ExtendedDefinition<B, E>,
+            B extends NamedNode<B>,
+            E extends B> void populateDefinition(Map<String, D> definitionsMap,
+                                                 Definition<?> definition,
+                                                 String definitionName,
+                                                 Class<B> baseDefinitionClass,
+                                                 Class<E> extensionDefinitionClass,
+                                                 Function<String, D> mappingFunction) {
         D extendedDefinition = definitionsMap.computeIfAbsent(definitionName, mappingFunction);
         if (extensionDefinitionClass.isAssignableFrom(definition.getClass())) {
             extendedDefinition.getExtensions().add((E) definition);
@@ -128,7 +132,10 @@ class GraphQLDocumentParser {
         }
     }
 
-    private static MultiSourceReader createMultiSourceReader(List<String> schemaPaths) throws IOException {
+    public static MultiSourceReader createMultiSourceReader(List<String> schemaPaths) throws IOException {
+        if (schemaPaths == null) {
+            return MultiSourceReader.newMultiSourceReader().build();
+        }
         MultiSourceReader.Builder builder = MultiSourceReader.newMultiSourceReader();
         for (String path : schemaPaths) {
             // appending EOL to ensure that schema tokens are not mixed in case files are not properly ended with EOL
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java
index 78917aced3fa765066f2e93dc4e2bc93796becfd..fc92f85ec3b0068eed9ec098beeccd224031d747 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/FieldDefinitionsToResolverDataModelMapper.java
@@ -48,7 +48,7 @@ public class FieldDefinitionsToResolverDataModelMapper {
                                                         List<ExtendedFieldDefinition> fieldDefs,
                                                         String parentTypeName) {
         // Example: PersonResolver
-        String className = parentTypeName + "Resolver";
+        String className = MapperUtils.getTypeResolverClassNameWithPrefixAndSuffix(mappingContext, parentTypeName);
         return mapToResolverModel(mappingContext, parentTypeName, className, fieldDefs,
                 singletonList("Resolver for " + parentTypeName),
                 getParentInterface(mappingContext, parentTypeName));
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/MapperUtils.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/MapperUtils.java
index 1fb40e69be7e31e33ec6f85af0c7b9f23f669d38..07a1d42ba24e1035ea7008792e1e3c93d3a99c8f 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/MapperUtils.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/MapperUtils.java
@@ -82,6 +82,25 @@ class MapperUtils {
         return classNameBuilder.toString();
     }
 
+    /**
+     * Generates a type resolver class name including prefix and suffix (if any)
+     *
+     * @param mappingContext Global mapping context
+     * @param typeName       GraphQL type name
+     * @return Class name of GraphQL type resolver
+     */
+    static String getTypeResolverClassNameWithPrefixAndSuffix(MappingContext mappingContext, String typeName) {
+        StringBuilder classNameBuilder = new StringBuilder();
+        if (Utils.isNotBlank(mappingContext.getTypeResolverPrefix())) {
+            classNameBuilder.append(mappingContext.getTypeResolverPrefix());
+        }
+        classNameBuilder.append(Utils.capitalize(typeName));
+        if (Utils.isNotBlank(mappingContext.getTypeResolverSuffix())) {
+            classNameBuilder.append(mappingContext.getTypeResolverSuffix());
+        }
+        return classNameBuilder.toString();
+    }
+
     /**
      * Generates an api class name including prefix and suffix (if any)
      * Examples: CreateEventMutationResolver, EventsQueryResolver, EventsByIdsQueryResolver (rootTypeName is "Query" or the likes)
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java
index cef2653f87d207696db330f42f105834c60a8d94..e82887e626f8017fccac711c423719e2915664c4 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java
@@ -42,6 +42,13 @@ public interface GraphQLCodegenConfiguration {
      */
     Boolean getGenerateApis();
 
+    /**
+     * Specifies whether model classes should be generated for Query/Subscription/Mutation.
+     *
+     * @return <b>true</b> is model classes (POJOs) should be generated for GraphQL root types.
+     */
+    Boolean getGenerateModelsForRootTypes();
+
     /**
      * Specifies the strategy of generating root api interface.
      *
@@ -164,6 +171,20 @@ public interface GraphQLCodegenConfiguration {
      */
     Boolean getGenerateParameterizedFieldsResolvers();
 
+    /**
+     * Sets the prefix for GraphQL type resolver classes.
+     *
+     * @return The prefix for GraphQL type resolver classes.
+     */
+    String getTypeResolverPrefix();
+
+    /**
+     * Sets the suffix for GraphQL type resolver classes.
+     *
+     * @return The suffix for GraphQL type resolver classes.
+     */
+    String getTypeResolverSuffix();
+
     /**
      * Whether all fields in extensions (<code>extend type</code> and <code>extend interface</code>) should be present
      * in Resolver interface instead of the type class itself.
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java
index 10bd3ab65c965c076e375f878c9e1ca39aac91ea..8cc920d831f65aa0745f0b73d5baad7d35a921f1 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java
@@ -29,6 +29,8 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable<Ma
     private String modelNameSuffix;
     private String apiNamePrefix;
     private String apiNameSuffix;
+    private String typeResolverPrefix;
+    private String typeResolverSuffix;
     private ApiRootInterfaceStrategy apiRootInterfaceStrategy;
     private ApiNamePrefixStrategy apiNamePrefixStrategy;
     private String modelValidationAnnotation;
@@ -44,6 +46,7 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable<Ma
     private Boolean generateParameterizedFieldsResolvers;
     private Boolean generateExtensionFieldsResolvers;
     private Boolean generateDataFetchingEnvironmentArgumentInApis;
+    private Boolean generateModelsForRootTypes;
 
     // field resolvers configs:
     private Set<String> fieldsWithResolvers = new HashSet<>();
@@ -87,6 +90,8 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable<Ma
         this.apiNameSuffix = source.apiNameSuffix != null ? source.apiNameSuffix : this.apiNameSuffix;
         this.apiRootInterfaceStrategy = source.apiRootInterfaceStrategy != null ? source.apiRootInterfaceStrategy : this.apiRootInterfaceStrategy;
         this.apiNamePrefixStrategy = source.apiNamePrefixStrategy != null ? source.apiNamePrefixStrategy : this.apiNamePrefixStrategy;
+        this.typeResolverPrefix = source.typeResolverPrefix != null ? source.typeResolverPrefix : this.typeResolverPrefix;
+        this.typeResolverSuffix = source.typeResolverSuffix != null ? source.typeResolverSuffix : this.typeResolverSuffix;
         this.modelValidationAnnotation = source.modelValidationAnnotation != null ? source.modelValidationAnnotation : this.modelValidationAnnotation;
         this.subscriptionReturnType = source.subscriptionReturnType != null ? source.subscriptionReturnType : this.subscriptionReturnType;
         this.generateBuilder = source.generateBuilder != null ? source.generateBuilder : this.generateBuilder;
@@ -97,6 +102,7 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable<Ma
         this.generateParameterizedFieldsResolvers = source.generateParameterizedFieldsResolvers != null ? source.generateParameterizedFieldsResolvers : this.generateParameterizedFieldsResolvers;
         this.generateExtensionFieldsResolvers = source.generateExtensionFieldsResolvers != null ? source.generateExtensionFieldsResolvers : this.generateExtensionFieldsResolvers;
         this.generateDataFetchingEnvironmentArgumentInApis = source.generateDataFetchingEnvironmentArgumentInApis != null ? source.generateDataFetchingEnvironmentArgumentInApis : this.generateDataFetchingEnvironmentArgumentInApis;
+        this.generateModelsForRootTypes = source.generateModelsForRootTypes != null ? source.generateModelsForRootTypes : this.generateModelsForRootTypes;
         if (this.fieldsWithResolvers != null && source.fieldsWithResolvers != null) {
             this.fieldsWithResolvers.addAll(source.fieldsWithResolvers);
         } else if (this.fieldsWithResolvers == null) {
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigConstants.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigConstants.java
index cc2b40231533643c2ff481176a8b88bc05047354..f57cffb684f3979d71fad1f6a8a9a7fb861314bc 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigConstants.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigConstants.java
@@ -6,7 +6,6 @@ public class MappingConfigConstants {
     public static final String PARENT_INTERFACE_TYPE_PLACEHOLDER = "{{TYPE}}";
     public static final boolean DEFAULT_GENERATE_APIS = true;
     public static final String DEFAULT_GENERATE_APIS_STRING = "true";
-    public static final String DEFAULT_API_NAME_SUFFIX = "Resolver";
     public static final boolean DEFAULT_GENERATE_ASYNC_APIS = false;
     public static final String DEFAULT_GENERATE_ASYNC_APIS_STRING = "false";
     public static final boolean DEFAULT_BUILDER = true;
@@ -23,17 +22,20 @@ public class MappingConfigConstants {
     public static final String DEFAULT_GENERATE_EXTENSION_FIELDS_RESOLVERS_STRING = "false";
     public static final boolean DEFAULT_GENERATE_DATA_FETCHING_ENV = false;
     public static final String DEFAULT_GENERATE_DATA_FETCHING_ENV_STRING = "false";
+    public static final boolean DEFAULT_GENERATE_MODELS_FOR_ROOT_TYPES = false;
+    public static final String DEFAULT_GENERATE_MODELS_FOR_ROOT_TYPES_STRING = "false";
     public static final ApiNamePrefixStrategy DEFAULT_API_NAME_PREFIX_STRATEGY = ApiNamePrefixStrategy.CONSTANT;
     public static final String DEFAULT_API_NAME_PREFIX_STRATEGY_STRING = "CONSTANT";
     public static final ApiRootInterfaceStrategy DEFAULT_API_ROOT_INTERFACE_STRATEGY = ApiRootInterfaceStrategy.SINGLE_INTERFACE;
     public static final String DEFAULT_API_ROOT_INTERFACE_STRATEGY_STRING = "SINGLE_INTERFACE";
-
     public static final boolean DEFAULT_GENERATE_CLIENT = false;
     public static final String DEFAULT_GENERATE_CLIENT_STRING = "false";
+
+    public static final String DEFAULT_RESOLVER_SUFFIX = "Resolver";
     public static final String DEFAULT_REQUEST_SUFFIX = "Request";
     public static final String DEFAULT_RESPONSE_SUFFIX = "Response";
     public static final String DEFAULT_RESPONSE_PROJECTION_SUFFIX = "ResponseProjection";
-    public static final String DEFAULT_PARAMETRIZED_INPUT_SUFIX = "ParametrizedInput";
+    public static final String DEFAULT_PARAMETRIZED_INPUT_SUFFIX = "ParametrizedInput";
 
     private MappingConfigConstants() {
     }
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java
index 0b473bc401d69b2ccd96e457a9e8c7bce027a4c3..25686d971dca21c2d1aed19a35f67ceef197f282 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java
@@ -38,6 +38,11 @@ public class MappingContext implements GraphQLCodegenConfiguration {
         return config.getGenerateApis();
     }
 
+    @Override
+    public Boolean getGenerateModelsForRootTypes() {
+        return config.getGenerateModelsForRootTypes();
+    }
+
     @Override
     public ApiRootInterfaceStrategy getApiRootInterfaceStrategy() {
         return config.getApiRootInterfaceStrategy();
@@ -123,6 +128,16 @@ public class MappingContext implements GraphQLCodegenConfiguration {
         return config.getGenerateParameterizedFieldsResolvers();
     }
 
+    @Override
+    public String getTypeResolverPrefix() {
+        return config.getTypeResolverPrefix();
+    }
+
+    @Override
+    public String getTypeResolverSuffix() {
+        return config.getTypeResolverSuffix();
+    }
+
     @Override
     public Boolean getGenerateExtensionFieldsResolvers() {
         return config.getGenerateExtensionFieldsResolvers();
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/utils/Utils.java b/src/main/java/com/kobylynskyi/graphql/codegen/utils/Utils.java
index 772445b82eec91bd2f94ceefd238f63f7e375d2f..853818154eb104443d308b4216135101de6f4c8b 100644
--- a/src/main/java/com/kobylynskyi/graphql/codegen/utils/Utils.java
+++ b/src/main/java/com/kobylynskyi/graphql/codegen/utils/Utils.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * Various utilities
@@ -90,6 +91,36 @@ public final class Utils {
         return false;
     }
 
+    /**
+     * Copy of org.apache.commons.lang3.StringUtils.isBlank(CharSequence cs)
+     *
+     * @param cs the CharSequence to check, may be null
+     * @return {@code true} if the CharSequence is null, empty or whitespace only
+     */
+    public static boolean isBlank(final CharSequence cs) {
+        int strLen;
+        if (cs == null || (strLen = cs.length()) == 0) {
+            return true;
+        }
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(cs.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if strings are equal (consider blank strings equal to null)
+     *
+     * @param a a string
+     * @param b a string to be compared with {@code a}
+     * @return {@code true} if strings are equal
+     */
+    public static boolean stringsEqualIgnoreSpaces(String a, String b) {
+        return Objects.equals(a, b) || (isBlank(a) && isBlank(b));
+    }
+
     /**
      * Get content of the file.
      *
diff --git a/src/main/resources/templates/javaClassGraphqlEnum.ftl b/src/main/resources/templates/javaClassGraphqlEnum.ftl
index 4a55a3511b6e74686ed8f649d0274064ff92100d..4b16d4157fdfd30c31d9324ec61791451c8d3268 100644
--- a/src/main/resources/templates/javaClassGraphqlEnum.ftl
+++ b/src/main/resources/templates/javaClassGraphqlEnum.ftl
@@ -10,10 +10,10 @@ package ${package};
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public enum ${className}<#if implements?has_content> implements <#list implements as interface>${interface}<#if interface_has_next>, </#if></#list></#if> {
 
diff --git a/src/main/resources/templates/javaClassGraphqlInterface.ftl b/src/main/resources/templates/javaClassGraphqlInterface.ftl
index 3512064fef6b7b328c98cd1d1273094c6f567d4a..c6ddc8b3f7de6cf71740105946a4f5a1436bd7c2 100644
--- a/src/main/resources/templates/javaClassGraphqlInterface.ftl
+++ b/src/main/resources/templates/javaClassGraphqlInterface.ftl
@@ -16,10 +16,10 @@ import ${import}.*;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public interface ${className} <#if implements?has_content>extends <#list implements as interface>${interface}<#if interface_has_next>, </#if></#list></#if>{
 
diff --git a/src/main/resources/templates/javaClassGraphqlOperations.ftl b/src/main/resources/templates/javaClassGraphqlOperations.ftl
index 790556e8e911ee4dd04774ef77c56675694e1a3b..48da119f4855c649a5a3099b78e91595abd39fde 100644
--- a/src/main/resources/templates/javaClassGraphqlOperations.ftl
+++ b/src/main/resources/templates/javaClassGraphqlOperations.ftl
@@ -14,10 +14,10 @@ import ${import}.*;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public interface ${className}<#if implements?has_content> extends <#list implements as interface>${interface}<#if interface_has_next>, </#if></#list></#if> {
 
diff --git a/src/main/resources/templates/javaClassGraphqlParametrizedInput.ftl b/src/main/resources/templates/javaClassGraphqlParametrizedInput.ftl
index 86f01293000f3ac3310f795c217a862ba54b5211..c7b87a58561c44aa392cdf4e82db43289196cbb7 100644
--- a/src/main/resources/templates/javaClassGraphqlParametrizedInput.ftl
+++ b/src/main/resources/templates/javaClassGraphqlParametrizedInput.ftl
@@ -17,10 +17,10 @@ import java.util.Objects;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public class ${className} implements GraphQLParametrizedInput {
 
diff --git a/src/main/resources/templates/javaClassGraphqlRequest.ftl b/src/main/resources/templates/javaClassGraphqlRequest.ftl
index bb57e7428c9d932142dc7ebdf839fed3e6bcb87f..31ca56088c72cc65f26c25457ffd4322954fbb06 100644
--- a/src/main/resources/templates/javaClassGraphqlRequest.ftl
+++ b/src/main/resources/templates/javaClassGraphqlRequest.ftl
@@ -18,10 +18,10 @@ import java.util.Objects;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public class ${className} implements GraphQLOperationRequest {
 
diff --git a/src/main/resources/templates/javaClassGraphqlResponse.ftl b/src/main/resources/templates/javaClassGraphqlResponse.ftl
index 8c822d615dcf9e1bd396478b98dca56482e3d82e..a605e1924a5b49f1870cd680e16f1f4eb10bc8df 100644
--- a/src/main/resources/templates/javaClassGraphqlResponse.ftl
+++ b/src/main/resources/templates/javaClassGraphqlResponse.ftl
@@ -13,10 +13,10 @@ import java.util.Map;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public class ${className} extends GraphQLResult<Map<String, ${returnTypeName}>> {
 
diff --git a/src/main/resources/templates/javaClassGraphqlResponseProjection.ftl b/src/main/resources/templates/javaClassGraphqlResponseProjection.ftl
index c84738107622d2efb98fd5fb5dd7c949fc6cd483..58e326fba819ba18c42c636743335033e5982d78 100644
--- a/src/main/resources/templates/javaClassGraphqlResponseProjection.ftl
+++ b/src/main/resources/templates/javaClassGraphqlResponseProjection.ftl
@@ -16,10 +16,10 @@ import java.util.Objects;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public class ${className} extends GraphQLResponseProjection {
 
diff --git a/src/main/resources/templates/javaClassGraphqlType.ftl b/src/main/resources/templates/javaClassGraphqlType.ftl
index 416766292cd0993a47c0a1e4b4fc861af1d12171..55dd3cd8c9105e23a2b929749c24f30f40d71828 100644
--- a/src/main/resources/templates/javaClassGraphqlType.ftl
+++ b/src/main/resources/templates/javaClassGraphqlType.ftl
@@ -25,10 +25,10 @@ import java.util.StringJoiner;
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public class ${className} implements java.io.Serializable<#if implements?has_content><#list implements as interface>, ${interface}<#if interface_has_next></#if></#list></#if> {
 
diff --git a/src/main/resources/templates/javaClassGraphqlUnion.ftl b/src/main/resources/templates/javaClassGraphqlUnion.ftl
index 939b8c70bbf6585cf1a7358d0d7d62226cd02fb0..43f2b29dcd9319a852cad58122ceb23d9e8ae0f5 100644
--- a/src/main/resources/templates/javaClassGraphqlUnion.ftl
+++ b/src/main/resources/templates/javaClassGraphqlUnion.ftl
@@ -11,10 +11,10 @@ package ${package};
  */
 </#if>
 <#if generatedInfo.getGeneratedType()?has_content>
-@${generatedInfo.getGeneratedType()}{
+@${generatedInfo.getGeneratedType()}(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "${generatedInfo.getDateTime()}"
-}
+)
 </#if>
 public interface ${className} {
 
diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenModelsForRootTypesTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenModelsForRootTypesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d9493e0c8046b9626ca6630fbf29f0336edb817
--- /dev/null
+++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenModelsForRootTypesTest.java
@@ -0,0 +1,89 @@
+package com.kobylynskyi.graphql.codegen;
+
+import com.kobylynskyi.graphql.codegen.model.GeneratedInformation;
+import com.kobylynskyi.graphql.codegen.model.MappingConfig;
+import com.kobylynskyi.graphql.codegen.utils.Utils;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class GraphQLCodegenModelsForRootTypesTest {
+
+    private final MappingConfig mappingConfig = new MappingConfig();
+    private final GeneratedInformation staticGeneratedInfo = TestUtils.getStaticGeneratedInfo();
+    private final File outputBuildDir = new File("build/generated");
+    private final File outputJavaClassesDir = new File("build/generated/com/kobylynskyi/graphql/rootmodels");
+    public static final List<String> SCHEMAS = singletonList("src/test/resources/schemas/test.graphqls");
+
+    @BeforeEach
+    void init() {
+        mappingConfig.setGenerateModelsForRootTypes(true);
+        mappingConfig.setPackageName("com.kobylynskyi.graphql.rootmodels");
+    }
+
+    @AfterEach
+    void cleanup() {
+        Utils.deleteDir(new File("build/generated"));
+    }
+
+    @Test
+    void generate_sameModelSuffixes() {
+        mappingConfig.setApiNameSuffix("");
+        mappingConfig.setModelNameSuffix(null);
+        mappingConfig.setApiNamePrefix(null);
+        mappingConfig.setModelNamePrefix("");
+        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
+                () -> new GraphQLCodegen(SCHEMAS, outputBuildDir, mappingConfig, staticGeneratedInfo),
+                "Expected generate() to throw, but it didn't");
+
+        assertEquals("Either disable APIs generation or set different Prefix/Suffix for API classes and model classes",
+                thrown.getMessage());
+    }
+
+    @Test
+    void generate_sameResolverSuffixes() {
+        // by default apiNamePrefix is same as typeResolverSuffix
+        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
+                () -> new GraphQLCodegen(SCHEMAS, outputBuildDir, mappingConfig, staticGeneratedInfo),
+                "Expected generate() to throw, but it didn't");
+
+        assertEquals("Either disable APIs generation or set different Prefix/Suffix for API classes and type resolver classes",
+                thrown.getMessage());
+    }
+
+    @Test
+    void generate_CheckFiles_generateApisFalse() throws Exception {
+        mappingConfig.setGenerateApis(false);
+        new GraphQLCodegen(SCHEMAS, outputBuildDir, mappingConfig, staticGeneratedInfo).generate();
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+        List<String> generatedFileNames = Arrays.stream(files).map(File::getName).sorted().collect(toList());
+        assertEquals(Arrays.asList("Event.java", "EventProperty.java", "EventPropertyResolver.java", "EventStatus.java",
+                "Mutation.java", "MutationResolver.java", "Query.java", "QueryResolver.java", "Subscription.java"),
+                generatedFileNames);
+    }
+
+    @Test
+    void generate_CheckFiles_generateApisTrue_CustomTypeResolverSuffix() throws Exception {
+        mappingConfig.setTypeResolverSuffix("TypeResolver");
+        new GraphQLCodegen(SCHEMAS, outputBuildDir, mappingConfig, staticGeneratedInfo).generate();
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+        List<String> generatedFileNames = Arrays.stream(files).map(File::getName).sorted().collect(toList());
+        assertEquals(Arrays.asList("CreateEventMutationResolver.java", "Event.java", "EventByIdQueryResolver.java",
+                "EventProperty.java", "EventPropertyTypeResolver.java", "EventStatus.java",
+                "EventsByCategoryAndStatusQueryResolver.java", "EventsByIdsQueryResolver.java",
+                "EventsCreatedSubscriptionResolver.java", "Mutation.java", "MutationResolver.java",
+                "MutationTypeResolver.java", "Query.java", "QueryResolver.java", "QueryTypeResolver.java",
+                "Subscription.java", "SubscriptionResolver.java", "VersionQueryResolver.java"), generatedFileNames);
+    }
+
+}
diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java
index 5d0b17282fa4dc7643020eabbb390bc11f76b80d..fbd238da0de4de7655d4e44fbc77e9520efada8d 100644
--- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java
+++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java
@@ -13,7 +13,11 @@ import org.junit.jupiter.api.Test;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 
 import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent;
 import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName;
@@ -21,7 +25,9 @@ import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class GraphQLCodegenTest {
 
@@ -192,8 +198,7 @@ class GraphQLCodegenTest {
         assertFileContainsElements(files, "Event.java", System.lineSeparator() +
                 "/**" + System.lineSeparator() +
                 " * An event that describes a thing that happens" + System.lineSeparator() +
-                " */" + System.lineSeparator() +
-                "@javax.annotation.Generated{");
+                " */" + System.lineSeparator());
     }
 
     @Test
diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/TestUtils.java b/src/test/java/com/kobylynskyi/graphql/codegen/TestUtils.java
index 898bf61016d287f9de6a6eb5ea79a8290c149069..add3f6286327588ff60505df1b2e9e0fd328fd5e 100644
--- a/src/test/java/com/kobylynskyi/graphql/codegen/TestUtils.java
+++ b/src/test/java/com/kobylynskyi/graphql/codegen/TestUtils.java
@@ -27,9 +27,24 @@ public class TestUtils {
     public static void assertSameTrimmedContent(File expected, File file) throws IOException {
         String expectedContent = Utils.getFileContent(expected.getPath()).trim();
         String actualContent = Utils.getFileContent(file.getPath()).trim();
+        if (atLeastJava9()) {
+            // doing this hack in order to make the build work on all Java versions
+            actualContent = actualContent.replace(
+                    "javax.annotation.processing.Generated",
+                    "javax.annotation.Generated");
+        }
         assertEquals(expectedContent, actualContent);
     }
 
+    private static boolean atLeastJava9() {
+        try {
+            Class.forName("javax.annotation.processing.Generated");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
     public static GeneratedInformation getStaticGeneratedInfo() {
         GeneratedInformation generatedInformation = new GeneratedInformation();
         generatedInformation.setDateTimeGenerator(new DateTimeGenerator() {
diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java
index 2f0b4cdeafad1d8b83601443c8984e835cd01924..1ca66c1a2bf89c25768f0bb928ab4444ba62390d 100644
--- a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java
+++ b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java
@@ -62,6 +62,9 @@ class MappingConfigTest {
         assertEquals("10", mappingConfig.getResponseSuffix());
         assertEquals("7", mappingConfig.getResponseProjectionSuffix());
         assertFalse(mappingConfig.getGenerateClient());
+        assertFalse(mappingConfig.getGenerateModelsForRootTypes());
+        assertEquals("11", mappingConfig.getTypeResolverPrefix());
+        assertEquals("12", mappingConfig.getTypeResolverSuffix());
     }
 
     @Test
@@ -92,7 +95,10 @@ class MappingConfigTest {
         assertEquals("10", mappingConfig.getResponseSuffix());
         assertEquals("7", mappingConfig.getResponseProjectionSuffix());
         assertFalse(mappingConfig.getGenerateClient());
+        assertFalse(mappingConfig.getGenerateModelsForRootTypes());
         assertEquals("9", mappingConfig.getParametrizedInputSuffix());
+        assertEquals("11", mappingConfig.getTypeResolverPrefix());
+        assertEquals("12", mappingConfig.getTypeResolverSuffix());
     }
 
     @Test
@@ -125,7 +131,10 @@ class MappingConfigTest {
         assertEquals("1010", mappingConfig.getResponseSuffix());
         assertEquals("77", mappingConfig.getResponseProjectionSuffix());
         assertTrue(mappingConfig.getGenerateClient());
+        assertTrue(mappingConfig.getGenerateModelsForRootTypes());
         assertEquals("99", mappingConfig.getParametrizedInputSuffix());
+        assertEquals("1111", mappingConfig.getTypeResolverPrefix());
+        assertEquals("1212", mappingConfig.getTypeResolverSuffix());
     }
 
     private static Map<String, String> hashMap(AbstractMap.SimpleEntry<String, String>... entries) {
@@ -158,7 +167,10 @@ class MappingConfigTest {
         config.setResponseSuffix("10");
         config.setResponseProjectionSuffix("7");
         config.setGenerateClient(false);
+        config.setGenerateModelsForRootTypes(false);
         config.setParametrizedInputSuffix("9");
+        config.setTypeResolverPrefix("11");
+        config.setTypeResolverSuffix("12");
         return config;
     }
 
@@ -187,7 +199,10 @@ class MappingConfigTest {
         config.setResponseSuffix("1010");
         config.setResponseProjectionSuffix("77");
         config.setGenerateClient(true);
+        config.setGenerateModelsForRootTypes(true);
         config.setParametrizedInputSuffix("99");
+        config.setTypeResolverPrefix("1111");
+        config.setTypeResolverSuffix("1212");
         return config;
     }
 
diff --git a/src/test/resources/expected-classes/AcceptTopicSuggestionPayloadResolver.java.txt b/src/test/resources/expected-classes/AcceptTopicSuggestionPayloadResolver.java.txt
index a785891f5ca0a7a80c1457c3c36190dd24cb4ffa..13886f4cb92a3c5c577396456c06c5172728b5d1 100644
--- a/src/test/resources/expected-classes/AcceptTopicSuggestionPayloadResolver.java.txt
+++ b/src/test/resources/expected-classes/AcceptTopicSuggestionPayloadResolver.java.txt
@@ -4,10 +4,10 @@ package com.github.graphql;
 /**
  * Resolver for AcceptTopicSuggestionPayload
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface AcceptTopicSuggestionPayloadResolver {
 
     GithubTopicTO topic(GithubAcceptTopicSuggestionPayloadTO githubAcceptTopicSuggestionPayloadTO, graphql.schema.DataFetchingEnvironment env) throws Exception;
diff --git a/src/test/resources/expected-classes/CommentDeletedEvent.java.txt b/src/test/resources/expected-classes/CommentDeletedEvent.java.txt
index 0e25f333808f4afba2b75b648e3ac13d556e1ecf..788076193ce60b87691c122ced854685933137e2 100644
--- a/src/test/resources/expected-classes/CommentDeletedEvent.java.txt
+++ b/src/test/resources/expected-classes/CommentDeletedEvent.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class CommentDeletedEvent implements java.io.Serializable, IssueTimelineItems, PullRequestTimelineItems, Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/CommentDeletedEventResolver.java.txt b/src/test/resources/expected-classes/CommentDeletedEventResolver.java.txt
index 40a9394ed00874c56f74467c9b0b258e5ec74bff..2157625635d8582538e6e0965bab12371ce959d8 100644
--- a/src/test/resources/expected-classes/CommentDeletedEventResolver.java.txt
+++ b/src/test/resources/expected-classes/CommentDeletedEventResolver.java.txt
@@ -4,10 +4,10 @@ package com.github.graphql;
 /**
  * Resolver for CommentDeletedEvent
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CommentDeletedEventResolver {
 
     Actor actor(CommentDeletedEvent commentDeletedEvent) throws Exception;
diff --git a/src/test/resources/expected-classes/Commit.java.txt b/src/test/resources/expected-classes/Commit.java.txt
index 3c50fbc1a2b5d21aba029292840ce686bd2723e3..443487912d236d405d85fdca47dd914f039f7654 100644
--- a/src/test/resources/expected-classes/Commit.java.txt
+++ b/src/test/resources/expected-classes/Commit.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Commit implements java.io.Serializable, Closer, IssueTimelineItem, PullRequestTimelineItem, Subscribable, Node, GitObject, UniformResourceLocatable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/CommitResolver.java.txt b/src/test/resources/expected-classes/CommitResolver.java.txt
index 6c0780fdd8316561986a7e7b152ed1838a19aad8..1e4506936494866c820f516a5d7a4ab471dc55a1 100644
--- a/src/test/resources/expected-classes/CommitResolver.java.txt
+++ b/src/test/resources/expected-classes/CommitResolver.java.txt
@@ -4,10 +4,10 @@ package com.github.graphql;
 /**
  * Resolver for Commit
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CommitResolver {
 
     PullRequestConnection associatedPullRequests(Commit commit, String after, String before, Integer first, Integer last, PullRequestOrder orderBy, graphql.schema.DataFetchingEnvironment env) throws Exception;
diff --git a/src/test/resources/expected-classes/Commit_noParametrizedFields.java.txt b/src/test/resources/expected-classes/Commit_noParametrizedFields.java.txt
index 561645628d48a5cbb7071265bd270492a85a0e10..bc7c3ece4f43c26f2c7f54c25c28f85f0bad1c98 100644
--- a/src/test/resources/expected-classes/Commit_noParametrizedFields.java.txt
+++ b/src/test/resources/expected-classes/Commit_noParametrizedFields.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Commit implements java.io.Serializable, Closer, IssueTimelineItem, PullRequestTimelineItem, Subscribable, Node, GitObject, UniformResourceLocatable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/Commit_noValidationAnnotation.java.txt b/src/test/resources/expected-classes/Commit_noValidationAnnotation.java.txt
index 397303576efc5a9a9ef7cae8923dbb7b76e40bef..109479ba3a203f5fab1454c6313f6b1bb89e6ea3 100644
--- a/src/test/resources/expected-classes/Commit_noValidationAnnotation.java.txt
+++ b/src/test/resources/expected-classes/Commit_noValidationAnnotation.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Commit implements java.io.Serializable, Closer, IssueTimelineItem, PullRequestTimelineItem, Subscribable, Node, GitObject, UniformResourceLocatable {
 
     private String abbreviatedOid;
diff --git a/src/test/resources/expected-classes/CreateEventMutationResolver.java.txt b/src/test/resources/expected-classes/CreateEventMutationResolver.java.txt
index 552522dc99545619bb6ed35a22d53640692913bb..19cb95a03007079878daac90c09c9df187f28ec9 100644
--- a/src/test/resources/expected-classes/CreateEventMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/CreateEventMutationResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Create a new event.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateEventMutationResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/EmptyMutationResolver.java.txt b/src/test/resources/expected-classes/EmptyMutationResolver.java.txt
index 2778966ef41d7666fbecc0ecce2f02cf7a0a55a0..78699a29158b8885c822c1fa6e09222b00b073dc 100644
--- a/src/test/resources/expected-classes/EmptyMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/EmptyMutationResolver.java.txt
@@ -1,8 +1,8 @@
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/EmptyQueryResolver.java.txt b/src/test/resources/expected-classes/EmptyQueryResolver.java.txt
index cdec92fb6f94b287c5aa8f9fa16fcb762b0c3340..0eb70b7b85b992c6dd5a520079db4f4692ec2357 100644
--- a/src/test/resources/expected-classes/EmptyQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/EmptyQueryResolver.java.txt
@@ -1,8 +1,8 @@
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/Event.java.txt b/src/test/resources/expected-classes/Event.java.txt
index f9c5726cdfd78c9368b90315f9c5df4ecbd60c9d..b9cd645b056ad8d347905113e024e46daf5cc684 100644
--- a/src/test/resources/expected-classes/Event.java.txt
+++ b/src/test/resources/expected-classes/Event.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * An event that describes a thing that happens
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable {
 
     private String id;
diff --git a/src/test/resources/expected-classes/EventByIdQueryResolver.java.txt b/src/test/resources/expected-classes/EventByIdQueryResolver.java.txt
index 8a8c1519b8905379792c6323f8b5190e9a722fa7..34d8093ca0b406bb76380000d61ae35363f87f1c 100644
--- a/src/test/resources/expected-classes/EventByIdQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/EventByIdQueryResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Single event by ID.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventByIdQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/EventProperty.java.txt b/src/test/resources/expected-classes/EventProperty.java.txt
index a6b590888e5cc2cf2ed4c63e4ced73ea31984b0b..9888a20328525d085154222c96dc9fdc10558b79 100644
--- a/src/test/resources/expected-classes/EventProperty.java.txt
+++ b/src/test/resources/expected-classes/EventProperty.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * An event property have all possible types
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventProperty implements java.io.Serializable {
 
     private Double floatVal;
diff --git a/src/test/resources/expected-classes/EventPropertyTO_toString.java.txt b/src/test/resources/expected-classes/EventPropertyTO_toString.java.txt
index ee755cb0b842c973e3f43c4cfec915e7dc526f60..727c47b0182ec91f66f7c0f6da060576e58e4c5a 100644
--- a/src/test/resources/expected-classes/EventPropertyTO_toString.java.txt
+++ b/src/test/resources/expected-classes/EventPropertyTO_toString.java.txt
@@ -5,10 +5,10 @@ import java.util.StringJoiner;
 /**
  * An event property have all possible types
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyTO implements java.io.Serializable {
 
     private Double floatVal;
diff --git a/src/test/resources/expected-classes/EventPropertyTO_withEqualsAndHashCode.java.txt b/src/test/resources/expected-classes/EventPropertyTO_withEqualsAndHashCode.java.txt
index 66e20d3fc23081279676f81cbceceb290b249ae5..60944c631ac0efa4db1a6c5d9551cf9d04ce629a 100644
--- a/src/test/resources/expected-classes/EventPropertyTO_withEqualsAndHashCode.java.txt
+++ b/src/test/resources/expected-classes/EventPropertyTO_withEqualsAndHashCode.java.txt
@@ -5,10 +5,10 @@ import java.util.Objects;
 /**
  * An event property have all possible types
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyTO implements java.io.Serializable {
 
     private Double floatVal;
diff --git a/src/test/resources/expected-classes/EventStatus.java.txt b/src/test/resources/expected-classes/EventStatus.java.txt
index fd6e07f0cf89bce7e9b2fe8c7d8414b23b960dac..0db79033eaf51ef2b40bd4596c9d0db9753a02b7 100644
--- a/src/test/resources/expected-classes/EventStatus.java.txt
+++ b/src/test/resources/expected-classes/EventStatus.java.txt
@@ -3,10 +3,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Possible statuses of the event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum EventStatus {
 
     /**
diff --git a/src/test/resources/expected-classes/Event_noBuilder.java.txt b/src/test/resources/expected-classes/Event_noBuilder.java.txt
index 397b3094202e2157134171043593e5c510dccd02..8e2dd40884a823491affca1f709cb7bbdfc0afd5 100644
--- a/src/test/resources/expected-classes/Event_noBuilder.java.txt
+++ b/src/test/resources/expected-classes/Event_noBuilder.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * An event that describes a thing that happens
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable {
 
     private String id;
diff --git a/src/test/resources/expected-classes/EventsByCategoryAndStatusQueryResolver.java.txt b/src/test/resources/expected-classes/EventsByCategoryAndStatusQueryResolver.java.txt
index d17fd37a6fc58299e2d55c5f7875fd12a6ed5092..08136cb03cb20cd7f1483cca1993d6b87334149c 100644
--- a/src/test/resources/expected-classes/EventsByCategoryAndStatusQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/EventsByCategoryAndStatusQueryResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * List of events of a specified category.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsByCategoryAndStatusQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/EventsByIdsQueryResolver.java.txt b/src/test/resources/expected-classes/EventsByIdsQueryResolver.java.txt
index 22c5851ded8c2a95b2f3d16cf22bb8117c3404c5..166868dce91a1e192d580a8f643a20e84bb5daa0 100644
--- a/src/test/resources/expected-classes/EventsByIdsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/EventsByIdsQueryResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Events by IDs.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsByIdsQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/EventsCreatedSubscriptionResolver.java.txt b/src/test/resources/expected-classes/EventsCreatedSubscriptionResolver.java.txt
index 7ddb60d317dec08600863de70c86faf82d74ab7f..019bb1f821d6ccb7b67c75474d06bd0cf124cded 100644
--- a/src/test/resources/expected-classes/EventsCreatedSubscriptionResolver.java.txt
+++ b/src/test/resources/expected-classes/EventsCreatedSubscriptionResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Subscribe to events
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsCreatedSubscriptionResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/GithubAcceptTopicSuggestionInputTO.java.txt b/src/test/resources/expected-classes/GithubAcceptTopicSuggestionInputTO.java.txt
index ec8c23bcea19f9a1fae224a7358a870b7591232e..5281447b8dc3870050e60754a2ac035ee78f0a7d 100644
--- a/src/test/resources/expected-classes/GithubAcceptTopicSuggestionInputTO.java.txt
+++ b/src/test/resources/expected-classes/GithubAcceptTopicSuggestionInputTO.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class GithubAcceptTopicSuggestionInputTO implements java.io.Serializable {
 
     private String clientMutationId;
diff --git a/src/test/resources/expected-classes/GithubAcceptTopicSuggestionPayloadTO.java.txt b/src/test/resources/expected-classes/GithubAcceptTopicSuggestionPayloadTO.java.txt
index 1ee6fbbdb970f4da887b27be207f5d8d5967f688..bf5ab23fc44fb3965793090766ba8f819676acdc 100644
--- a/src/test/resources/expected-classes/GithubAcceptTopicSuggestionPayloadTO.java.txt
+++ b/src/test/resources/expected-classes/GithubAcceptTopicSuggestionPayloadTO.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class GithubAcceptTopicSuggestionPayloadTO implements java.io.Serializable {
 
     private String clientMutationId;
diff --git a/src/test/resources/expected-classes/GithubCommitTO.java.txt b/src/test/resources/expected-classes/GithubCommitTO.java.txt
index d734a172412081f34f24237ac3a5f48d8e9b727f..0a1552068429521536793aa86b1c475e80d041b7 100644
--- a/src/test/resources/expected-classes/GithubCommitTO.java.txt
+++ b/src/test/resources/expected-classes/GithubCommitTO.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class GithubCommitTO implements java.io.Serializable, GithubCloserTO, GithubIssueTimelineItemTO, GithubPullRequestTimelineItemTO, GithubGitObjectTO, GithubNodeTO, GithubSubscribableTO, GithubUniformResourceLocatableTO {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/MutationResolver.java.txt b/src/test/resources/expected-classes/MutationResolver.java.txt
index cec65929acaecd073864bba600775b0bd0dada77..05cda4d0fa41110486067e2c80ab2b2ef50dadb2 100644
--- a/src/test/resources/expected-classes/MutationResolver.java.txt
+++ b/src/test/resources/expected-classes/MutationResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/MyUnion.java.txt b/src/test/resources/expected-classes/MyUnion.java.txt
index ba47de4f3e3e86d3ac77fc47bc948f5f43310b62..2bf00f12b46e79e04de5dcfd8e7a424cc8d1da58 100644
--- a/src/test/resources/expected-classes/MyUnion.java.txt
+++ b/src/test/resources/expected-classes/MyUnion.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.multifiles;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MyUnion {
 
 }
diff --git a/src/test/resources/expected-classes/Person.java.txt b/src/test/resources/expected-classes/Person.java.txt
index ae32c1ed6d46a61f3e5f98c83fcbc11fefedbd75..c3b6f602d0e10b6e03b6dc18c12759eaabc12682 100644
--- a/src/test/resources/expected-classes/Person.java.txt
+++ b/src/test/resources/expected-classes/Person.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Person implements java.io.Serializable, NamedEntity {
 
     private String name;
diff --git a/src/test/resources/expected-classes/Person1.java.txt b/src/test/resources/expected-classes/Person1.java.txt
index 024986f20fa0f81eed62be0481c27fc980a3ca7a..7052499082d5cc2e017cd6949b09be20d54c64ca 100644
--- a/src/test/resources/expected-classes/Person1.java.txt
+++ b/src/test/resources/expected-classes/Person1.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Person implements java.io.Serializable, NamedEntity {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/ProductsByCategoryIdAndStatusQueryResolver.java.txt b/src/test/resources/expected-classes/ProductsByCategoryIdAndStatusQueryResolver.java.txt
index 65c6b134590548cab03d5eb93f1dde7d16d6ebfb..7c32af7ec0ac818ca45ce7eea8c0c979ea263d73 100644
--- a/src/test/resources/expected-classes/ProductsByCategoryIdAndStatusQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/ProductsByCategoryIdAndStatusQueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface ProductsByCategoryIdAndStatusQueryResolver {
 
     java.util.List<Product> products(String categoryId, String status) throws Exception;
diff --git a/src/test/resources/expected-classes/ProductsByIdsQueryResolver.java.txt b/src/test/resources/expected-classes/ProductsByIdsQueryResolver.java.txt
index 4fd13504334d9c30a8f7ea749ef129371ccfebb4..0827f0bad6732a4401961ccf4cf3163a2ff5f486 100644
--- a/src/test/resources/expected-classes/ProductsByIdsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/ProductsByIdsQueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface ProductsByIdsQueryResolver {
 
     java.util.List<Product> products(java.util.List<String> ids) throws Exception;
diff --git a/src/test/resources/expected-classes/ProfileOwner.java.txt b/src/test/resources/expected-classes/ProfileOwner.java.txt
index e957a170f3035c9f44b7be0ad561b7a4bb1a1788..57b8b86f28417b302f191b8a4fa41971de440453 100644
--- a/src/test/resources/expected-classes/ProfileOwner.java.txt
+++ b/src/test/resources/expected-classes/ProfileOwner.java.txt
@@ -1,10 +1,10 @@
 package com.github.graphql;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface ProfileOwner {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/QueryResolver.java.txt b/src/test/resources/expected-classes/QueryResolver.java.txt
index c8b611746cdf6fc26f6741d0c9502b408b5d7dea..2a41ae2b94678c2d21834943800b5cdf70dbd09a 100644
--- a/src/test/resources/expected-classes/QueryResolver.java.txt
+++ b/src/test/resources/expected-classes/QueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/SubscriptionResolver.java.txt b/src/test/resources/expected-classes/SubscriptionResolver.java.txt
index dfe811c88533c15530fe2a269eae25e160535462..1a00dcf86e2970ac6a3413d1a61b2e2ae9b40ca4 100644
--- a/src/test/resources/expected-classes/SubscriptionResolver.java.txt
+++ b/src/test/resources/expected-classes/SubscriptionResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface SubscriptionResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/UnionMember1.java.txt b/src/test/resources/expected-classes/UnionMember1.java.txt
index 3341ab5029883ad10f71d79883f9a51e2b5aef9a..bfc48ca6b0340454fcf90158252649527fdd2a52 100644
--- a/src/test/resources/expected-classes/UnionMember1.java.txt
+++ b/src/test/resources/expected-classes/UnionMember1.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.multifiles;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class UnionMember1 implements java.io.Serializable, MyUnion {
 
     private Integer someField;
diff --git a/src/test/resources/expected-classes/UnionMember2.java.txt b/src/test/resources/expected-classes/UnionMember2.java.txt
index dd1f4695cfdd35c956ba4ba4b7ca6ef1044d179e..f17773cfbd850049708ca7058114546a14a36e9f 100644
--- a/src/test/resources/expected-classes/UnionMember2.java.txt
+++ b/src/test/resources/expected-classes/UnionMember2.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.multifiles;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class UnionMember2 implements java.io.Serializable, MyUnion {
 
     private String someField;
diff --git a/src/test/resources/expected-classes/VersionQueryResolver.java.txt b/src/test/resources/expected-classes/VersionQueryResolver.java.txt
index 908371835e7e46dffce974986b1aeb4c7a21bc3e..edd070aa4edcc5f19c33dba707e741b5d035449e 100644
--- a/src/test/resources/expected-classes/VersionQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/VersionQueryResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.test1;
 /**
  * Version of the application.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface VersionQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/defaults/InputWithDefaults.java.txt b/src/test/resources/expected-classes/defaults/InputWithDefaults.java.txt
index 16aec8ca9a79d6e4283c40a9ac998aa1ceb48cb2..5a906e4e942b280b0d16560c9a42cc85220ce633 100644
--- a/src/test/resources/expected-classes/defaults/InputWithDefaults.java.txt
+++ b/src/test/resources/expected-classes/defaults/InputWithDefaults.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.testdefaults;
 /**
  * This input has all possible types
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class InputWithDefaults implements java.io.Serializable {
 
     private Double floatVal = 1.23;
diff --git a/src/test/resources/expected-classes/defaults/InputWithDefaultsTO.java.txt b/src/test/resources/expected-classes/defaults/InputWithDefaultsTO.java.txt
index eca8cf5333fa0a077e0dd215fa11e2ba2725e2ec..1777c08644935bd330287475c34fc0f73b627436 100644
--- a/src/test/resources/expected-classes/defaults/InputWithDefaultsTO.java.txt
+++ b/src/test/resources/expected-classes/defaults/InputWithDefaultsTO.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.testdefaults;
 /**
  * This input has all possible types
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class InputWithDefaultsTO implements java.io.Serializable {
 
     private Double floatVal = 1.23;
diff --git a/src/test/resources/expected-classes/defaults/MyEnum.java.txt b/src/test/resources/expected-classes/defaults/MyEnum.java.txt
index 0b032e1c15d192c8ea7adaa8abffff5d96485c59..659d14ee3c281e7782a92bddc205860ae6290447 100644
--- a/src/test/resources/expected-classes/defaults/MyEnum.java.txt
+++ b/src/test/resources/expected-classes/defaults/MyEnum.java.txt
@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.testdefaults;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum MyEnum {
 
     ONE,
diff --git a/src/test/resources/expected-classes/defaults/MyEnumTO.java.txt b/src/test/resources/expected-classes/defaults/MyEnumTO.java.txt
index 215128a5876f611a45251b5464ad49ff3c94a9fb..92abae368c0bb463357d2d7a26cfbcd093ecff7e 100644
--- a/src/test/resources/expected-classes/defaults/MyEnumTO.java.txt
+++ b/src/test/resources/expected-classes/defaults/MyEnumTO.java.txt
@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.testdefaults;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum MyEnumTO {
 
     ONE,
diff --git a/src/test/resources/expected-classes/defaults/SomeObject.java.txt b/src/test/resources/expected-classes/defaults/SomeObject.java.txt
index cf58c8635f93b92102c370e2af9e453b234c9221..380b17f37c014b20ae46a3d0d89f5f157cce921d 100644
--- a/src/test/resources/expected-classes/defaults/SomeObject.java.txt
+++ b/src/test/resources/expected-classes/defaults/SomeObject.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.testdefaults;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class SomeObject implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/defaults/SomeObjectTO.java.txt b/src/test/resources/expected-classes/defaults/SomeObjectTO.java.txt
index 7113de8574d0424028e832ded36b9e26b702b5ea..1f3cc1783f09c6f0f6def9bd8f717bf8b4fb3ee6 100644
--- a/src/test/resources/expected-classes/defaults/SomeObjectTO.java.txt
+++ b/src/test/resources/expected-classes/defaults/SomeObjectTO.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.testdefaults;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class SomeObjectTO implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/deprecated/CreateEventMutationResolver.java.txt b/src/test/resources/expected-classes/deprecated/CreateEventMutationResolver.java.txt
index da7edd4376ad6980dc7e074fdb83c8f833018a5b..7b59a7a7ea9d9eed456b8f9d46ea483517e50438 100644
--- a/src/test/resources/expected-classes/deprecated/CreateEventMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/deprecated/CreateEventMutationResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateEventMutationResolver {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/Event.java.txt b/src/test/resources/expected-classes/deprecated/Event.java.txt
index 99df799016ea9a6482c74e0d2b8e229d1145059c..db54f5879c169173220ce14e1065be5fb9a14d06 100644
--- a/src/test/resources/expected-classes/deprecated/Event.java.txt
+++ b/src/test/resources/expected-classes/deprecated/Event.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable, PinnableItem, Node {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/EventInput.java.txt b/src/test/resources/expected-classes/deprecated/EventInput.java.txt
index bf909703d9b8f97978d88f6ec04d467c58deb534..c901f3d155a41fa36d3b2a22afdf1df03eb64d88 100644
--- a/src/test/resources/expected-classes/deprecated/EventInput.java.txt
+++ b/src/test/resources/expected-classes/deprecated/EventInput.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventInput implements java.io.Serializable {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/EventsQueryResolver.java.txt b/src/test/resources/expected-classes/deprecated/EventsQueryResolver.java.txt
index ace42db73e84a308260a1d69f02dfa3c6ee8807a..6bf51df677e3721c6e6b59abdbe7213455f72d08 100644
--- a/src/test/resources/expected-classes/deprecated/EventsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/deprecated/EventsQueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsQueryResolver {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/MutationResolver.java.txt b/src/test/resources/expected-classes/deprecated/MutationResolver.java.txt
index 817e79288459e680b63870e7fe208f3fb4b8f9ea..4d6e79a400814cf5ed1d022ab3ab7b215b06e3d8 100644
--- a/src/test/resources/expected-classes/deprecated/MutationResolver.java.txt
+++ b/src/test/resources/expected-classes/deprecated/MutationResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/Node.java.txt b/src/test/resources/expected-classes/deprecated/Node.java.txt
index f893f9b635334fa513bd968eafeebf3bcc3ae011..b5190af5169d80e2bad110d406e3931f1c49030d 100644
--- a/src/test/resources/expected-classes/deprecated/Node.java.txt
+++ b/src/test/resources/expected-classes/deprecated/Node.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface Node {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/PinnableItem.java.txt b/src/test/resources/expected-classes/deprecated/PinnableItem.java.txt
index e8421f90ad74eb2174f102157e219091f2dfa986..7a323047b5bfc9210b40fdb1d81aab9e0d77f8aa 100644
--- a/src/test/resources/expected-classes/deprecated/PinnableItem.java.txt
+++ b/src/test/resources/expected-classes/deprecated/PinnableItem.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface PinnableItem {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/deprecated/QueryResolver.java.txt b/src/test/resources/expected-classes/deprecated/QueryResolver.java.txt
index 5f5c98b56e1e238bd20baafb1629e23b923d566e..781a6685ef90ad1a1fa22d175573c0684079b830 100644
--- a/src/test/resources/expected-classes/deprecated/QueryResolver.java.txt
+++ b/src/test/resources/expected-classes/deprecated/QueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.test1;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/deprecated/Status.java.txt b/src/test/resources/expected-classes/deprecated/Status.java.txt
index bd7ad0cfffa0b537d3e9fde2ce6f801cc016c155..5b709206d5fd38fd28462b4412b4267315ef8ec2 100644
--- a/src/test/resources/expected-classes/deprecated/Status.java.txt
+++ b/src/test/resources/expected-classes/deprecated/Status.java.txt
@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.test1;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum Status {
 
     @Deprecated
diff --git a/src/test/resources/expected-classes/enum-union/EnumMember1.java.txt b/src/test/resources/expected-classes/enum-union/EnumMember1.java.txt
index 8bb936a6213fd3f3afc4f6000d713650aabe419f..15baaaff01f986ee1dd09f1f894e832f828ca98a 100644
--- a/src/test/resources/expected-classes/enum-union/EnumMember1.java.txt
+++ b/src/test/resources/expected-classes/enum-union/EnumMember1.java.txt
@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.enumunion;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum EnumMember1 implements EnumUnion {
 
     VALUE
diff --git a/src/test/resources/expected-classes/enum-union/EnumMember2.java.txt b/src/test/resources/expected-classes/enum-union/EnumMember2.java.txt
index 878b35592372372f980b2724b120333b4341a392..0bf7557b72f3ac36f3aea2f954ce10518886ad81 100644
--- a/src/test/resources/expected-classes/enum-union/EnumMember2.java.txt
+++ b/src/test/resources/expected-classes/enum-union/EnumMember2.java.txt
@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.enumunion;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum EnumMember2 implements EnumUnion {
 
     OTHER_VALUE
diff --git a/src/test/resources/expected-classes/enum-union/EnumUnion.java.txt b/src/test/resources/expected-classes/enum-union/EnumUnion.java.txt
index 6c5539170f23078866ec79db76347b6d91bea1fc..6959f28f0e2f3bea0451ae0744ac4c9499377527 100644
--- a/src/test/resources/expected-classes/enum-union/EnumUnion.java.txt
+++ b/src/test/resources/expected-classes/enum-union/EnumUnion.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.enumunion;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EnumUnion {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/Asset.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/Asset.java.txt
index aac8e0ffe4feb41a3f1725e61cb9daa9b615b86c..7ef0a174f0a3ab6a2d68158309641d8b937c184f 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/Asset.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/Asset.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Asset implements java.io.Serializable, PinnableItem, Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/AssetInput.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/AssetInput.java.txt
index c93d392e71173b31af61da89927f7efd7fda9677..1528e114d1587ddf40d079c03b8632dabdaf61b1 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/AssetInput.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/AssetInput.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class AssetInput implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/AssetsQueryResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/AssetsQueryResolver.java.txt
index 5d3360a4d42481f9fabbe6b7d53d0c6dfc5c536c..f771b0022e8caeca407115c3bb6f7ac842ec5893 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/AssetsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/AssetsQueryResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface AssetsQueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/CreateAssetMutationResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/CreateAssetMutationResolver.java.txt
index 71d7056fa2873faa0d67dabd128c9ab5cfdfe417..f41c58f768aea9b1959ce696b72cf52d8a559774 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/CreateAssetMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/CreateAssetMutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateAssetMutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/CreateEventMutationResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/CreateEventMutationResolver.java.txt
index c777e0a88719d9c22bc07254a8f1204e176a527b..87a4c86a6e45d8b60f3c90da2a0db0ebb6c2e769 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/CreateEventMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/CreateEventMutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateEventMutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/Event.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/Event.java.txt
index 61496bcb04516b3e3de14d3fdf13e9c6e150efee..8e2f71c0f078e2b2cec7a1ca633a4918b455ca27 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/Event.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/Event.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable, PinnableItem, Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/EventInput.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/EventInput.java.txt
index 5122d9007ac9e16f83037fee7726232091252b9d..201223773d9e8390a8e3adbab3657e1be19416be 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/EventInput.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/EventInput.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventInput implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/EventResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/EventResolver.java.txt
index 705002877d0c6f4804b3bd768135ff49cf1cbd7d..cdcab313f046318fe241004050e1e7c68409e61a 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/EventResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/EventResolver.java.txt
@@ -1,10 +1,10 @@
 /**
  * Resolver for Event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/EventsQueryResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/EventsQueryResolver.java.txt
index e2c80e05c5010465fcb246113c94857fee00ba09..b8f2203717c1e6db8da05623e7361a0069f1ba46 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/EventsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/EventsQueryResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsQueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/MutationResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/MutationResolver.java.txt
index 18ba6c2a479e37867c5cbf986b01b5c89ce8123d..8e08e64e43ccedd7942b28eb21b8577387a13b7c 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/MutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/MutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/Node.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/Node.java.txt
index 95e8556e1a330522c91340952cdb53d1a04fa7ce..c51fe604a86ae6bb945be598eef9edb305482430 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/Node.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/Node.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/NodeResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/NodeResolver.java.txt
index f763b28855adb11ee75912934acc5c12c58b2b5b..50fde298ba5bdd8ac30581e8eaa7291ae1adaeda 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/NodeResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/NodeResolver.java.txt
@@ -1,10 +1,10 @@
 /**
  * Resolver for Node
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface NodeResolver {
 
     String createdBy(Node node) throws Exception;
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/PinnableItem.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/PinnableItem.java.txt
index 50cbb0dc0ad89a117058824966df035f75ea64a4..243c0be00db13298fc95eff9ef78116a74b5e873 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/PinnableItem.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/PinnableItem.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface PinnableItem {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/QueryResolver.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/QueryResolver.java.txt
index b1c86bbd9bee5656b2b2e762b4e5df6734a5b8a8..ed78acc3f185f825987f3cbfd4a0ba85f91ec375 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/QueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/QueryResolver.java.txt
@@ -2,10 +2,10 @@
  * Queries related to events
  * Queries related to assets
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend-with-resolvers/Status.java.txt b/src/test/resources/expected-classes/extend-with-resolvers/Status.java.txt
index 5aaa563f034bf2421489baecaaf2890504a9dad7..cd7cad824dff604cba719374be783f6f7dfc4d6f 100644
--- a/src/test/resources/expected-classes/extend-with-resolvers/Status.java.txt
+++ b/src/test/resources/expected-classes/extend-with-resolvers/Status.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum Status {
 
     CREATED,
diff --git a/src/test/resources/expected-classes/extend/Asset.java.txt b/src/test/resources/expected-classes/extend/Asset.java.txt
index 2396113edf217dcb83abe61d15b54a17efb145bb..bfa05b522bebe232dbd5d894eb88ca090bf5a927 100644
--- a/src/test/resources/expected-classes/extend/Asset.java.txt
+++ b/src/test/resources/expected-classes/extend/Asset.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Asset implements java.io.Serializable, PinnableItem, Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/AssetInput.java.txt b/src/test/resources/expected-classes/extend/AssetInput.java.txt
index c93d392e71173b31af61da89927f7efd7fda9677..1528e114d1587ddf40d079c03b8632dabdaf61b1 100644
--- a/src/test/resources/expected-classes/extend/AssetInput.java.txt
+++ b/src/test/resources/expected-classes/extend/AssetInput.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class AssetInput implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/AssetsQueryResolver.java.txt b/src/test/resources/expected-classes/extend/AssetsQueryResolver.java.txt
index 5d3360a4d42481f9fabbe6b7d53d0c6dfc5c536c..f771b0022e8caeca407115c3bb6f7ac842ec5893 100644
--- a/src/test/resources/expected-classes/extend/AssetsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/AssetsQueryResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface AssetsQueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/CreateAssetMutationResolver.java.txt b/src/test/resources/expected-classes/extend/CreateAssetMutationResolver.java.txt
index 71d7056fa2873faa0d67dabd128c9ab5cfdfe417..f41c58f768aea9b1959ce696b72cf52d8a559774 100644
--- a/src/test/resources/expected-classes/extend/CreateAssetMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/CreateAssetMutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateAssetMutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/CreateEventMutationResolver.java.txt b/src/test/resources/expected-classes/extend/CreateEventMutationResolver.java.txt
index c777e0a88719d9c22bc07254a8f1204e176a527b..87a4c86a6e45d8b60f3c90da2a0db0ebb6c2e769 100644
--- a/src/test/resources/expected-classes/extend/CreateEventMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/CreateEventMutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateEventMutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/Event.java.txt b/src/test/resources/expected-classes/extend/Event.java.txt
index fdc2902427400a7577b63fc4161bb382267cdd5c..a7d2763be37004b8eb451568f66d01cf0e827554 100644
--- a/src/test/resources/expected-classes/extend/Event.java.txt
+++ b/src/test/resources/expected-classes/extend/Event.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable, PinnableItem, Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/EventInput.java.txt b/src/test/resources/expected-classes/extend/EventInput.java.txt
index 5122d9007ac9e16f83037fee7726232091252b9d..201223773d9e8390a8e3adbab3657e1be19416be 100644
--- a/src/test/resources/expected-classes/extend/EventInput.java.txt
+++ b/src/test/resources/expected-classes/extend/EventInput.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventInput implements java.io.Serializable {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/EventsQueryResolver.java.txt b/src/test/resources/expected-classes/extend/EventsQueryResolver.java.txt
index e2c80e05c5010465fcb246113c94857fee00ba09..b8f2203717c1e6db8da05623e7361a0069f1ba46 100644
--- a/src/test/resources/expected-classes/extend/EventsQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/EventsQueryResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsQueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/MutationResolver.java.txt b/src/test/resources/expected-classes/extend/MutationResolver.java.txt
index 18ba6c2a479e37867c5cbf986b01b5c89ce8123d..8e08e64e43ccedd7942b28eb21b8577387a13b7c 100644
--- a/src/test/resources/expected-classes/extend/MutationResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/MutationResolver.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/Node.java.txt b/src/test/resources/expected-classes/extend/Node.java.txt
index 5a2c268e4a2eed0ba787aa37e5c804b653294359..3c22f18ff3dd80c3b5ba786bd94773a9d6b4d725 100644
--- a/src/test/resources/expected-classes/extend/Node.java.txt
+++ b/src/test/resources/expected-classes/extend/Node.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface Node {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/PinnableItem.java.txt b/src/test/resources/expected-classes/extend/PinnableItem.java.txt
index 50cbb0dc0ad89a117058824966df035f75ea64a4..243c0be00db13298fc95eff9ef78116a74b5e873 100644
--- a/src/test/resources/expected-classes/extend/PinnableItem.java.txt
+++ b/src/test/resources/expected-classes/extend/PinnableItem.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface PinnableItem {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/expected-classes/extend/QueryResolver.java.txt b/src/test/resources/expected-classes/extend/QueryResolver.java.txt
index b1c86bbd9bee5656b2b2e762b4e5df6734a5b8a8..ed78acc3f185f825987f3cbfd4a0ba85f91ec375 100644
--- a/src/test/resources/expected-classes/extend/QueryResolver.java.txt
+++ b/src/test/resources/expected-classes/extend/QueryResolver.java.txt
@@ -2,10 +2,10 @@
  * Queries related to events
  * Queries related to assets
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/extend/Status.java.txt b/src/test/resources/expected-classes/extend/Status.java.txt
index 5aaa563f034bf2421489baecaaf2890504a9dad7..cd7cad824dff604cba719374be783f6f7dfc4d6f 100644
--- a/src/test/resources/expected-classes/extend/Status.java.txt
+++ b/src/test/resources/expected-classes/extend/Status.java.txt
@@ -1,7 +1,7 @@
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum Status {
 
     CREATED,
diff --git a/src/test/resources/expected-classes/extend/request/AssetResponseProjection.java.txt b/src/test/resources/expected-classes/extend/request/AssetResponseProjection.java.txt
index 76fefb84dbcc016794815b7cb1f7c5cfb42a8124..ec53c6058856f323485bc23f7afa39fb0b2bfd48 100644
--- a/src/test/resources/expected-classes/extend/request/AssetResponseProjection.java.txt
+++ b/src/test/resources/expected-classes/extend/request/AssetResponseProjection.java.txt
@@ -4,10 +4,10 @@ import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLResponseProjection;
 /**
  * Response projection for Asset
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class AssetResponseProjection extends GraphQLResponseProjection {
 
     public AssetResponseProjection() {
diff --git a/src/test/resources/expected-classes/extend/request/EventResponseProjection.java.txt b/src/test/resources/expected-classes/extend/request/EventResponseProjection.java.txt
index fddf7e1e668ec6f248407a8a4693dfd16fb97c1e..93b92325c3178b16a480878570a5801b81646190 100644
--- a/src/test/resources/expected-classes/extend/request/EventResponseProjection.java.txt
+++ b/src/test/resources/expected-classes/extend/request/EventResponseProjection.java.txt
@@ -4,10 +4,10 @@ import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLResponseProjection;
 /**
  * Response projection for Event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventResponseProjection extends GraphQLResponseProjection {
 
     public EventResponseProjection() {
diff --git a/src/test/resources/expected-classes/immutable/Event.java.txt b/src/test/resources/expected-classes/immutable/Event.java.txt
index 5eb7ad7e3a9a311e309c67f16cdfec1fdff20280..f84b9dcf18dd684a80593f5c863e0939b19ea4a6 100644
--- a/src/test/resources/expected-classes/immutable/Event.java.txt
+++ b/src/test/resources/expected-classes/immutable/Event.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.immutable;
 /**
  * An event that describes a thing that happens
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Event implements java.io.Serializable {
 
     private String id;
diff --git a/src/test/resources/expected-classes/interfaces/Bar.java.txt b/src/test/resources/expected-classes/interfaces/Bar.java.txt
index 15dfba9b9ba6bb0c8a7044879b32f15217dd29a6..cfefd7cc414f05aace5414a9eeec9730760c390f 100644
--- a/src/test/resources/expected-classes/interfaces/Bar.java.txt
+++ b/src/test/resources/expected-classes/interfaces/Bar.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface Bar {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/interfaces/Bar1.java.txt b/src/test/resources/expected-classes/interfaces/Bar1.java.txt
index e6b5b2aefe7f03386fb917db10f9e229a34ddc90..3e8a10a3b70bf18b32b049b0adee47d428fd3f53 100644
--- a/src/test/resources/expected-classes/interfaces/Bar1.java.txt
+++ b/src/test/resources/expected-classes/interfaces/Bar1.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Bar1 implements java.io.Serializable, Bar {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/interfaces/Foo.java.txt b/src/test/resources/expected-classes/interfaces/Foo.java.txt
index f0f13317ecfaa922964eee93248ce8ba60c349c3..c57bb59c3d960ada32c021614d311644ef62059a 100644
--- a/src/test/resources/expected-classes/interfaces/Foo.java.txt
+++ b/src/test/resources/expected-classes/interfaces/Foo.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface Foo {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/interfaces/Foo1.java.txt b/src/test/resources/expected-classes/interfaces/Foo1.java.txt
index 8cd63e095e876807e2659e3cc9d5f7c27c7d4c40..ecbfc5379acbd61610bbe5d9db0679b964d9935c 100644
--- a/src/test/resources/expected-classes/interfaces/Foo1.java.txt
+++ b/src/test/resources/expected-classes/interfaces/Foo1.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class Foo1 implements java.io.Serializable, Foo {
 
     @javax.validation.constraints.NotNull
diff --git a/src/test/resources/expected-classes/parent-interfaces/CreateEventMutationResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/CreateEventMutationResolver.java.txt
index 184db3f9e1a42423541c5b40e00163e51759d7ae..635f80ddb90907ab82019881d1b77ab0d0c3e0e1 100644
--- a/src/test/resources/expected-classes/parent-interfaces/CreateEventMutationResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/CreateEventMutationResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.interfaces;
 /**
  * Create a new event.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface CreateEventMutationResolver extends graphql.kickstart.tools.GraphQLMutationResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/parent-interfaces/EventResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/EventResolver.java.txt
index 0880768599635fe1a3f54efc0e1b37c5b83b62dc..39d8c76da6469d22a4f7d40e1690be5977df4693 100644
--- a/src/test/resources/expected-classes/parent-interfaces/EventResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/EventResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.interfaces;
 /**
  * Resolver for Event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventResolver extends graphql.kickstart.tools.GraphQLResolver<EventTO> {
 
     String id(EventTO eventTO) throws Exception;
diff --git a/src/test/resources/expected-classes/parent-interfaces/EventsCreatedSubscriptionResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/EventsCreatedSubscriptionResolver.java.txt
index e7a54fc797c0551254fafe33b0f1be1bd6ac01fb..4468e0b264abe41fbdf5af8aa2c1327751e46a6d 100644
--- a/src/test/resources/expected-classes/parent-interfaces/EventsCreatedSubscriptionResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/EventsCreatedSubscriptionResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.interfaces;
 /**
  * Subscribe to events
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface EventsCreatedSubscriptionResolver extends graphql.kickstart.tools.GraphQLSubscriptionResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/parent-interfaces/MutationResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/MutationResolver.java.txt
index cc06f415eaae7330ae6ad4cf2f153672eb30bc3e..5705955a9a83916fb2117973ef46fb052bd7197b 100644
--- a/src/test/resources/expected-classes/parent-interfaces/MutationResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/MutationResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface MutationResolver extends graphql.kickstart.tools.GraphQLMutationResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/parent-interfaces/QueryResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/QueryResolver.java.txt
index bbedcb981d8c05e7bec37de138db4f58516f4556..1520e3d0f07dffe5c80f52a9a1695929f5e38d84 100644
--- a/src/test/resources/expected-classes/parent-interfaces/QueryResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/QueryResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface QueryResolver extends graphql.kickstart.tools.GraphQLQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/parent-interfaces/SubscriptionResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/SubscriptionResolver.java.txt
index d49e2342f55a9ce9cb22798a865c3c1a3fb83270..81d65465e844431b9787d903b766fcb8b1d72f5c 100644
--- a/src/test/resources/expected-classes/parent-interfaces/SubscriptionResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/SubscriptionResolver.java.txt
@@ -1,10 +1,10 @@
 package com.kobylynskyi.graphql.interfaces;
 
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface SubscriptionResolver extends graphql.kickstart.tools.GraphQLSubscriptionResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/parent-interfaces/VersionQueryResolver.java.txt b/src/test/resources/expected-classes/parent-interfaces/VersionQueryResolver.java.txt
index 607721d71aac02ada18d7f59adcf2038eebc9cbc..8cc1fa64e685071d824db68efa75833f2a1e0282 100644
--- a/src/test/resources/expected-classes/parent-interfaces/VersionQueryResolver.java.txt
+++ b/src/test/resources/expected-classes/parent-interfaces/VersionQueryResolver.java.txt
@@ -4,10 +4,10 @@ package com.kobylynskyi.graphql.interfaces;
 /**
  * Version of the application.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public interface VersionQueryResolver extends graphql.kickstart.tools.GraphQLQueryResolver {
 
     /**
diff --git a/src/test/resources/expected-classes/request/AcceptTopicSuggestionInput.java.txt b/src/test/resources/expected-classes/request/AcceptTopicSuggestionInput.java.txt
index 8b6a4386f8ec382f2352dd61b7fde43667d4e9ba..cb56d84b5252375a1367475fe22985f5690e821a 100644
--- a/src/test/resources/expected-classes/request/AcceptTopicSuggestionInput.java.txt
+++ b/src/test/resources/expected-classes/request/AcceptTopicSuggestionInput.java.txt
@@ -4,10 +4,10 @@ import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequestSerializer;
 import java.util.Objects;
 import java.util.StringJoiner;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class AcceptTopicSuggestionInput implements java.io.Serializable {
 
     private String clientMutationId;
diff --git a/src/test/resources/expected-classes/request/CodeOfConductResponseProjection.java.txt b/src/test/resources/expected-classes/request/CodeOfConductResponseProjection.java.txt
index 0c269bd1253ccf289043f3ec6e9eff6a7e0721cb..634ead2b6dc5740bef48986c067e365157be3afd 100644
--- a/src/test/resources/expected-classes/request/CodeOfConductResponseProjection.java.txt
+++ b/src/test/resources/expected-classes/request/CodeOfConductResponseProjection.java.txt
@@ -7,10 +7,10 @@ import java.util.Objects;
 /**
  * Response projection for CodeOfConduct
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class CodeOfConductResponseProjection extends GraphQLResponseProjection {
 
     public CodeOfConductResponseProjection() {
diff --git a/src/test/resources/expected-classes/request/EventPropertyChildParametrizedInput.java.txt b/src/test/resources/expected-classes/request/EventPropertyChildParametrizedInput.java.txt
index de240d329ea1eb8672e372d800157cc685be5acc..428f0fbc725d25918f19758fb18c80f2bad1bf8c 100644
--- a/src/test/resources/expected-classes/request/EventPropertyChildParametrizedInput.java.txt
+++ b/src/test/resources/expected-classes/request/EventPropertyChildParametrizedInput.java.txt
@@ -8,10 +8,10 @@ import java.util.Objects;
 /**
  * Parametrized input for field child in type EventProperty
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyChildParametrizedInput implements GraphQLParametrizedInput {
 
     private Integer first;
diff --git a/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput.java.txt b/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput.java.txt
index 3d7395a6da4a308ce3119bf48c7deccf3a09630a..ffda14b81911e9ecdc31778c80d2b95ca28da378 100644
--- a/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput.java.txt
+++ b/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput.java.txt
@@ -8,10 +8,10 @@ import java.util.Objects;
 /**
  * Parametrized input for field parent in type EventProperty
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyParentParametrizedInput implements GraphQLParametrizedInput {
 
     private EventStatus withStatus;
diff --git a/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput_withModelSuffix.java.txt b/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput_withModelSuffix.java.txt
index 11bc5f09c0e0971940a38608b12b2e3a4eafe699..9f763b9091932aeab1a247fcbb52b33f15b93b7d 100644
--- a/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput_withModelSuffix.java.txt
+++ b/src/test/resources/expected-classes/request/EventPropertyParentParametrizedInput_withModelSuffix.java.txt
@@ -8,10 +8,10 @@ import java.util.Objects;
 /**
  * Parametrized input for field parent in type EventProperty
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyParentParametrizedInput implements GraphQLParametrizedInput {
 
     private EventStatusTO withStatus;
diff --git a/src/test/resources/expected-classes/request/EventPropertyResponseProjection.java.txt b/src/test/resources/expected-classes/request/EventPropertyResponseProjection.java.txt
index b664792833a38dd673301a4e27776204f23c1ae7..9468ecdf84d1f2a544bc9160f675779c1a258482 100644
--- a/src/test/resources/expected-classes/request/EventPropertyResponseProjection.java.txt
+++ b/src/test/resources/expected-classes/request/EventPropertyResponseProjection.java.txt
@@ -7,10 +7,10 @@ import java.util.Objects;
 /**
  * Response projection for EventProperty
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventPropertyResponseProjection extends GraphQLResponseProjection {
 
     public EventPropertyResponseProjection() {
diff --git a/src/test/resources/expected-classes/request/EventResponseProjection.java.txt b/src/test/resources/expected-classes/request/EventResponseProjection.java.txt
index db9aa45af37289eb5c6600a1e4b8456a9c87f6c1..fe5b10f6a14fc71568698ba74bd2c46c7023a03c 100644
--- a/src/test/resources/expected-classes/request/EventResponseProjection.java.txt
+++ b/src/test/resources/expected-classes/request/EventResponseProjection.java.txt
@@ -7,10 +7,10 @@ import java.util.Objects;
 /**
  * Response projection for Event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventResponseProjection extends GraphQLResponseProjection {
 
     public EventResponseProjection() {
diff --git a/src/test/resources/expected-classes/request/EventStatusTO.java.txt b/src/test/resources/expected-classes/request/EventStatusTO.java.txt
index cc1cce56ee2babe81edd89a71b7cd3b2a9f24452..9ec13157d9c956beac620c87961e65646d52ea29 100644
--- a/src/test/resources/expected-classes/request/EventStatusTO.java.txt
+++ b/src/test/resources/expected-classes/request/EventStatusTO.java.txt
@@ -3,10 +3,10 @@ package com.github.graphql;
 /**
  * Possible statuses of the event
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public enum EventStatusTO {
 
     /**
diff --git a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest.java.txt b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest.java.txt
index 7f7ca5dad5aa7ea5b23285cd8f9c9cf1795c7278..ce7c43be24edda878abfafd140010df80a739778 100644
--- a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest.java.txt
+++ b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest.java.txt
@@ -9,10 +9,10 @@ import java.util.Objects;
 /**
  * List of events of a specified category.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByCategoryAndStatusQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withApiImport.java.txt b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withApiImport.java.txt
index 7f7ca5dad5aa7ea5b23285cd8f9c9cf1795c7278..ce7c43be24edda878abfafd140010df80a739778 100644
--- a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withApiImport.java.txt
+++ b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withApiImport.java.txt
@@ -9,10 +9,10 @@ import java.util.Objects;
 /**
  * List of events of a specified category.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByCategoryAndStatusQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withModelSuffix.java.txt b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withModelSuffix.java.txt
index b5ac088de2b93be8f40849e46359241836e72e87..c4f69c7ce48fdb9b06a668810e32d94b1136af84 100644
--- a/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withModelSuffix.java.txt
+++ b/src/test/resources/expected-classes/request/EventsByCategoryAndStatusQueryRequest_withModelSuffix.java.txt
@@ -9,10 +9,10 @@ import java.util.Objects;
 /**
  * List of events of a specified category.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByCategoryAndStatusQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/EventsByIdsQueryRequest.java.txt b/src/test/resources/expected-classes/request/EventsByIdsQueryRequest.java.txt
index c4824f723f66ab4c898b7224caecb8642b075a24..8f8e836d84129052e4e2282d0ee618b457ff1950 100644
--- a/src/test/resources/expected-classes/request/EventsByIdsQueryRequest.java.txt
+++ b/src/test/resources/expected-classes/request/EventsByIdsQueryRequest.java.txt
@@ -9,10 +9,10 @@ import java.util.Objects;
 /**
  * Events by IDs.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByIdsQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/ProductsByCategoryIdAndStatusQueryRequest.java.txt b/src/test/resources/expected-classes/request/ProductsByCategoryIdAndStatusQueryRequest.java.txt
index b7f58e698d671624c9237e2d8aa9775c9a97fdd3..b094c7595e9c60fc78c599bab599e68620234e5e 100644
--- a/src/test/resources/expected-classes/request/ProductsByCategoryIdAndStatusQueryRequest.java.txt
+++ b/src/test/resources/expected-classes/request/ProductsByCategoryIdAndStatusQueryRequest.java.txt
@@ -6,10 +6,10 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class ProductsByCategoryIdAndStatusQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/ProductsByIdsQueryRequest.java.txt b/src/test/resources/expected-classes/request/ProductsByIdsQueryRequest.java.txt
index 286a73d5fc4ce7c482edf9f489b710095e51e450..6a89ba72c713d95ab65cb461764394fb49260da3 100644
--- a/src/test/resources/expected-classes/request/ProductsByIdsQueryRequest.java.txt
+++ b/src/test/resources/expected-classes/request/ProductsByIdsQueryRequest.java.txt
@@ -6,10 +6,10 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class ProductsByIdsQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/request/UpdateRepositoryMutationRequest.java.txt b/src/test/resources/expected-classes/request/UpdateRepositoryMutationRequest.java.txt
index 9f70da95644be35b48702046218cb271e91d86f6..749a400c66784a14ee39f4b20533780d2f693074 100644
--- a/src/test/resources/expected-classes/request/UpdateRepositoryMutationRequest.java.txt
+++ b/src/test/resources/expected-classes/request/UpdateRepositoryMutationRequest.java.txt
@@ -6,10 +6,10 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class UpdateRepositoryMutationRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.MUTATION;
diff --git a/src/test/resources/expected-classes/request/VersionQueryRequest.java.txt b/src/test/resources/expected-classes/request/VersionQueryRequest.java.txt
index db3f13a5eb55aa9df494e2ee5107f9ef633033e2..a89237a3fe0c84ece937dd4ca7ea11f172be85d9 100644
--- a/src/test/resources/expected-classes/request/VersionQueryRequest.java.txt
+++ b/src/test/resources/expected-classes/request/VersionQueryRequest.java.txt
@@ -9,10 +9,10 @@ import java.util.Objects;
 /**
  * Version of the application.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class VersionQueryRequest implements GraphQLOperationRequest {
 
     private static final GraphQLOperation OPERATION_TYPE = GraphQLOperation.QUERY;
diff --git a/src/test/resources/expected-classes/response/EventsByCategoryAndStatusQueryResponse.java.txt b/src/test/resources/expected-classes/response/EventsByCategoryAndStatusQueryResponse.java.txt
index 429e46d33fbed21ff7004bc7f45c1dbfbc31cf06..9e44d5f87ed8f370a4a1dabbaf179b0a4eeeebad 100644
--- a/src/test/resources/expected-classes/response/EventsByCategoryAndStatusQueryResponse.java.txt
+++ b/src/test/resources/expected-classes/response/EventsByCategoryAndStatusQueryResponse.java.txt
@@ -6,10 +6,10 @@ import java.util.Map;
 /**
  * List of events of a specified category.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByCategoryAndStatusQueryResponse extends GraphQLResult<Map<String, java.util.List<EventTO>>> {
 
     private static final String OPERATION_NAME = "eventsByCategoryAndStatus";
diff --git a/src/test/resources/expected-classes/response/EventsByIdsQueryResponse.java.txt b/src/test/resources/expected-classes/response/EventsByIdsQueryResponse.java.txt
index bd8b162a6d3e76f977953f0cf3646613dfd91812..8a129d42d68d2ffd2abd1bad021087913307d893 100644
--- a/src/test/resources/expected-classes/response/EventsByIdsQueryResponse.java.txt
+++ b/src/test/resources/expected-classes/response/EventsByIdsQueryResponse.java.txt
@@ -6,10 +6,10 @@ import java.util.Map;
 /**
  * Events by IDs.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class EventsByIdsQueryResponse extends GraphQLResult<Map<String, java.util.List<EventTO>>> {
 
     private static final String OPERATION_NAME = "eventsByIds";
diff --git a/src/test/resources/expected-classes/response/VersionQueryResponse.java.txt b/src/test/resources/expected-classes/response/VersionQueryResponse.java.txt
index 6f8a39f41ded8997f5f1654e3221746d95a75d17..3a0c1274187a381a8c89d904b62b5b93bdd8acc9 100644
--- a/src/test/resources/expected-classes/response/VersionQueryResponse.java.txt
+++ b/src/test/resources/expected-classes/response/VersionQueryResponse.java.txt
@@ -6,10 +6,10 @@ import java.util.Map;
 /**
  * Version of the application.
  */
-@javax.annotation.Generated{
+@javax.annotation.Generated(
     value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen",
     date = "2020-12-31T23:59:59-0500"
-}
+)
 public class VersionQueryResponse extends GraphQLResult<Map<String, String>> {
 
     private static final String OPERATION_NAME = "version";