chore(codestyle): add plugin to verify google code format

Author: oliemansm

CONTRIBUTING.md

@@ -33,6 +33,12 @@ description. You can download the
 [IntelliJ Java Google Style](https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml)
 to import in these settings in IntelliJ.
 
+These conventions are checked during the build phase. If the build fails because
+the code is not using the correct style you can fix this easily by running a gradle task
+```bash
+./gradlew googleJavaFormat
+```
+
 ### SonarLint
 
 It would also be very helpful to install the SonarLint plugin in your IDE and fix any

build.gradle

@@ -31,6 +31,7 @@ plugins {
     id "org.sonarqube" version "3.2.0"
     id "jacoco"
     id 'io.codearte.nexus-staging' version '0.30.0'
+    id 'com.github.sherter.google-java-format' version '0.9' apply false
 }
 
 sonarqube {
@@ -48,6 +49,7 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
+    apply plugin: 'com.github.sherter.google-java-format'
 
     repositories {
         mavenLocal()
@@ -78,6 +80,8 @@ subprojects {
 
     compileJava.dependsOn(processResources)
 
+    compileJava.mustRunAfter verifyGoogleJavaFormat
+
     jacocoTestReport {
         reports {
             xml.enabled = true

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/BatchedDataLoaderGraphQLBuilder.java

@@ -24,23 +24,25 @@ public BatchedDataLoaderGraphQLBuilder(
   }
 
   GraphQL newGraphQL(GraphQLBatchedInvocationInput invocationInput, GraphQLBuilder graphQLBuilder) {
-    Supplier<Instrumentation> supplier = augment(invocationInput,
-        graphQLBuilder.getInstrumentationSupplier());
-    return invocationInput.getInvocationInputs().stream().findFirst()
+    Supplier<Instrumentation> supplier =
+        augment(invocationInput, graphQLBuilder.getInstrumentationSupplier());
+    return invocationInput.getInvocationInputs().stream()
+        .findFirst()
         .map(GraphQLSingleInvocationInput::getSchema)
         .map(schema -> graphQLBuilder.build(schema, supplier))
-        .orElseThrow(() -> new IllegalArgumentException(
-            "Batched invocation input must contain at least one query"));
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Batched invocation input must contain at least one query"));
   }
 
   private Supplier<Instrumentation> augment(
       GraphQLBatchedInvocationInput batchedInvocationInput,
-      Supplier<Instrumentation> instrumentationSupplier
-  ) {
+      Supplier<Instrumentation> instrumentationSupplier) {
     List<ExecutionInput> executionInputs = batchedInvocationInput.getExecutionInputs();
-    return batchedInvocationInput.getContextSetting()
-        .configureInstrumentationForContext(instrumentationSupplier, executionInputs,
-            optionsSupplier.get());
+    return batchedInvocationInput
+        .getContextSetting()
+        .configureInstrumentationForContext(
+            instrumentationSupplier, executionInputs, optionsSupplier.get());
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java

@@ -40,5 +40,4 @@ public Map<Object, Object> getExtensions() {
   public Map<String, Object> toSpecification() {
     return result.toSpecification();
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/DefaultGraphQLRootObjectBuilder.java

@@ -5,5 +5,4 @@ public class DefaultGraphQLRootObjectBuilder extends StaticGraphQLRootObjectBuil
   public DefaultGraphQLRootObjectBuilder() {
     super(new Object());
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLBatchedQueryResult.java

@@ -8,8 +8,7 @@
 @RequiredArgsConstructor
 class GraphQLBatchedQueryResult implements GraphQLQueryResult {
 
-  @Getter
-  private final List<ExecutionResult> results;
+  @Getter private final List<ExecutionResult> results;
 
   @Override
   public boolean isBatched() {
@@ -20,5 +19,4 @@ public boolean isBatched() {
   public boolean isAsynchronous() {
     return false;
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvoker.java

@@ -35,14 +35,15 @@ public CompletableFuture<GraphQLQueryResult> queryAsync(GraphQLInvocationInput i
       return executeAsync((GraphQLSingleInvocationInput) invocationInput)
           .thenApply(GraphQLQueryResult::create);
     }
-    GraphQLBatchedInvocationInput batchedInvocationInput = (GraphQLBatchedInvocationInput) invocationInput;
+    GraphQLBatchedInvocationInput batchedInvocationInput =
+        (GraphQLBatchedInvocationInput) invocationInput;
     return executeAsync(batchedInvocationInput).thenApply(GraphQLQueryResult::create);
   }
 
   private CompletableFuture<List<ExecutionResult>> executeAsync(
       GraphQLBatchedInvocationInput batchedInvocationInput) {
-    GraphQL graphQL = batchedDataLoaderGraphQLBuilder
-        .newGraphQL(batchedInvocationInput, graphQLBuilder);
+    GraphQL graphQL =
+        batchedDataLoaderGraphQLBuilder.newGraphQL(batchedInvocationInput, graphQLBuilder);
     return sequence(
         batchedInvocationInput.getExecutionInputs().stream()
             .map(executionInput -> proxy.executeAsync(graphQL, executionInput))
@@ -52,14 +53,15 @@ private CompletableFuture<List<ExecutionResult>> executeAsync(
   @SuppressWarnings({"unchecked", "rawtypes"})
   private <T> CompletableFuture<List<T>> sequence(List<CompletableFuture<T>> futures) {
     CompletableFuture[] futuresArray = futures.toArray(new CompletableFuture[0]);
-    return CompletableFuture.allOf(futuresArray).thenApply(aVoid -> {
-      List<T> result = new ArrayList<>(futures.size());
-      for (CompletableFuture future : futuresArray) {
-        assert future.isDone(); // per the API contract of allOf()
-        result.add((T) future.join());
-      }
-      return result;
-    });
+    return CompletableFuture.allOf(futuresArray)
+        .thenApply(
+            aVoid -> {
+              List<T> result = new ArrayList<>(futures.size());
+              for (CompletableFuture future : futuresArray) {
+                assert future.isDone(); // per the API contract of allOf()
+                result.add((T) future.join());
+              }
+              return result;
+            });
   }
 }
-

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvokerProxy.java

@@ -8,5 +8,4 @@
 public interface GraphQLInvokerProxy {
 
   CompletableFuture<ExecutionResult> executeAsync(GraphQL graphQL, ExecutionInput executionInput);
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLInvokerSubjectProxy.java

@@ -12,21 +12,21 @@
 public class GraphQLInvokerSubjectProxy implements GraphQLInvokerProxy {
 
   @Override
-  public CompletableFuture<ExecutionResult> executeAsync(GraphQL graphQL,
-      ExecutionInput executionInput) {
+  public CompletableFuture<ExecutionResult> executeAsync(
+      GraphQL graphQL, ExecutionInput executionInput) {
     GraphQLContext context = (GraphQLContext) executionInput.getContext();
-    if (Subject.getSubject(AccessController.getContext()) == null && context.getSubject()
-        .isPresent()) {
-      return context.getSubject()
+    if (Subject.getSubject(AccessController.getContext()) == null
+        && context.getSubject().isPresent()) {
+      return context
+          .getSubject()
           .map(it -> Subject.doAs(it, doAction(graphQL, executionInput)))
           .orElseGet(() -> graphQL.executeAsync(executionInput));
     }
     return graphQL.executeAsync(executionInput);
   }
 
-  private PrivilegedAction<CompletableFuture<ExecutionResult>> doAction(GraphQL graphQL,
-      ExecutionInput executionInput) {
+  private PrivilegedAction<CompletableFuture<ExecutionResult>> doAction(
+      GraphQL graphQL, ExecutionInput executionInput) {
     return () -> graphQL.executeAsync(executionInput);
   }
-
 }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLObjectMapper.java

@@ -24,20 +24,18 @@
 import java.util.function.Supplier;
 import lombok.SneakyThrows;
 
-/**
- * @author Andrew Potter
- */
+/** @author Andrew Potter */
 public class GraphQLObjectMapper {
 
-  private static final TypeReference<Map<String, List<String>>>
-      MULTIPART_MAP_TYPE_REFERENCE = new TypeReference<Map<String, List<String>>>() {
-  };
+  private static final TypeReference<Map<String, List<String>>> MULTIPART_MAP_TYPE_REFERENCE =
+      new TypeReference<Map<String, List<String>>>() {};
   private final ObjectMapperProvider objectMapperProvider;
   private final Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier;
 
   private ObjectMapper mapper;
 
-  protected GraphQLObjectMapper(ObjectMapperProvider objectMapperProvider,
+  protected GraphQLObjectMapper(
+      ObjectMapperProvider objectMapperProvider,
       Supplier<GraphQLErrorHandler> graphQLErrorHandlerSupplier) {
     this.objectMapperProvider = objectMapperProvider;
     this.graphQLErrorHandlerSupplier = graphQLErrorHandlerSupplier;
@@ -62,9 +60,7 @@ public ObjectMapper getJacksonMapper() {
     return result;
   }
 
-  /**
-   * @return an {@link ObjectReader} for deserializing {@link GraphQLRequest}
-   */
+  /** @return an {@link ObjectReader} for deserializing {@link GraphQLRequest} */
   public ObjectReader getGraphQLRequestMapper() {
     return getJacksonMapper().reader().forType(GraphQLRequest.class);
   }
@@ -102,8 +98,7 @@ public List<GraphQLRequest> readBatchedGraphQLRequest(String query) throws IOExc
 
   @SneakyThrows
   public String serializeResultAsJson(ExecutionResult executionResult) {
-    return getJacksonMapper()
-        .writeValueAsString(createResultFromExecutionResult(executionResult));
+    return getJacksonMapper().writeValueAsString(createResultFromExecutionResult(executionResult));
   }
 
   public void serializeResultAsJson(Writer writer, ExecutionResult executionResult)
@@ -120,8 +115,7 @@ public void serializeResultAsJson(Writer writer, ExecutionResult executionResult
    */
   @SneakyThrows
   public byte[] serializeResultAsBytes(ExecutionResult executionResult) {
-    return getJacksonMapper()
-        .writeValueAsBytes(createResultFromExecutionResult(executionResult));
+    return getJacksonMapper().writeValueAsBytes(createResultFromExecutionResult(executionResult));
   }
 
   public boolean areErrorsPresent(ExecutionResult executionResult) {
@@ -151,13 +145,16 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
     return convertSanitizedExecutionResult(executionResult, true);
   }
 
-  public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult executionResult,
-      boolean includeData) {
+  public Map<String, Object> convertSanitizedExecutionResult(
+      ExecutionResult executionResult, boolean includeData) {
     final Map<String, Object> result = new LinkedHashMap<>();
 
     if (areErrorsPresent(executionResult)) {
-      result.put("errors", executionResult.getErrors().stream().map(GraphQLError::toSpecification)
-          .collect(toList()));
+      result.put(
+          "errors",
+          executionResult.getErrors().stream()
+              .map(GraphQLError::toSpecification)
+              .collect(toList()));
     }
 
     if (executionResult.getExtensions() != null && !executionResult.getExtensions().isEmpty()) {
@@ -173,9 +170,8 @@ public Map<String, Object> convertSanitizedExecutionResult(ExecutionResult execu
 
   @SneakyThrows
   public Map<String, Object> deserializeVariables(String variables) {
-    return VariablesDeserializer
-        .deserializeVariablesObject(getJacksonMapper().readValue(variables, Object.class),
-            getJacksonMapper());
+    return VariablesDeserializer.deserializeVariablesObject(
+        getJacksonMapper().readValue(variables, Object.class), getJacksonMapper());
   }
 
   @SneakyThrows

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLQueryInvoker.java

@@ -12,17 +12,16 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-/**
- * @author Andrew Potter
- */
+/** @author Andrew Potter */
 public class GraphQLQueryInvoker {
 
   private final Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider;
   private final Supplier<Instrumentation> getInstrumentation;
   private final Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider;
   private final Supplier<DataLoaderDispatcherInstrumentationOptions> optionsSupplier;
 
-  protected GraphQLQueryInvoker(Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider,
+  protected GraphQLQueryInvoker(
+      Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider,
       Supplier<Instrumentation> getInstrumentation,
       Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider,
       Supplier<DataLoaderDispatcherInstrumentationOptions> optionsSupplier) {
@@ -37,20 +36,24 @@ public static Builder newBuilder() {
   }
 
   public GraphQLInvoker toGraphQLInvoker() {
-    GraphQLBuilder graphQLBuilder = new GraphQLBuilder()
-        .executionStrategyProvider(getExecutionStrategyProvider)
-        .instrumentation(getInstrumentation)
-        .preparsedDocumentProvider(getPreparsedDocumentProvider);
+    GraphQLBuilder graphQLBuilder =
+        new GraphQLBuilder()
+            .executionStrategyProvider(getExecutionStrategyProvider)
+            .instrumentation(getInstrumentation)
+            .preparsedDocumentProvider(getPreparsedDocumentProvider);
     return new GraphQLInvoker(graphQLBuilder, new BatchedDataLoaderGraphQLBuilder(optionsSupplier));
   }
 
   public static class Builder {
 
-    private Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider = DefaultExecutionStrategyProvider::new;
+    private Supplier<ExecutionStrategyProvider> getExecutionStrategyProvider =
+        DefaultExecutionStrategyProvider::new;
     private Supplier<Instrumentation> getInstrumentation = () -> SimpleInstrumentation.INSTANCE;
-    private Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider = () -> NoOpPreparsedDocumentProvider.INSTANCE;
-    private Supplier<DataLoaderDispatcherInstrumentationOptions> dataLoaderDispatcherInstrumentationOptionsSupplier = DataLoaderDispatcherInstrumentationOptions::newOptions;
-
+    private Supplier<PreparsedDocumentProvider> getPreparsedDocumentProvider =
+        () -> NoOpPreparsedDocumentProvider.INSTANCE;
+    private Supplier<DataLoaderDispatcherInstrumentationOptions>
+        dataLoaderDispatcherInstrumentationOptionsSupplier =
+            DataLoaderDispatcherInstrumentationOptions::newOptions;
 
     public Builder withExecutionStrategyProvider(ExecutionStrategyProvider provider) {
       return withExecutionStrategyProvider(() -> provider);
@@ -103,7 +106,9 @@ public Builder withDataLoaderDispatcherInstrumentationOptions(
     }
 
     public GraphQLQueryInvoker build() {
-      return new GraphQLQueryInvoker(getExecutionStrategyProvider, getInstrumentation,
+      return new GraphQLQueryInvoker(
+          getExecutionStrategyProvider,
+          getInstrumentation,
           getPreparsedDocumentProvider,
           dataLoaderDispatcherInstrumentationOptionsSupplier);
     }

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLRequest.java

@@ -8,19 +8,18 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author Andrew Potter
- */
+/** @author Andrew Potter */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class GraphQLRequest {
 
   private String query;
+
   @JsonDeserialize(using = VariablesDeserializer.class)
   private Map<String, Object> variables = new HashMap<>();
+
   private String operationName;
 
-  public GraphQLRequest() {
-  }
+  public GraphQLRequest() {}
 
   public GraphQLRequest(String query, Map<String, Object> variables, String operationName) {
     this.query = query;
@@ -31,8 +30,8 @@ public GraphQLRequest(String query, Map<String, Object> variables, String operat
   }
 
   public static GraphQLRequest createIntrospectionRequest() {
-    return new GraphQLRequest(IntrospectionQuery.INTROSPECTION_QUERY, new HashMap<>(),
-        "IntrospectionQuery");
+    return new GraphQLRequest(
+        IntrospectionQuery.INTROSPECTION_QUERY, new HashMap<>(), "IntrospectionQuery");
   }
 
   public static GraphQLRequest createQueryOnlyRequest(String query) {
@@ -64,7 +63,4 @@ public String getOperationName() {
   public void setOperationName(String operationName) {
     this.operationName = operationName;
   }
-
 }
-
-

graphql-java-kickstart/src/main/java/graphql/kickstart/execution/GraphQLRootObjectBuilder.java

@@ -2,9 +2,6 @@
 
 public interface GraphQLRootObjectBuilder {
 
-  /**
-   * @return the graphql root object
-   */
+  /** @return the graphql root object */
   Object build();
-
 }