Merge pull request #182 from Jahia/prettify-default-settings

Add global settings to force prettify on all field/method

Author: yarinvak

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

@@ -55,6 +55,8 @@ public class GraphQLFieldRetriever {
 
     private DataFetcherConstructor dataFetcherConstructor;
 
+    private boolean alwaysPrettify = false;
+
     public GraphQLFieldRetriever(DataFetcherConstructor dataFetcherConstructor) {
         this.dataFetcherConstructor = dataFetcherConstructor;
     }
@@ -66,7 +68,7 @@ public GraphQLFieldRetriever() {
     public GraphQLFieldDefinition getField(Method method, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
         GraphQLFieldDefinition.Builder builder = newFieldDefinition();
         TypeFunction typeFunction = getTypeFunction(method, container);
-        builder.name(new MethodNameBuilder(method).build());
+        builder.name(new MethodNameBuilder(method).alwaysPrettify(alwaysPrettify).build());
         GraphQLOutputType outputType = (GraphQLOutputType) new MethodTypeBuilder(method, typeFunction, container, false).build();
 
         boolean isConnection = ConnectionUtil.isConnection(method, outputType);
@@ -85,7 +87,7 @@ public GraphQLFieldDefinition getField(Method method, ProcessingElementsContaine
 
     public GraphQLFieldDefinition getField(Field field, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
         GraphQLFieldDefinition.Builder builder = newFieldDefinition();
-        builder.name(new FieldNameBuilder(field).build());
+        builder.name(new FieldNameBuilder(field).alwaysPrettify(alwaysPrettify).build());
         TypeFunction typeFunction = getTypeFunction(field, container);
 
         GraphQLType outputType = typeFunction.buildType(field.getType(), field.getAnnotatedType(), container);
@@ -104,15 +106,15 @@ public GraphQLFieldDefinition getField(Field field, ProcessingElementsContainer
 
     public GraphQLInputObjectField getInputField(Method method, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
         GraphQLInputObjectField.Builder builder = newInputObjectField();
-        builder.name(new MethodNameBuilder(method).build());
+        builder.name(new MethodNameBuilder(method).alwaysPrettify(alwaysPrettify).build());
         TypeFunction typeFunction = getTypeFunction(method, container);
         GraphQLInputType inputType = (GraphQLInputType) new MethodTypeBuilder(method, typeFunction, container, true).build();
         return builder.type(inputType).description(new DescriptionBuilder(method).build()).build();
     }
 
     public GraphQLInputObjectField getInputField(Field field, ProcessingElementsContainer container) throws GraphQLAnnotationsException {
         GraphQLInputObjectField.Builder builder = newInputObjectField();
-        builder.name(new FieldNameBuilder(field).build());
+        builder.name(new FieldNameBuilder(field).alwaysPrettify(alwaysPrettify).build());
         TypeFunction typeFunction = getTypeFunction(field, container);
         GraphQLType graphQLType = typeFunction.buildType(true, field.getType(), field.getAnnotatedType(), container);
         return builder.type((GraphQLInputType) graphQLType).description(new DescriptionBuilder(field).build()).build();
@@ -195,6 +197,10 @@ private GraphQLObjectType getActualType(GraphQLObjectType type, Map<String, grap
         return type;
     }
 
+    public void setAlwaysPrettify(boolean alwaysPrettify) {
+        this.alwaysPrettify = alwaysPrettify;
+    }
+
     @Reference(policy = ReferencePolicy.DYNAMIC, policyOption = ReferencePolicyOption.GREEDY)
     public void setDataFetcherConstructor(DataFetcherConstructor dataFetcherConstructor) {
         this.dataFetcherConstructor = dataFetcherConstructor;

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/field/FieldNameBuilder.java

@@ -25,13 +25,20 @@
 public class FieldNameBuilder implements Builder<String> {
     private Field field;
 
+    private boolean alwaysPrettify = false;
+
     public FieldNameBuilder(Field field) {
         this.field = field;
     }
 
+    public FieldNameBuilder alwaysPrettify(boolean alwaysPrettify) {
+        this.alwaysPrettify = alwaysPrettify;
+        return this;
+    }
+
     @Override
     public String build() {
-        if (field.isAnnotationPresent(GraphQLPrettify.class) && !field.isAnnotationPresent(GraphQLName.class)) {
+        if ((alwaysPrettify || field.isAnnotationPresent(GraphQLPrettify.class)) && !field.isAnnotationPresent(GraphQLName.class)) {
             return toGraphqlName(prettifyName(field.getName()));
         }
         GraphQLName name = field.getAnnotation(GraphQLName.class);

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodNameBuilder.java

@@ -17,6 +17,7 @@
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLPrettify;
 import graphql.annotations.processor.retrievers.fieldBuilders.Builder;
+import graphql.annotations.processor.retrievers.fieldBuilders.field.FieldNameBuilder;
 
 import java.lang.reflect.Method;
 
@@ -25,13 +26,20 @@
 public class MethodNameBuilder implements Builder<String> {
     private Method method;
 
+    private boolean alwaysPrettify = false;
+
     public MethodNameBuilder(Method method) {
         this.method = method;
     }
 
+    public MethodNameBuilder alwaysPrettify(boolean alwaysPrettify) {
+        this.alwaysPrettify = alwaysPrettify;
+        return this;
+    }
+
     @Override
     public String build() {
-        if (method.isAnnotationPresent(GraphQLPrettify.class) && !method.isAnnotationPresent(GraphQLName.class)) {
+        if ((alwaysPrettify || method.isAnnotationPresent(GraphQLPrettify.class)) && !method.isAnnotationPresent(GraphQLName.class)) {
             return toGraphqlName(prettifyName(method.getName()));
         }
         GraphQLName name = method.getAnnotation(GraphQLName.class);

src/test/java/graphql/annotations/processor/retrievers/fieldBuilders/method/MethodNameBuilderTest.java

@@ -67,6 +67,19 @@ public void build_graphQLNameAnnotationNotExistsWithGetPrefix_returnCorrectName(
         assertEquals(name, "getTest");
     }
 
+    @Test
+    public void build_graphQLNameAnnotationNotExistsWithGetPrefixAndPrettify_returnCorrectName() throws NoSuchMethodException {
+        // arrange
+        Method method = getClass().getMethod("getTest");
+        MethodNameBuilder methodNameBuilder = new MethodNameBuilder(method);
+
+        // act
+        String name = methodNameBuilder.alwaysPrettify(true).build();
+
+        // assert
+        assertEquals(name, "test");
+    }
+
     @Test
     public void build_graphQLNameAnnotationNotExistsWithIsPrefix_returnCorrectName() throws NoSuchMethodException{
         // arrange