Merge pull request #184 from sergehuber/custom-input-prefix-and-postfix

Make it possible to provide custom prefixes AND postfixes for input objects

Author: guy120494

src/main/java/graphql/annotations/processor/ProcessingElementsContainer.java

@@ -27,6 +27,9 @@
 import java.util.Set;
 import java.util.Stack;
 
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_SUFFIX;
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
+
 public class ProcessingElementsContainer {
 
     private TypeFunction defaultTypeFunction;
@@ -35,6 +38,8 @@ public class ProcessingElementsContainer {
     private Map<String, graphql.schema.GraphQLDirective> directiveRegistry;
     private Map<Class<?>, Set<Class<?>>> extensionsTypeRegistry;
     private Stack<String> processing;
+    private String inputPrefix = DEFAULT_INPUT_PREFIX;
+    private String inputSuffix = DEFAULT_INPUT_SUFFIX;
 
     public Map<String, GraphQLDirective> getDirectiveRegistry() {
         return directiveRegistry;
@@ -100,4 +105,20 @@ public Stack<String> getProcessing() {
     public void setProcessing(Stack<String> processing) {
         this.processing = processing;
     }
+
+    public String getInputPrefix() {
+        return inputPrefix;
+    }
+
+    public void setInputPrefix(String inputPrefix) {
+        this.inputPrefix = inputPrefix;
+    }
+
+    public String getInputSuffix() {
+        return inputSuffix;
+    }
+
+    public void setInputSuffix(String inputSuffix) {
+        this.inputSuffix = inputSuffix;
+    }
 }

src/main/java/graphql/annotations/processor/retrievers/GraphQLTypeRetriever.java

@@ -26,8 +26,6 @@
 import graphql.schema.*;
 import org.osgi.service.component.annotations.*;
 
-import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
-
 @Component(service = GraphQLTypeRetriever.class, immediate = true)
 public class GraphQLTypeRetriever {
 
@@ -48,6 +46,7 @@ public class GraphQLTypeRetriever {
      *
      * @param object    the object class to examine*
      * @param container a class that hold several members that are required in order to build schema
+     * @param isInput true if the type is an input type, false otherwise
      * @return a {@link GraphQLType} that represents that object class
      * @throws graphql.annotations.processor.exceptions.GraphQLAnnotationsException if the object class cannot be examined
      * @throws graphql.annotations.processor.exceptions.CannotCastMemberException   if the object class cannot be examined
@@ -61,7 +60,7 @@ public GraphQLType getGraphQLType(Class<?> object, ProcessingElementsContainer c
         GraphQLType type;
 
         if (isInput) {
-            typeName = DEFAULT_INPUT_PREFIX + typeName;
+            typeName = container.getInputPrefix() + typeName + container.getInputSuffix();
         }
 
         if (container.getProcessing().contains(typeName)) {

src/main/java/graphql/annotations/processor/typeBuilders/InputObjectBuilder.java

@@ -29,7 +29,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
 import static graphql.annotations.processor.util.ObjectUtil.getAllFields;
 
 public class InputObjectBuilder {
@@ -56,7 +55,7 @@ public InputObjectBuilder(GraphQLObjectInfoRetriever graphQLObjectInfoRetriever,
 
     public GraphQLInputObjectType.Builder getInputObjectBuilder(Class<?> object, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
         GraphQLInputObjectType.Builder builder = GraphQLInputObjectType.newInputObject();
-        builder.name(DEFAULT_INPUT_PREFIX + graphQLObjectInfoRetriever.getTypeName(object));
+        builder.name(container.getInputPrefix() + graphQLObjectInfoRetriever.getTypeName(object) + container.getInputSuffix());
         GraphQLDescription description = object.getAnnotation(GraphQLDescription.class);
         if (description != null) {
             builder.description(description.value());

src/main/java/graphql/annotations/processor/util/InputPropertiesUtil.java

@@ -16,4 +16,5 @@
 
 public class InputPropertiesUtil {
     public static final String DEFAULT_INPUT_PREFIX = "Input";
+    public static final String DEFAULT_INPUT_SUFFIX = "";
 }

src/test/java/graphql/annotations/GraphQLObjectTest.java

@@ -40,6 +40,8 @@
 import java.util.function.Supplier;
 
 import static graphql.Scalars.GraphQLString;
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_SUFFIX;
+import static graphql.annotations.processor.util.InputPropertiesUtil.DEFAULT_INPUT_PREFIX;
 import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
 import static graphql.schema.GraphQLSchema.newSchema;
 import static org.testng.Assert.*;
@@ -724,9 +726,26 @@ public void inputObject() {
                 new BreadthFirstSearch(graphQLObjectInfoRetriever), new GraphQLFieldRetriever()).
                 getInputObjectBuilder(InputObject.class, GraphQLAnnotations.getInstance().getContainer()).build();
 
+        assertEquals(type.getName(), DEFAULT_INPUT_PREFIX + InputObject.class.getSimpleName(), "Type name prefix did not match expected value");
         assertEquals(type.getFields().size(), InputObject.class.getDeclaredFields().length);
     }
 
+    @Test
+    public void inputObjectCustomPrefixes() {
+        GraphQLObjectInfoRetriever graphQLObjectInfoRetriever = new GraphQLObjectInfoRetriever();
+        ProcessingElementsContainer container = GraphQLAnnotations.getInstance().getContainer();
+        container.setInputPrefix("");
+        container.setInputSuffix("Input");
+        GraphQLInputObjectType type = new InputObjectBuilder(graphQLObjectInfoRetriever, new ParentalSearch(graphQLObjectInfoRetriever),
+                new BreadthFirstSearch(graphQLObjectInfoRetriever), new GraphQLFieldRetriever()).
+                getInputObjectBuilder(InputObject.class, GraphQLAnnotations.getInstance().getContainer()).build();
+
+        assertEquals(type.getName(), "" + InputObject.class.getSimpleName() + "Input", "Type name prefix did not match expected value");
+        assertEquals(type.getFields().size(), InputObject.class.getDeclaredFields().length);
+        container.setInputPrefix(DEFAULT_INPUT_PREFIX);
+        container.setInputSuffix(DEFAULT_INPUT_SUFFIX);
+    }
+
     public static class UUIDTypeFunction implements TypeFunction {
         @Override
         public boolean canBuildType(Class<?> aClass, AnnotatedType annotatedType) {