Minor refactor and code-style fixes

kobylynskyi · kobylynskyi · commit 7eaf0f5bc6ef · 2021-09-05T13:22:01.000-05:00
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/generators/FilesGeneratorsFactory.java b/src/main/java/com/kobylynskyi/graphql/codegen/generators/FilesGeneratorsFactory.java
@@ -22,6 +22,9 @@
  */
 public class FilesGeneratorsFactory {
 
+    private FilesGeneratorsFactory() {
+    }
+
     /**
      * Factory method for building files generators
      *
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/mapper/AnnotationsMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/mapper/AnnotationsMapper.java
@@ -87,9 +87,10 @@ public List<String> getAnnotations(MappingContext mappingContext, String graphQL
             }
         }
 
-        // 2. Add custom annotations from the configuration
-        List<String> typeAnnotations = getTypeAnnotations(mappingContext, graphQLTypeName, name, parentTypeName);
-        annotations.addAll(typeAnnotations);
+        // 2.1. Add custom annotations from the configuration for: GraphQLObjectName.fieldName
+        annotations.addAll(getTypeAnnotationsForKey(mappingContext, parentTypeName + "." + name));
+        // 2.2. Add custom annotations from the configuration for: GraphQLTypeName
+        annotations.addAll(getTypeAnnotationsForKey(mappingContext, graphQLTypeName));
 
         // 3. Add Jackson-related annotations
         annotations.addAll(getJacksonTypeIdAnnotations(mappingContext, def));
@@ -110,40 +111,22 @@ public List<String> getAnnotations(MappingContext mappingContext, String graphQL
         return annotations;
     }
 
-    private List<String> getTypeAnnotations(MappingContext mappingContext,
-                                            String graphQLType,
-                                            String fieldName,
-                                            String parentTypeName) {
+    private static List<String> getTypeAnnotationsForKey(MappingContext mappingContext,
+                                                         String key) {
+        List<String> result = new ArrayList<>();
         Map<String, List<String>> customAnnotationsMapping = mappingContext.getCustomAnnotationsMapping();
-
-        List<String> typeAnnotations = new ArrayList<>();
-
-        if (parentTypeName != null) {
-            String typeNameKey = parentTypeName + "." + fieldName;
-            List<String> fullTypeAnnotations = customAnnotationsMapping.get(typeNameKey);
-            if (!Utils.isEmpty(fullTypeAnnotations)) {
-                typeAnnotations.addAll(fullTypeAnnotations);
-            } else {
-                // try finding if there's a RegEx present for this type
-                for (Map.Entry<String, List<String>> entry : customAnnotationsMapping.entrySet()) {
-                    if (typeNameKey.matches(entry.getKey()) && !Utils.isEmpty(entry.getValue())) {
-                        typeAnnotations.addAll(entry.getValue());
-                    }
-                }
-            }
-        }
-        List<String> specificTypeAnnotations = customAnnotationsMapping.get(graphQLType);
-        if (!Utils.isEmpty(specificTypeAnnotations)) {
-            typeAnnotations.addAll(specificTypeAnnotations);
+        List<String> typeAnnotations = customAnnotationsMapping.get(key);
+        if (!Utils.isEmpty(typeAnnotations)) {
+            result.addAll(typeAnnotations);
         } else {
             // try finding if there's a RegEx present for this type
             for (Map.Entry<String, List<String>> entry : customAnnotationsMapping.entrySet()) {
-                if (graphQLType.matches(entry.getKey()) && !Utils.isEmpty(entry.getValue())) {
-                    typeAnnotations.addAll(entry.getValue());
+                if (key.matches(entry.getKey()) && !Utils.isEmpty(entry.getValue())) {
+                    result.addAll(entry.getValue());
                 }
             }
         }
-        return typeAnnotations;
+        return result;
     }
 
     private String getModelValidationAnnotation(MappingContext mappingContext, String graphQLTypeName) {
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigDefaultValuesInitializer.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigDefaultValuesInitializer.java
@@ -5,6 +5,9 @@
  */
 public class MappingConfigDefaultValuesInitializer {
 
+    private MappingConfigDefaultValuesInitializer() {
+    }
+
     /**
      * Initializes mapping config with default values
      *
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigValidator.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfigValidator.java
@@ -7,6 +7,9 @@
  */
 public class MappingConfigValidator {
 
+    private MappingConfigValidator() {
+    }
+
     /**
      * Validator of the mapping config
      *
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java
@@ -47,10 +47,6 @@ private MappingContext(File outputDirectory,
         this.dataModelMapperFactory = dataModelMapperFactory;
     }
 
-    public static MappingContext.Builder builder() {
-        return new MappingContext.Builder();
-    }
-
     @Override
     public GeneratedLanguage getGeneratedLanguage() {
         return config.getGeneratedLanguage();
@@ -378,6 +374,10 @@ private List<ParameterDefinition> getFields(List<ExtendedFieldDefinition> fieldD
                 .mapFields(this, fieldDefinitions, parentDefinition);
     }
 
+    public static MappingContext.Builder builder() {
+        return new MappingContext.Builder();
+    }
+
     /**
      * Builder of the mapping context
      */
@@ -389,7 +389,7 @@ public static class Builder {
         private GeneratedInformation generatedInformation;
         private DataModelMapperFactory dataModelMapperFactory;
 
-        public Builder() {
+        private Builder() {
         }
 
         public Builder setOutputDirectory(File outputDirectory) {
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/builders/DeprecatedDefinitionBuilder.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/builders/DeprecatedDefinitionBuilder.java
@@ -19,6 +19,9 @@ public class DeprecatedDefinitionBuilder {
     private static final String JAVA_ANNOTATION = "Deprecated";
     private static final String KOTLIN_ANNOTATION = "Deprecated";
 
+    private DeprecatedDefinitionBuilder() {
+    }
+
     /**
      * Get a definition of @deprecated based on a given directive
      *
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/builders/JavaDocBuilder.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/builders/JavaDocBuilder.java
@@ -18,6 +18,9 @@
  */
 public class JavaDocBuilder {
 
+    private JavaDocBuilder() {
+    }
+
     /**
      * Get java doc from description of the definition and it's extensions.
      * If no description is present in the definition and extension then return from comments
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaAnnotationsMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaAnnotationsMapper.java
@@ -6,8 +6,9 @@
 import com.kobylynskyi.graphql.codegen.model.MappingContext;
 import com.kobylynskyi.graphql.codegen.utils.Utils;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Mapper class for converting GraphQL types to Scala types
@@ -33,27 +34,28 @@ public String getJacksonResolverTypeIdAnnotation(String modelPackageName) {
 
     @Override
     public List<String> getAdditionalAnnotations(MappingContext mappingContext, String typeName) {
-        List<String> defaults = new ArrayList<>();
-        String typeNameWithPrefixAndSuffix = (mappingContext.getModelNamePrefix() == null ? ""
-                : mappingContext.getModelNamePrefix())
-                + typeName
-                + (mappingContext.getModelNameSuffix() == null ? "" : mappingContext.getModelNameSuffix());
-        boolean exists = null != mappingContext.getEnumImportItSelfInScala()
-                && mappingContext.getEnumImportItSelfInScala()
-                .contains(typeNameWithPrefixAndSuffix);
-        // todo use switch
+        StringBuilder typeNameWithPrefixAndSuffixBuilder = new StringBuilder();
+        if (mappingContext.getModelNamePrefix() != null) {
+            typeNameWithPrefixAndSuffixBuilder.append(mappingContext.getModelNamePrefix());
+        }
+        typeNameWithPrefixAndSuffixBuilder.append(typeName);
+        if (mappingContext.getModelNameSuffix() != null) {
+            typeNameWithPrefixAndSuffixBuilder.append(mappingContext.getModelNameSuffix());
+        }
+        Set<String> enumImportItSelf = mappingContext.getEnumImportItSelfInScala();
+        if (enumImportItSelf == null ||
+                !enumImportItSelf.contains(typeNameWithPrefixAndSuffixBuilder.toString())) {
+            return Collections.emptyList();
+        }
         // Inspired by the pr https://github.com/kobylynskyi/graphql-java-codegen/pull/637/files
-        if (exists) {
-            String modelPackageName = DataModelMapper.getModelPackageName(mappingContext);
-            if (modelPackageName == null) {
-                modelPackageName = "";
-            } else if (Utils.isNotBlank(modelPackageName)) {
-                modelPackageName += ".";
-            }
-            defaults.add("com.fasterxml.jackson.module.scala.JsonScalaEnumeration(classOf[" + modelPackageName
-                    + typeNameWithPrefixAndSuffix + "TypeRefer])");
+        String modelPackageName = DataModelMapper.getModelPackageName(mappingContext);
+        if (Utils.isNotBlank(modelPackageName)) {
+            typeNameWithPrefixAndSuffixBuilder.insert(0, modelPackageName + ".");
         }
-        return defaults;
+        String annotation = String.format(
+                "com.fasterxml.jackson.module.scala.JsonScalaEnumeration(classOf[%sTypeRefer])",
+                typeNameWithPrefixAndSuffixBuilder);
+        return Collections.singletonList(annotation);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@`
`22`	`22`	`*/`
`23`	`23`	`public class FilesGeneratorsFactory {`
`24`	`24`
	`25`	`+ private FilesGeneratorsFactory() {`
	`26`	`+ }`
	`27`	`+`
`25`	`28`	`/**`
`26`	`29`	`* Factory method for building files generators`
`27`	`30`	`*`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`*/`
`6`	`6`	`public class MappingConfigDefaultValuesInitializer {`
`7`	`7`
	`8`	`+ private MappingConfigDefaultValuesInitializer() {`
	`9`	`+ }`
	`10`	`+`
`8`	`11`	`/**`
`9`	`12`	`* Initializes mapping config with default values`
`10`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`*/`
`8`	`8`	`public class MappingConfigValidator {`
`9`	`9`
	`10`	`+ private MappingConfigValidator() {`
	`11`	`+ }`
	`12`	`+`
`10`	`13`	`/**`
`11`	`14`	`* Validator of the mapping config`
`12`	`15`	`*`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ public class DeprecatedDefinitionBuilder {`
`19`	`19`	`private static final String JAVA_ANNOTATION = "Deprecated";`
`20`	`20`	`private static final String KOTLIN_ANNOTATION = "Deprecated";`
`21`	`21`
	`22`	`+ private DeprecatedDefinitionBuilder() {`
	`23`	`+ }`
	`24`	`+`
`22`	`25`	`/**`
`23`	`26`	`* Get a definition of @deprecated based on a given directive`
`24`	`27`	`*`