Address PR comments

Author: velo

plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java

@@ -744,7 +744,10 @@ private static Map<String, String> convertToMap(Properties properties) {
 
     @Override
     public Map<FreeMarkerTemplateType, String> getCustomTemplates() {
-      return customTemplates;
+        if (customTemplates == null) {
+            return new HashMap<>();
+        }
+        return customTemplates;
     }
 
 }

src/main/java/com/kobylynskyi/graphql/codegen/generators/FreeMarkerTemplateFilesCreator.java

@@ -49,11 +49,11 @@ public static File create(MappingContext mappingContext,
 
         try (FileWriter fileWriter = new FileWriter(javaSourceFile)) {
             Template template;
-            if (mappingContext.getCustomTemplates().containsKey(templateType)) {
-              template = FreeMarkerTemplatesRegistry.getCustomTemplates(mappingContext.getCustomTemplates().get(templateType));
+            String templatePath = mappingContext.getCustomTemplates().get(templateType);
+            if (templatePath != null) {
+			    template = FreeMarkerTemplatesRegistry.getCustomTemplates(templatePath);
             } else {
-              template =
-                  FreeMarkerTemplatesRegistry.getTemplateWithLang(language, templateType);
+                template = FreeMarkerTemplatesRegistry.getTemplateWithLang(language, templateType);
             }
             template.process(dataModel, fileWriter);
         } catch (Exception e) {

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

@@ -1,7 +1,6 @@
 package com.kobylynskyi.graphql.codegen.model;
 
 import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType;
-import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -256,7 +255,7 @@ public void setCustomTypesMapping(Map<String, String> customTypesMapping) {
      */
     public void putCustomTemplatesIfAbsent(FreeMarkerTemplateType from, String to) {
       if (customTemplates == null) {
-        customTemplates = new HashMap<>();
+          customTemplates = new HashMap<>();
       }
       customTemplates.computeIfAbsent(from, k -> to);
     }

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

@@ -1,6 +1,5 @@
 package com.kobylynskyi.graphql.codegen;
 
-import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType;
 import com.kobylynskyi.graphql.codegen.java.JavaGraphQLCodegen;
 import com.kobylynskyi.graphql.codegen.model.MappingConfig;
 import com.kobylynskyi.graphql.codegen.utils.Utils;
@@ -328,14 +327,4 @@ private void generate(String path) throws IOException {
                 TestUtils.getStaticGeneratedInfo(mappingConfig)).generate();
     }
 
-    @Test
-    void generate_CustomTemplates_Type() throws Exception {
-        mappingConfig.putCustomTemplatesIfAbsent(FreeMarkerTemplateType.TYPE, "/template/record_type.ftl");
-
-        generate("src/test/resources/schemas/test.graphqls");
-
-        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
-        assertFileContainsElements(files, "Event.java",
-                "public record Event (");
-    }
 }

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

@@ -0,0 +1,54 @@
+package com.kobylynskyi.graphql.codegen;
+
+import com.kobylynskyi.graphql.codegen.generators.FreeMarkerTemplateType;
+import com.kobylynskyi.graphql.codegen.java.JavaGraphQLCodegen;
+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.io.IOException;
+import java.util.Objects;
+
+import static com.kobylynskyi.graphql.codegen.TestUtils.assertFileContainsElements;
+import static java.util.Collections.singletonList;
+
+class GraphQLCodegenCustomTemplatesTest {
+
+    private final File outputBuildDir = new File("build/generated");
+    private final File outputJavaClassesDir = new File("build/generated/com/kobylynskyi/graphql/test1");
+
+    private MappingConfig mappingConfig;
+
+    @BeforeEach
+    void init() {
+        mappingConfig = new MappingConfig();
+        mappingConfig.setPackageName("com.kobylynskyi.graphql.test1");
+        mappingConfig.setGenerateClient(true);
+    }
+
+    @AfterEach
+    void cleanup() {
+        Utils.deleteDir(outputBuildDir);
+    }
+
+    @Test
+    void generate_CustomTemplates_Type() throws Exception {
+        mappingConfig.putCustomTemplatesIfAbsent(FreeMarkerTemplateType.TYPE, "/template/record_type.ftl");
+
+        generate("src/test/resources/schemas/test.graphqls");
+
+        File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles());
+        assertFileContainsElements(files, "Event.java",
+                "public record Event (");
+    }
+
+    private void generate(String path) throws IOException {
+        new JavaGraphQLCodegen(singletonList(path),
+                outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo(mappingConfig))
+                .generate();
+    }
+
+}