Support RegEx in customAnnotationsMapping #783

Also refactor mappers

Author: kobylynskyi

src/main/java/com/kobylynskyi/graphql/codegen/java/JavaAnnotationsMapper.java

@@ -0,0 +1,41 @@
+package com.kobylynskyi.graphql.codegen.java;
+
+import com.kobylynskyi.graphql.codegen.mapper.AnnotationsMapper;
+import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
+import com.kobylynskyi.graphql.codegen.model.MappingContext;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Mapper class for converting GraphQL types to Java types
+ */
+public class JavaAnnotationsMapper extends AnnotationsMapper {
+
+    private final ValueMapper valueMapper;
+
+    public JavaAnnotationsMapper(ValueMapper valueMapper) {
+        this.valueMapper = valueMapper;
+    }
+
+    @Override
+    public boolean addModelValidationAnnotationForType(String type) {
+        return !JavaGraphQLTypeMapper.isJavaPrimitive(type);
+    }
+
+    @Override
+    public ValueMapper getValueMapper() {
+        return valueMapper;
+    }
+
+    @Override
+    public String getJacksonResolverTypeIdAnnotation(String modelPackageName) {
+        return "com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName +
+                "GraphqlJacksonTypeIdResolver.class)";
+    }
+
+    @Override
+    protected List<String> getAdditionalAnnotations(MappingContext mappingContext, String typeName) {
+        return Collections.emptyList();
+    }
+}

src/main/java/com/kobylynskyi/graphql/codegen/java/JavaDataModelMapper.java

@@ -11,7 +11,7 @@
 /**
  * Data model mapper for JAVA generated classes
  */
-public class JavaDataModelMapper implements DataModelMapper {
+public class JavaDataModelMapper extends DataModelMapper {
 
     private static final Set<String> JAVA_RESTRICTED_KEYWORDS = new HashSet<>(Arrays.asList(
             "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue",

src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLTypeMapper.java

@@ -2,7 +2,6 @@
 
 import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper;
 import com.kobylynskyi.graphql.codegen.mapper.GraphQLTypeMapper;
-import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
 import com.kobylynskyi.graphql.codegen.model.MappingContext;
 import com.kobylynskyi.graphql.codegen.model.NamedDefinition;
 import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLOperation;
@@ -17,19 +16,13 @@
 /**
  * Mapper class for converting GraphQL types to Java types
  */
-public class JavaGraphQLTypeMapper implements GraphQLTypeMapper {
+public class JavaGraphQLTypeMapper extends GraphQLTypeMapper {
 
     public static final String JAVA_UTIL_LIST = "java.util.List";
     private static final String JAVA_UTIL_OPTIONAL = "java.util.Optional";
     private static final Set<String> JAVA_PRIMITIVE_TYPES = new HashSet<>(asList(
             "byte", "short", "int", "long", "float", "double", "char", "boolean"));
 
-    private final ValueMapper valueMapper;
-
-    public JavaGraphQLTypeMapper(ValueMapper valueMapper) {
-        this.valueMapper = valueMapper;
-    }
-
     public static boolean isJavaPrimitive(String possiblyPrimitiveType) {
         return JAVA_PRIMITIVE_TYPES.contains(possiblyPrimitiveType);
     }
@@ -86,11 +79,6 @@ public boolean isPrimitive(String possiblyPrimitiveType) {
         return isJavaPrimitive(possiblyPrimitiveType);
     }
 
-    @Override
-    public boolean addModelValidationAnnotationForType(String type) {
-        return !isPrimitive(type);
-    }
-
     @Override
     public NamedDefinition getLanguageType(MappingContext mappingContext, String graphQLType, String name,
                                            String parentTypeName, boolean mandatory, boolean collection) {
@@ -117,14 +105,4 @@ public NamedDefinition getLanguageType(MappingContext mappingContext, String gra
                 mandatory, primitiveCanBeUsed, serializeUsingObjectMapper);
     }
 
-    @Override
-    public ValueMapper getValueMapper() {
-        return valueMapper;
-    }
-
-    @Override
-    public String getJacksonResolverTypeIdAnnotation(String modelPackageName) {
-        return "com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName +
-                "GraphqlJacksonTypeIdResolver.class)";
-    }
 }

src/main/java/com/kobylynskyi/graphql/codegen/java/JavaMapperFactoryImpl.java

@@ -1,29 +1,46 @@
 package com.kobylynskyi.graphql.codegen.java;
 
+import com.kobylynskyi.graphql.codegen.mapper.AnnotationsMapper;
 import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper;
 import com.kobylynskyi.graphql.codegen.mapper.GraphQLTypeMapper;
 import com.kobylynskyi.graphql.codegen.mapper.MapperFactory;
-import com.kobylynskyi.graphql.codegen.mapper.ValueFormatter;
 import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
 
 /**
  * A factory of various mappers for Java language
  */
 public class JavaMapperFactoryImpl implements MapperFactory {
 
+    private final DataModelMapper dataModelMapper;
+    private final ValueMapper valueMapper;
+    private final GraphQLTypeMapper graphQLTypeMapper;
+    private final AnnotationsMapper annotationsMapper;
+
+    public JavaMapperFactoryImpl() {
+        dataModelMapper = new JavaDataModelMapper();
+        valueMapper = new ValueMapper(new JavaValueFormatter(), dataModelMapper);
+        graphQLTypeMapper = new JavaGraphQLTypeMapper();
+        annotationsMapper = new JavaAnnotationsMapper(valueMapper);
+    }
+
+    @Override
+    public DataModelMapper getDataModelMapper() {
+        return dataModelMapper;
+    }
+
     @Override
-    public DataModelMapper createDataModelMapper() {
-        return new JavaDataModelMapper();
+    public GraphQLTypeMapper getGraphQLTypeMapper() {
+        return graphQLTypeMapper;
     }
 
     @Override
-    public GraphQLTypeMapper createGraphQLTypeMapper(ValueMapper valueMapper) {
-        return new JavaGraphQLTypeMapper(valueMapper);
+    public AnnotationsMapper getAnnotationsMapper() {
+        return annotationsMapper;
     }
 
     @Override
-    public ValueFormatter createValueFormatter() {
-        return new JavaValueFormatter();
+    public ValueMapper getValueMapper() {
+        return valueMapper;
     }
 
 }

src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinAnnotationsMapper.java

@@ -0,0 +1,44 @@
+package com.kobylynskyi.graphql.codegen.kotlin;
+
+import com.kobylynskyi.graphql.codegen.mapper.AnnotationsMapper;
+import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
+import com.kobylynskyi.graphql.codegen.model.MappingContext;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Mapper class for converting GraphQL types to Kotlin types
+ *
+ * @author 梦境迷离
+ * @since 2020/12/09
+ */
+public class KotlinAnnotationsMapper extends AnnotationsMapper {
+
+    private final ValueMapper valueMapper;
+
+    public KotlinAnnotationsMapper(ValueMapper valueMapper) {
+        this.valueMapper = valueMapper;
+    }
+
+    @Override
+    public boolean addModelValidationAnnotationForType(String possiblyPrimitiveType) {
+        return false;
+    }
+
+    @Override
+    public String getJacksonResolverTypeIdAnnotation(String modelPackageName) {
+        return "com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName +
+                "GraphqlJacksonTypeIdResolver::class)";
+    }
+
+    @Override
+    protected List<String> getAdditionalAnnotations(MappingContext mappingContext, String typeName) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public ValueMapper getValueMapper() {
+        return valueMapper;
+    }
+}

src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinDataModelMapper.java

@@ -2,7 +2,6 @@
 
 import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper;
 import com.kobylynskyi.graphql.codegen.model.MappingContext;
-import com.kobylynskyi.graphql.codegen.model.definitions.ExtendedDefinition;
 import com.kobylynskyi.graphql.codegen.utils.Utils;
 
 import java.util.Arrays;
@@ -17,7 +16,7 @@
  * @author 梦境迷离
  * @since 2020/12/09
  */
-public class KotlinDataModelMapper implements DataModelMapper {
+public class KotlinDataModelMapper extends DataModelMapper {
 
     private static final String RESTRICTED_KEYWORDS_WRAP_WITH = "`";
     private static final Set<String> KOTLIN_RESTRICTED_KEYWORDS = new HashSet<>(
@@ -48,10 +47,4 @@ public String capitalizeMethodNameIfRestricted(MappingContext mappingContext, St
         return methodName;
     }
 
-    @Override
-    public String getModelClassNameWithPrefixAndSuffix(MappingContext mappingContext,
-                                                       ExtendedDefinition<?, ?> extendedDefinition) {
-        return DataModelMapper.getModelClassNameWithPrefixAndSuffix(mappingContext, extendedDefinition.getName());
-    }
-
 }

src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinGraphQLTypeMapper.java

@@ -2,7 +2,6 @@
 
 import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper;
 import com.kobylynskyi.graphql.codegen.mapper.GraphQLTypeMapper;
-import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
 import com.kobylynskyi.graphql.codegen.model.MappingContext;
 import com.kobylynskyi.graphql.codegen.model.NamedDefinition;
 import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLOperation;
@@ -19,20 +18,14 @@
  * @author 梦境迷离
  * @since 2020/12/09
  */
-public class KotlinGraphQLTypeMapper implements GraphQLTypeMapper {
+public class KotlinGraphQLTypeMapper extends GraphQLTypeMapper {
 
     private static final String KOTLIN_UTIL_LIST = "List";
     private static final String KOTLIN_UTIL_NULLABLE = "?";
     // Char Boolean are not primitive type, but non null equivalent jvm primitive types.
     private static final Set<String> KOTLIN_PRIMITIVE_TYPES = new HashSet<>(
             asList("Byte", "Short", "Int", "Long", "Float", "Double", "Char", "Boolean"));
 
-    private final ValueMapper valueMapper;
-
-    public KotlinGraphQLTypeMapper(ValueMapper valueMapper) {
-        this.valueMapper = valueMapper;
-    }
-
     public static boolean isKotlinPrimitive(String scalaType) {
         return KOTLIN_PRIMITIVE_TYPES.contains(scalaType);
     }
@@ -43,6 +36,7 @@ public static boolean isKotlinPrimitive(String scalaType) {
      * @param kotlinType type get from Type template
      * @return default value
      */
+    @SuppressWarnings("unused")
     public static String defaultValueKotlinPrimitive(String kotlinType) {
         switch (kotlinType) {
             case "Long":
@@ -111,11 +105,6 @@ public boolean isPrimitive(String kotlinType) {
         return isKotlinPrimitive(kotlinType);
     }
 
-    @Override
-    public boolean addModelValidationAnnotationForType(String possiblyPrimitiveType) {
-        return false;
-    }
-
     @Override
     public String getTypeConsideringPrimitive(MappingContext mappingContext,
                                               NamedDefinition namedDefinition,
@@ -159,11 +148,6 @@ public String getTypeConsideringPrimitive(MappingContext mappingContext,
         return computedTypeName;
     }
 
-    @Override
-    public ValueMapper getValueMapper() {
-        return valueMapper;
-    }
-
     @Override
     public String getResponseReturnType(MappingContext mappingContext, NamedDefinition namedDefinition,
                                         String computedTypeName) {
@@ -173,10 +157,4 @@ public String getResponseReturnType(MappingContext mappingContext, NamedDefiniti
         // Should fix it when generate response class.
         return getTypeConsideringPrimitive(mappingContext, namedDefinition, computedTypeName);
     }
-
-    @Override
-    public String getJacksonResolverTypeIdAnnotation(String modelPackageName) {
-        return "com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver(" + modelPackageName +
-                "GraphqlJacksonTypeIdResolver::class)";
-    }
 }

src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinMapperFactoryImpl.java

@@ -1,9 +1,9 @@
 package com.kobylynskyi.graphql.codegen.kotlin;
 
+import com.kobylynskyi.graphql.codegen.mapper.AnnotationsMapper;
 import com.kobylynskyi.graphql.codegen.mapper.DataModelMapper;
 import com.kobylynskyi.graphql.codegen.mapper.GraphQLTypeMapper;
 import com.kobylynskyi.graphql.codegen.mapper.MapperFactory;
-import com.kobylynskyi.graphql.codegen.mapper.ValueFormatter;
 import com.kobylynskyi.graphql.codegen.mapper.ValueMapper;
 
 /**
@@ -14,19 +14,36 @@
  */
 public class KotlinMapperFactoryImpl implements MapperFactory {
 
+    private final DataModelMapper dataModelMapper;
+    private final ValueMapper valueMapper;
+    private final GraphQLTypeMapper graphQLTypeMapper;
+    private final AnnotationsMapper annotationsMapper;
+
+    public KotlinMapperFactoryImpl() {
+        dataModelMapper = new KotlinDataModelMapper();
+        valueMapper = new ValueMapper(new KotlinValueFormatter(), dataModelMapper);
+        graphQLTypeMapper = new KotlinGraphQLTypeMapper();
+        annotationsMapper = new KotlinAnnotationsMapper(valueMapper);
+    }
+
+    @Override
+    public DataModelMapper getDataModelMapper() {
+        return dataModelMapper;
+    }
+
     @Override
-    public DataModelMapper createDataModelMapper() {
-        return new KotlinDataModelMapper();
+    public GraphQLTypeMapper getGraphQLTypeMapper() {
+        return graphQLTypeMapper;
     }
 
     @Override
-    public GraphQLTypeMapper createGraphQLTypeMapper(ValueMapper valueMapper) {
-        return new KotlinGraphQLTypeMapper(valueMapper);
+    public AnnotationsMapper getAnnotationsMapper() {
+        return annotationsMapper;
     }
 
     @Override
-    public ValueFormatter createValueFormatter() {
-        return new KotlinValueFormatter();
+    public ValueMapper getValueMapper() {
+        return valueMapper;
     }
 
 }