Improve code coverage and use Utils class for blank-check string

Author: kobylynskyi

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

@@ -4,6 +4,7 @@
 
 import com.kobylynskyi.graphql.codegen.model.MappingConfig;
 import com.kobylynskyi.graphql.codegen.model.ParameterDefinition;
+import com.kobylynskyi.graphql.codegen.utils.Utils;
 import graphql.language.*;
 
 import java.util.ArrayList;
@@ -141,7 +142,7 @@ private static List<String> getAnnotations(MappingConfig mappingConfig, String g
         List<String> annotations = new ArrayList<>();
         if (mandatory) {
             String modelValidationAnnotation = mappingConfig.getModelValidationAnnotation();
-            if (modelValidationAnnotation != null && !modelValidationAnnotation.trim().isEmpty()) {
+            if (!Utils.isBlank(modelValidationAnnotation)) {
                 annotations.add(modelValidationAnnotation);
             }
         }
@@ -160,8 +161,7 @@ private static String wrapIntoJavaCollection(String type) {
 
     static String wrapIntoSubscriptionIfRequired(MappingConfig mappingConfig, String javaTypeName, String parentTypeName) {
         if (parentTypeName.equalsIgnoreCase(Operation.SUBSCRIPTION.name())
-                && mappingConfig.getSubscriptionReturnType() != null
-                && !mappingConfig.getSubscriptionReturnType().trim().isEmpty()) {
+                && !Utils.isBlank(mappingConfig.getSubscriptionReturnType())) {
             return String.format("%s<%s>", mappingConfig.getSubscriptionReturnType(), javaTypeName);
         }
         return javaTypeName;

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

@@ -13,7 +13,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 
@@ -45,7 +44,7 @@ void init() {
 
     @AfterEach
     void cleanup() throws IOException {
-        //Utils.deleteDir(new File("build/generated"));
+        Utils.deleteDir(new File("build/generated"));
     }
 
     @Test
@@ -142,6 +141,24 @@ void generate_CustomAnnotationMappings() throws Exception {
                         + System.lineSeparator() + "    private org.joda.time.DateTime createdDateTime;"));
     }
 
+    @Test
+    void generate_CustomAnnotationMappings_Type() throws Exception {
+        mappingConfig.setCustomTypesMapping(
+                new HashMap<>(Collections.singletonMap("DateTime", "org.joda.time.DateTime")));
+
+        mappingConfig.setCustomAnnotationsMapping(new HashMap<>(Collections.singletonMap("DateTime",
+                "com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.DateTimeScalarDeserializer.class)")));
+
+        generator.generate();
+
+        File eventFile = Arrays.stream(Objects.requireNonNull(outputJavaClassesDir.listFiles()))
+                .filter(file -> file.getName().equalsIgnoreCase("Event.java")).findFirst()
+                .orElseThrow(FileNotFoundException::new);
+        assertThat(Utils.getFileContent(eventFile.getPath()), StringContains.containsString(
+                "@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.DateTimeScalarDeserializer.class)"
+                        + System.lineSeparator() + "    private org.joda.time.DateTime createdDateTime;"));
+    }
+
     @Test
     void generate_CustomAnnotationMappings_FieldType() throws Exception {
         mappingConfig