added code style plugin and applied spotless fixes (#64)

Author: laxmanchekka

build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
   id("org.hypertrace.ci-utils-plugin") version "0.3.0"
   id("org.hypertrace.publish-plugin") version "1.0.2" apply false
   id("org.hypertrace.jacoco-report-plugin") version "0.2.0" apply false
+  id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
 }
 
 subprojects {
@@ -15,4 +16,12 @@ subprojects {
       license.set(License.APACHE_2_0)
     }
   }
+  pluginManager.withPlugin("java") {
+    configure<JavaPluginExtension> {
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
+
+      apply(plugin = "org.hypertrace.code-style-plugin")
+    }
+  }
 }

integrationtest-service-framework/build.gradle.kts

@@ -1,20 +1,20 @@
 plugins {
-    `java-library`
-    jacoco
-    id("org.hypertrace.publish-plugin")
-    id("org.hypertrace.jacoco-report-plugin")
+  `java-library`
+  jacoco
+  id("org.hypertrace.publish-plugin")
+  id("org.hypertrace.jacoco-report-plugin")
 }
 
 tasks.test {
-    useJUnitPlatform()
+  useJUnitPlatform()
 }
 
 dependencies {
-    implementation(project(":platform-service-framework"))
+  implementation(project(":platform-service-framework"))
 
-    // Configuration
-    implementation("com.typesafe:config:1.4.2")
-    // Logging
-    implementation("org.slf4j:slf4j-api:1.7.36")
-    implementation("org.awaitility:awaitility:4.0.3")
+  // Configuration
+  implementation("com.typesafe:config:1.4.2")
+  // Logging
+  implementation("org.slf4j:slf4j-api:1.7.36")
+  implementation("org.awaitility:awaitility:4.0.3")
 }

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/IntegrationTestServerUtil.java

@@ -1,7 +1,5 @@
 package org.hypertrace.core.serviceframework;
 
-import org.hypertrace.core.serviceframework.config.ConfigClient;
-import org.hypertrace.core.serviceframework.config.IntegrationTestConfigClientFactory;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -13,10 +11,10 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import org.awaitility.Awaitility;
+import org.hypertrace.core.serviceframework.config.ConfigClient;
+import org.hypertrace.core.serviceframework.config.IntegrationTestConfigClientFactory;
 
-/**
- * Utility class used in Integration tests with helper methods to start/shutdown services
- */
+/** Utility class used in Integration tests with helper methods to start/shutdown services */
 public class IntegrationTestServerUtil {
   private static final long INITIAL_DELAY_IN_MILLIS = 1000L;
   private static final long INTERVAL_CHECK_IN_MILLIS = 1000L;
@@ -36,57 +34,61 @@ public static void startServices(String testName, String[] services) {
   private static void startServices(Optional<String> testName, String[] services) {
     executorService = Executors.newFixedThreadPool(services.length);
     IntegrationTestServerUtil.services = services;
-    for (String service:services) {
-      executorService.submit(() -> {
-        try {
-          IntegrationTestServiceLauncher.launchService(testName, service);
-        } catch (Throwable t) {
-          System.out.println("Error starting the service with these message: "
-              + t.getMessage());
-        }
-      });
+    for (String service : services) {
+      executorService.submit(
+          () -> {
+            try {
+              IntegrationTestServiceLauncher.launchService(testName, service);
+            } catch (Throwable t) {
+              System.out.println(
+                  "Error starting the service with these message: " + t.getMessage());
+            }
+          });
       waitTillServerReady(service);
     }
   }
 
   public static void shutdownServices() {
-    for (String service:services) {
+    for (String service : services) {
       IntegrationTestServiceLauncher.shutdown();
-      Awaitility.await().pollInterval(INTERVAL_CHECK_IN_MILLIS, TimeUnit.MILLISECONDS)
-          .and().pollDelay(INITIAL_DELAY_IN_MILLIS, TimeUnit.MILLISECONDS)
+      Awaitility.await()
+          .pollInterval(INTERVAL_CHECK_IN_MILLIS, TimeUnit.MILLISECONDS)
+          .and()
+          .pollDelay(INITIAL_DELAY_IN_MILLIS, TimeUnit.MILLISECONDS)
           .atMost(MAX_CHECK_DURATION_IN_MILLIS, TimeUnit.MILLISECONDS)
           .until(() -> !isServerReady(service));
     }
     executorService.shutdownNow();
   }
 
   private static void waitTillServerReady(String service) {
-    Awaitility.await().pollInterval(INTERVAL_CHECK_IN_MILLIS, TimeUnit.MILLISECONDS)
-        .and().pollDelay(INITIAL_DELAY_IN_MILLIS, TimeUnit.MILLISECONDS)
+    Awaitility.await()
+        .pollInterval(INTERVAL_CHECK_IN_MILLIS, TimeUnit.MILLISECONDS)
+        .and()
+        .pollDelay(INITIAL_DELAY_IN_MILLIS, TimeUnit.MILLISECONDS)
         .atMost(MAX_CHECK_DURATION_IN_MILLIS, TimeUnit.MILLISECONDS)
         .until(() -> isServerReady(service));
   }
 
   private static boolean isServerReady(String service) {
     try {
-      ConfigClient configClient = IntegrationTestConfigClientFactory.getConfigClientForService(service);
+      ConfigClient configClient =
+          IntegrationTestConfigClientFactory.getConfigClientForService(service);
       int port = configClient.getConfig().getInt("service.admin.port");
       HttpClient client = HttpClient.newHttpClient();
-      HttpRequest request = HttpRequest.newBuilder()
-          .uri(URI.create(
-              String.format("http://localhost:%d/health", port)))
-          .build();
+      HttpRequest request =
+          HttpRequest.newBuilder()
+              .uri(URI.create(String.format("http://localhost:%d/health", port)))
+              .build();
 
-      HttpResponse<String> response =
-          client.send(request, BodyHandlers.ofString());
+      HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
       String responseBody = response.body();
-      return response.statusCode() == 200 &&  "OK".equals(responseBody);
+      return response.statusCode() == 200 && "OK".equals(responseBody);
     } catch (IOException re) {
       return false;
     } catch (InterruptedException ie) {
       Thread.currentThread().interrupt();
     }
     return false;
   }
-
 }

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/IntegrationTestServiceLauncher.java

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
 import org.hypertrace.core.serviceframework.config.ConfigClient;
 import org.hypertrace.core.serviceframework.config.IntegrationTestConfigClientFactory;
 import org.slf4j.Logger;
@@ -26,7 +25,7 @@ public static void launchService(Optional<String> testName, String serviceName)
     try {
       LOGGER.info("Trying to start PlatformService: {}", serviceName);
       final ConfigClient configClient =
-              IntegrationTestConfigClientFactory.getConfigClientForService(testName, serviceName);
+          IntegrationTestConfigClientFactory.getConfigClientForService(testName, serviceName);
       PlatformService app = PlatformServiceFactory.get(configClient);
       app.initialize();
       Runtime.getRuntime().addShutdownHook(new Thread(app::shutdown));

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/config/IntegrationTestConfigClient.java

@@ -36,7 +36,8 @@ public Config getConfig() {
 
   @Override
   public Config getConfig(String service, String cluster, String pod, String container) {
-    return defaultTestName.map(testName -> loadConfig(service, testName))
+    return defaultTestName
+        .map(testName -> loadConfig(service, testName))
         .orElse(ConfigFactory.empty())
         .withFallback(loadConfig(service, cluster, pod))
         .withFallback(loadConfig(service, cluster))

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/config/IntegrationTestConfigClientFactory.java

@@ -1,20 +1,19 @@
 package org.hypertrace.core.serviceframework.config;
 
-import org.hypertrace.core.serviceframework.IntegrationTestServiceLauncher;
-
 import java.util.Optional;
+import org.hypertrace.core.serviceframework.IntegrationTestServiceLauncher;
 
 /**
- * Used by {@link IntegrationTestServiceLauncher} to initialize
- * the config client for the respective service
- * Config is loaded from resources/config/application.conf
+ * Used by {@link IntegrationTestServiceLauncher} to initialize the config client for the respective
+ * service Config is loaded from resources/config/application.conf
  */
 public class IntegrationTestConfigClientFactory {
   public static ConfigClient getConfigClientForService(String serviceName) {
     return new IntegrationTestConfigClient(serviceName);
   }
 
-  public static ConfigClient getConfigClientForService(Optional<String> testName, String serviceName) {
+  public static ConfigClient getConfigClientForService(
+      Optional<String> testName, String serviceName) {
     return new IntegrationTestConfigClient(testName, serviceName);
   }
-}
+}

platform-grpc-service-framework/src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java

@@ -13,6 +13,7 @@
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;
 import io.micrometer.core.instrument.binder.grpc.MetricCollectingClientInterceptor;
+import io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -25,8 +26,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import io.micrometer.core.instrument.binder.grpc.MetricCollectingServerInterceptor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.hypertrace.core.grpcutils.client.GrpcRegistryConfig;

platform-http-service-framework/build.gradle.kts

@@ -20,5 +20,4 @@ dependencies {
 
   annotationProcessor("org.projectlombok:lombok:1.18.24")
   compileOnly("org.projectlombok:lombok:1.18.24")
-
 }

platform-metrics/README.md

@@ -4,13 +4,13 @@ Platform metrics library is a utility library to help with:
  * Make it easy to collect custom metrics in the service code very easily
  * Report all the metrics to either monitoring backends like Prometheus or
    log them to files, so that we can have access to metrics in all environments
-   
+
 The metric backends, report interval, and the default tags for all the metrics
 are configurable. Different reporters supported are:
  * prometheus
  * logging --> to log metrics into log files or console
  * testing --> in-memory reporter. Purely for unit tests.
- 
+
 The default metrics backend is "prometheus" with 30s reporting interval.
 
 ## Usage

platform-metrics/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   implementation("io.prometheus:simpleclient_servlet:0.12.0")
   implementation("io.prometheus:simpleclient_pushgateway:0.12.0")
   implementation("org.eclipse.jetty:jetty-servlet:9.4.48.v20220622")
-  implementation ("com.google.guava:guava:30.1.1-jre")
+  implementation("com.google.guava:guava:30.1.1-jre")
 
   testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
   testImplementation("org.mockito:mockito-core:4.8.0")