chore: apply google code format

Author: oliemansm

.github/workflows/ci.yml

@@ -12,6 +12,34 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
+
+  verify-google-java-format:
+    name: Google Java Format Verification
+    runs-on: ubuntu-latest
+    needs: validation
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 15
+      - name: Cache Gradle
+        uses: actions/cache@v2
+        env:
+          java-version: 15
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-${{ env.java-version }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: ${{ runner.os }}-${{ env.java-version }}-gradle-
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Gradle Check
+        run: ./gradlew --info verifyGoogleJavaFormat
+
   test:
     name: Test run
     needs: validation
@@ -38,7 +66,8 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check
+        run: ./gradlew --info check -x verifyGoogleJavaFormat
+
   build:
     name: Publish snapshot
     needs: test
@@ -69,7 +98,8 @@ jobs:
         env:
           OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
           OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
-        run: ./gradlew clean build publish -x test
+        run: ./gradlew clean build publish -x test verifyGoogleJavaFormat
+
   sonar:
     name: Sonar analysis
     needs: validation
@@ -100,4 +130,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         if: env.SONAR_TOKEN != null
-        run: ./gradlew build jacocoTestReport sonarqube --info
+        run: ./gradlew build jacocoTestReport sonarqube --info -x verifyGoogleJavaFormat

.github/workflows/release.yml

@@ -8,6 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
+
   test:
     name: Test run
     needs: validation
@@ -34,7 +35,8 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Gradle Check
-        run: ./gradlew --info check
+        run: ./gradlew --info check -x verifyGoogleJavaFormat
+
   build:
     name: Publish release
     needs: test

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairAutoConfiguration.java

@@ -8,9 +8,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.DispatcherServlet;
 
-/**
- * @author Moncef AOUDIA
- */
+/** @author Moncef AOUDIA */
 @Configuration
 @ConditionalOnWebApplication
 @EnableConfigurationProperties(AltairProperties.class)
@@ -22,5 +20,4 @@ public class AltairAutoConfiguration {
   AltairController altairController() {
     return new AltairController();
   }
-
 }

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairController.java

@@ -24,20 +24,16 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
-/**
- * @author Moncef AOUDIA
- */
+/** @author Moncef AOUDIA */
 @Controller
 public class AltairController {
 
   private static final String CDN_UNPKG = "//unpkg.com/";
   private static final String ALTAIR = "altair-static";
 
-  @Autowired
-  private AltairProperties altairProperties;
+  @Autowired private AltairProperties altairProperties;
 
-  @Autowired
-  private Environment environment;
+  @Autowired private Environment environment;
 
   private String template;
   private String props;
@@ -67,31 +63,36 @@ private void loadHeaders() throws JsonProcessingException {
   }
 
   @GetMapping(value = "${altair.mapping:/altair}")
-  public void altair(HttpServletRequest request, HttpServletResponse response,
-      @PathVariable Map<String, String> params) throws IOException {
+  public void altair(
+      HttpServletRequest request,
+      HttpServletResponse response,
+      @PathVariable Map<String, String> params)
+      throws IOException {
     response.setContentType("text/html; charset=UTF-8");
 
-    Map<String, String> replacements = getReplacements(
-        constructGraphQlEndpoint(request, params),
-        request.getContextPath() + altairProperties.getEndpoint().getSubscriptions()
-    );
+    Map<String, String> replacements =
+        getReplacements(
+            constructGraphQlEndpoint(request, params),
+            request.getContextPath() + altairProperties.getEndpoint().getSubscriptions());
 
     String populatedTemplate = StringSubstitutor.replace(template, replacements);
     response.getOutputStream().write(populatedTemplate.getBytes(Charset.defaultCharset()));
   }
 
-  private Map<String, String> getReplacements(String graphqlEndpoint,
-      String subscriptionsEndpoint) {
+  private Map<String, String> getReplacements(
+      String graphqlEndpoint, String subscriptionsEndpoint) {
     Map<String, String> replacements = new HashMap<>();
     replacements.put("graphqlEndpoint", graphqlEndpoint);
     replacements.put("subscriptionsEndpoint", subscriptionsEndpoint);
     replacements.put("pageTitle", altairProperties.getPageTitle());
     replacements.put("pageFavicon", getResourceUrl("favicon.ico", "favicon.ico"));
-    replacements.put("altairBaseUrl", getResourceUrl(
-        StringUtils.join(altairProperties.getBasePath(), "/vendor/altair/"),
-        joinJsUnpkgPath(ALTAIR, altairProperties.getCdn().getVersion(), "build/dist/")));
-    replacements
-        .put("altairLogoUrl", getResourceUrl("assets/img/logo_350.svg", "assets/img/logo_350.svg"));
+    replacements.put(
+        "altairBaseUrl",
+        getResourceUrl(
+            StringUtils.join(altairProperties.getBasePath(), "/vendor/altair/"),
+            joinJsUnpkgPath(ALTAIR, altairProperties.getCdn().getVersion(), "build/dist/")));
+    replacements.put(
+        "altairLogoUrl", getResourceUrl("assets/img/logo_350.svg", "assets/img/logo_350.svg"));
     replacements.put("altairCssUrl", getResourceUrl("styles.css", "styles.css"));
     replacements.put("altairMainJsUrl", getResourceUrl("main.js", "main.js"));
     replacements.put("altairPolyfillsJsUrl", getResourceUrl("polyfills.js", "polyfills.js"));
@@ -112,17 +113,16 @@ private String joinJsUnpkgPath(String library, String cdnVersion, String cdnFile
     return CDN_UNPKG + library + "@" + cdnVersion + "/" + cdnFileName;
   }
 
-  private String constructGraphQlEndpoint(HttpServletRequest request,
-      @RequestParam Map<String, String> params) {
+  private String constructGraphQlEndpoint(
+      HttpServletRequest request, @RequestParam Map<String, String> params) {
     String endpoint = altairProperties.getEndpoint().getGraphql();
     for (Map.Entry<String, String> param : params.entrySet()) {
       endpoint = endpoint.replaceAll("\\{" + param.getKey() + "}", param.getValue());
     }
-    if (StringUtils.isNotBlank(request.getContextPath()) && !endpoint
-        .startsWith(request.getContextPath())) {
+    if (StringUtils.isNotBlank(request.getContextPath())
+        && !endpoint.startsWith(request.getContextPath())) {
       return request.getContextPath() + endpoint;
     }
     return endpoint;
   }
-
 }

altair-spring-boot-autoconfigure/src/main/java/graphql/kickstart/altair/boot/AltairProperties.java

@@ -27,5 +27,4 @@ static class Cdn {
     private boolean enabled = false;
     private String version = "2.4.11";
   }
-
 }

altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AbstractAutoConfigurationTest.java

@@ -1,15 +1,12 @@
 package graphql.kickstart.altair.boot.test;
 
-import lombok.NonNull;
 import org.junit.jupiter.api.AfterEach;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigRegistry;
 import org.springframework.context.support.AbstractApplicationContext;
 
-/**
- * @author Moncef AOUDIA
- */
+/** @author Moncef AOUDIA */
 public abstract class AbstractAutoConfigurationTest {
 
   private final Class<? extends AbstractApplicationContext> contextClass;
@@ -21,8 +18,8 @@ protected AbstractAutoConfigurationTest(Class<?> autoConfiguration) {
     this(AnnotationConfigApplicationContext.class, autoConfiguration);
   }
 
-  protected AbstractAutoConfigurationTest(Class<? extends AbstractApplicationContext> contextClass,
-      Class<?> autoConfiguration) {
+  protected AbstractAutoConfigurationTest(
+      Class<? extends AbstractApplicationContext> contextClass, Class<?> autoConfiguration) {
     assert AnnotationConfigRegistry.class.isAssignableFrom(contextClass);
     this.contextClass = contextClass;
     this.autoConfiguration = autoConfiguration;

altair-spring-boot-autoconfigure/src/test/java/graphql/kickstart/altair/boot/test/AltairControllerTest.java

@@ -14,9 +14,7 @@
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
-/**
- * @author Andrew Potter
- */
+/** @author Andrew Potter */
 class AltairControllerTest extends AbstractAutoConfigurationTest {
 
   public AltairControllerTest() {

example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/SubscriptionSampleApplication.java

@@ -9,5 +9,4 @@ public class SubscriptionSampleApplication {
   public static void main(String[] args) {
     SpringApplication.run(SubscriptionSampleApplication.class, args);
   }
-
 }

example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/publishers/StockTickerReactorPublisher.java

@@ -37,10 +37,13 @@ public class StockTickerReactorPublisher {
   private final Flux<StockPriceUpdate> publisher;
 
   public StockTickerReactorPublisher() {
-    Flux<StockPriceUpdate> stockPriceUpdateFlux = Flux.create(emitter -> {
-      ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
-      executorService.scheduleAtFixedRate(newStockTick(emitter), 0, 2, TimeUnit.SECONDS);
-    }, FluxSink.OverflowStrategy.BUFFER);
+    Flux<StockPriceUpdate> stockPriceUpdateFlux =
+        Flux.create(
+            emitter -> {
+              ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
+              executorService.scheduleAtFixedRate(newStockTick(emitter), 0, 2, TimeUnit.SECONDS);
+            },
+            FluxSink.OverflowStrategy.BUFFER);
     ConnectableFlux<StockPriceUpdate> connectableFlux = stockPriceUpdateFlux.share().publish();
     connectableFlux.connect();
 
@@ -72,8 +75,8 @@ private Runnable newStockTick(FluxSink<StockPriceUpdate> emitter) {
     };
   }
 
-  private void emitStocks(FluxSink<StockPriceUpdate> emitter,
-      List<StockPriceUpdate> stockPriceUpdates) {
+  private void emitStocks(
+      FluxSink<StockPriceUpdate> emitter, List<StockPriceUpdate> stockPriceUpdates) {
     for (StockPriceUpdate stockPriceUpdate : stockPriceUpdates) {
       try {
         emitter.next(stockPriceUpdate);
@@ -89,8 +92,8 @@ public Flux<StockPriceUpdate> getPublisher() {
 
   public Flux<StockPriceUpdate> getPublisher(List<String> stockCodes) {
     if (stockCodes != null) {
-      return publisher
-          .filter(stockPriceUpdate -> stockCodes.contains(stockPriceUpdate.getStockCode()));
+      return publisher.filter(
+          stockPriceUpdate -> stockCodes.contains(stockPriceUpdate.getStockCode()));
     }
     return publisher;
   }
@@ -119,5 +122,4 @@ private StockPriceUpdate rollUpdate() {
     CURRENT_STOCK_PRICES.put(stockCode, newPrice);
     return new StockPriceUpdate(stockCode, LocalDateTime.now(), newPrice, incrementDollars);
   }
-
 }

example-graphql-subscription/src/main/java/graphql/kickstart/spring/web/boot/publishers/StockTickerRxPublisher.java

@@ -39,15 +39,15 @@ public class StockTickerRxPublisher {
   private final Flowable<StockPriceUpdate> publisher;
 
   public StockTickerRxPublisher() {
-    Observable<StockPriceUpdate> stockPriceUpdateObservable = Observable.create(emitter -> {
-
-      ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
-      executorService.scheduleAtFixedRate(newStockTick(emitter), 0, 2, TimeUnit.SECONDS);
-
-    });
-
-    ConnectableObservable<StockPriceUpdate> connectableObservable = stockPriceUpdateObservable
-        .share().publish();
+    Observable<StockPriceUpdate> stockPriceUpdateObservable =
+        Observable.create(
+            emitter -> {
+              ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
+              executorService.scheduleAtFixedRate(newStockTick(emitter), 0, 2, TimeUnit.SECONDS);
+            });
+
+    ConnectableObservable<StockPriceUpdate> connectableObservable =
+        stockPriceUpdateObservable.share().publish();
     connectableObservable.connect();
 
     publisher = connectableObservable.toFlowable(BackpressureStrategy.BUFFER);
@@ -76,8 +76,8 @@ private Runnable newStockTick(ObservableEmitter<StockPriceUpdate> emitter) {
     };
   }
 
-  private void emitStocks(ObservableEmitter<StockPriceUpdate> emitter,
-      List<StockPriceUpdate> stockPriceUpdates) {
+  private void emitStocks(
+      ObservableEmitter<StockPriceUpdate> emitter, List<StockPriceUpdate> stockPriceUpdates) {
     for (StockPriceUpdate stockPriceUpdate : stockPriceUpdates) {
       try {
         emitter.onNext(stockPriceUpdate);
@@ -93,8 +93,8 @@ public Flowable<StockPriceUpdate> getPublisher() {
 
   public Flowable<StockPriceUpdate> getPublisher(List<String> stockCodes) {
     if (stockCodes != null) {
-      return publisher
-          .filter(stockPriceUpdate -> stockCodes.contains(stockPriceUpdate.getStockCode()));
+      return publisher.filter(
+          stockPriceUpdate -> stockCodes.contains(stockPriceUpdate.getStockCode()));
     }
     return publisher;
   }
@@ -123,5 +123,4 @@ private StockPriceUpdate rollUpdate() {
     CURRENT_STOCK_PRICES.put(stockCode, newPrice);
     return new StockPriceUpdate(stockCode, LocalDateTime.now(), newPrice, incrementDollars);
   }
-
 }