Style and vulns (#75)

* style: enforce style

* chore: update vulnerable dependencies

Author: aaron-steinfeld

build.gradle.kts

@@ -4,12 +4,14 @@ plugins {
   id("org.hypertrace.jacoco-report-plugin") version "0.1.3" apply false
   id("org.hypertrace.docker-java-application-plugin") version "0.8.1" apply false
   id("org.hypertrace.docker-publish-plugin") version "0.8.1" apply false
+  id("org.hypertrace.code-style-plugin") version "1.0.2" apply false
 }
 
 subprojects {
   group = "org.hypertrace.graphql"
 
   pluginManager.withPlugin("java") {
+    apply(plugin = "org.hypertrace.code-style-plugin")
     configure<JavaPluginExtension> {
       sourceCompatibility = JavaVersion.VERSION_11
       targetCompatibility = JavaVersion.VERSION_11

hypertrace-core-graphql

@@ -38,4 +38,4 @@ dependencies {
 
 tasks.test {
   useJUnitPlatform()
-}
+}

hypertrace-graphql-entity-schema/build.gradle.kts

@@ -76,7 +76,10 @@ protected void configure() {
         Key.get(
             new TypeLiteral<
                 TriConverter<
-                    Collection<MetricRequest>, Entity, BaselineEntity, Map<String, MetricContainer>>>() {}));
+                    Collection<MetricRequest>,
+                    Entity,
+                    BaselineEntity,
+                    Map<String, MetricContainer>>>() {}));
 
     requireBinding(
         Key.get(

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/EntityDaoModule.java

@@ -1,7 +1,16 @@
 package org.hypertrace.graphql.entity.dao;
 
+import static io.reactivex.rxjava3.core.Single.zip;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.hypertrace.core.graphql.common.utils.CollectorUtils.flatten;
+
 import io.grpc.CallCredentials;
 import io.reactivex.rxjava3.core.Single;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.hypertrace.core.graphql.common.utils.Converter;
 import org.hypertrace.core.graphql.context.GraphQlRequestContext;
 import org.hypertrace.core.graphql.spi.config.GraphQlServiceConfig;
@@ -22,14 +31,6 @@
 import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.request.MetricSeriesRequest;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Collection;
-import java.util.Set;
-import java.util.stream.Collectors;
-import static io.reactivex.rxjava3.core.Single.zip;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.hypertrace.core.graphql.common.utils.CollectorUtils.flatten;
 
 @Singleton
 class GatewayBaselineDao implements BaselineDao {

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayBaselineDao.java

@@ -6,7 +6,6 @@
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -35,10 +34,10 @@ class GatewayServiceEntityConverter {
       attributeMapConverter;
 
   private final TriConverter<
-            Collection<MetricRequest>,
-            org.hypertrace.gateway.service.v1.entity.Entity,
-            BaselineEntity,
-            Map<String, MetricContainer>>
+          Collection<MetricRequest>,
+          org.hypertrace.gateway.service.v1.entity.Entity,
+          BaselineEntity,
+          Map<String, MetricContainer>>
       metricContainerConverter;
   private final GatewayServiceEntityEdgeLookupConverter edgeLookupConverter;
 
@@ -66,7 +65,10 @@ Single<EntityResultSet> convert(
   }
 
   private Single<EntityResultSet> convert(
-          EntityRequest request, EntitiesResponse response, BaselineEntitiesResponse baselineResponse, EdgeLookup edgeLookup) {
+      EntityRequest request,
+      EntitiesResponse response,
+      BaselineEntitiesResponse baselineResponse,
+      EdgeLookup edgeLookup) {
     Map<String, BaselineEntity> baselineEntityMap = getBaselineEntityMap(baselineResponse);
     return Observable.fromIterable(response.getEntityList())
         .flatMapSingle(
@@ -90,9 +92,10 @@ private BaselineEntity getBaselineEntity(
         : BaselineEntity.getDefaultInstance();
   }
 
-  private Map<String, BaselineEntity> getBaselineEntityMap(BaselineEntitiesResponse baselineResponse) {
-    return baselineResponse.getBaselineEntityList().stream().collect(Collectors.toMap(BaselineEntity::getId,
-            entity -> entity));
+  private Map<String, BaselineEntity> getBaselineEntityMap(
+      BaselineEntitiesResponse baselineResponse) {
+    return baselineResponse.getBaselineEntityList().stream()
+        .collect(Collectors.toMap(BaselineEntity::getId, entity -> entity));
   }
 
   private Single<Entity> convertEntity(

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityConverter.java

@@ -40,7 +40,7 @@ class GatewayServiceEntityEdgeFetcher {
           Collection<MetricAggregationRequest>,
           Map<String, AggregatedMetricValue>,
           Map<String, BaselinedMetricAggregationContainer>>
-          baselineMetricAggregationContainerMapConverter;
+      baselineMetricAggregationContainerMapConverter;
 
   @Inject
   GatewayServiceEntityEdgeFetcher(
@@ -51,10 +51,11 @@ class GatewayServiceEntityEdgeFetcher {
               Collection<MetricAggregationRequest>,
               Map<String, AggregatedMetricValue>,
               Map<String, BaselinedMetricAggregationContainer>>
-              baselineMetricAggregationContainerMapConverter) {
+          baselineMetricAggregationContainerMapConverter) {
     this.neighborMapFetcher = neighborMapFetcher;
     this.attributeMapConverter = attributeMapConverter;
-    this.baselineMetricAggregationContainerMapConverter = baselineMetricAggregationContainerMapConverter;
+    this.baselineMetricAggregationContainerMapConverter =
+        baselineMetricAggregationContainerMapConverter;
   }
 
   Single<Map<org.hypertrace.gateway.service.v1.entity.Entity, EdgeResultSet>> fetchForEntityType(

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityEdgeFetcher.java

@@ -18,7 +18,6 @@
 import org.hypertrace.graphql.entity.dao.GatewayServiceEntityEdgeLookupConverter.EdgeLookup;
 import org.hypertrace.graphql.entity.request.EntityRequest;
 import org.hypertrace.graphql.entity.schema.EdgeResultSet;
-import org.hypertrace.graphql.entity.schema.EntityType;
 
 class GatewayServiceEntityEdgeLookupConverter
     implements BiConverter<EntityRequest, EntitiesResponse, EdgeLookup> {

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/dao/GatewayServiceEntityEdgeLookupConverter.java

@@ -4,7 +4,6 @@
 import java.util.Collection;
 import java.util.Set;
 import org.hypertrace.core.graphql.common.request.AttributeRequest;
-import org.hypertrace.graphql.entity.schema.EntityType;
 import org.hypertrace.graphql.metric.request.MetricAggregationRequest;
 
 public interface EdgeSetGroupRequest {

hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/request/EdgeSetGroupRequest.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 import org.hypertrace.core.graphql.common.request.ResultSetRequest;
-import org.hypertrace.graphql.entity.schema.EntityType;
 import org.hypertrace.graphql.metric.request.MetricRequest;
 import org.hypertrace.graphql.metric.schema.argument.AggregatableOrderArgument;