Add JDK-21 to Github actions

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Feb 6, 2024 · 2ca1f59 · 2ca1f59
1 parent 344cae1
commit 2ca1f59
Show file tree

Hide file tree

Showing 522 changed files with 157 additions and 566 deletions.
diff --git a/.github/workflows/gauntlet-tests-workflow.yml b/.github/workflows/gauntlet-tests-workflow.yml
@@ -17,6 +17,7 @@ jobs:
       matrix:
         java:
           - 17
+          - 21
     steps:
     - name: Set up JDK
       uses: actions/setup-java@v1

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,6 +15,7 @@ jobs:
       matrix:
         java:
           - 17
+          - 21
       fail-fast: false
     runs-on: [ubuntu-latest]
     name: Building RCA package

diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ plugins {
     id "de.undercouch.download" version "5.5.0"
     id 'com.adarshr.test-logger' version '4.0.0'
     id 'org.gradle.test-retry' version '1.5.8'
-    id 'com.diffplug.spotless' version '5.11.0'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 application {
@@ -87,7 +87,7 @@ distributions {
 spotless {
     java {
         licenseHeaderFile(file('license-header'))
-        googleJavaFormat('1.12.0').aosp()
+        googleJavaFormat('1.17.0').aosp()
         importOrder()
         removeUnusedImports()
         trimTrailingWhitespace()

diff --git a/src/main/java/org/opensearch/performanceanalyzer/AppContext.java b/src/main/java/org/opensearch/performanceanalyzer/AppContext.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java b/src/main/java/org/opensearch/performanceanalyzer/CertificateUtils.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import java.io.File;
 import java.io.FileReader;
 import java.security.KeyStore;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/ClientServers.java b/src/main/java/org/opensearch/performanceanalyzer/ClientServers.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import com.sun.net.httpserver.HttpServer;
 import org.opensearch.performanceanalyzer.net.NetClient;
 import org.opensearch.performanceanalyzer.net.NetServer;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/DBUtils.java b/src/main/java/org/opensearch/performanceanalyzer/DBUtils.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/LocalhostConnectionUtil.java b/src/main/java/org/opensearch/performanceanalyzer/LocalhostConnectionUtil.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import io.netty.handler.codec.http.HttpMethod;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -65,7 +64,7 @@ public static void disablePA() throws InterruptedException {
     public static class ClusterSettings {
         static List<String> clusterSettings = new ArrayList<>();
 
-        public final static String SETTING_NOT_FOUND = "NULL";
+        public static final String SETTING_NOT_FOUND = "NULL";
 
         static final String CLUSTER_SETTINGS_URL =
                 "/_cluster/settings?flat_settings=true&include_defaults=true&pretty";

diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerApp.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.sun.net.httpserver.HttpServer;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerThreads.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode;
 
 /**

diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerWebServer.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
@@ -32,6 +31,7 @@ public class PerformanceAnalyzerWebServer {
 
     @VisibleForTesting
     public static final String WEBSERVICE_BIND_HOST_NAME = "webservice-bind-host";
+
     // Use system default for max backlog.
     private static final int INCOMING_QUEUE_LENGTH = 1;
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSet.java b/src/main/java/org/opensearch/performanceanalyzer/collections/TimeExpiringSet.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.collections;
 
-
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import java.util.Iterator;

diff --git a/...main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java b/...main/java/org/opensearch/performanceanalyzer/config/overrides/ConfigOverridesApplier.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.config.overrides;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.util.HashSet;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/core/Util.java b/src/main/java/org/opensearch/performanceanalyzer/core/Util.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.core;
 
-
 import java.io.File;
 import java.security.AccessController;
 import java.security.PrivilegedAction;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/Action.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/Action.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import java.util.List;
 import java.util.Map;
 import org.opensearch.performanceanalyzer.rca.store.rca.cluster.NodeKey;

diff --git a/...java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java b/...java/org/opensearch/performanceanalyzer/decisionmaker/actions/HeapSizeIncreaseAction.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.util.HashMap;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/ImpactVector.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/actions/JvmGenAction.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.util.HashMap;

diff --git a/...va/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java b/...va/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyCacheMaxSizeAction.java
@@ -305,6 +305,7 @@ public static class Summary {
 
         @SerializedName(value = CURRENT_MAX_SIZE)
         private long currentCacheMaxSizeInBytes;
+
         // TODO: remove coolOffPeriodInMillis and canUpdate from summary
         //  as those already exist in baseline action object
         @SerializedName(value = COOL_OFF_PERIOD)

diff --git a/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java b/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/ModifyQueueCapacityAction.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -274,6 +273,7 @@ public static class Summary {
 
         @SerializedName(value = CURRENT_CAPACITY)
         private int currentCapacity;
+
         // TODO: remove coolOffPeriodInMillis and canUpdate from summary
         //  as those already exist in baseline action object
         @SerializedName(value = COOL_OFF_PERIOD)

diff --git a/...va/org/opensearch/performanceanalyzer/decisionmaker/actions/SearchBackPressureAction.java b/...va/org/opensearch/performanceanalyzer/decisionmaker/actions/SearchBackPressureAction.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;

diff --git a/...ain/java/org/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java b/...ain/java/org/opensearch/performanceanalyzer/decisionmaker/actions/SuppressibleAction.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import org.opensearch.performanceanalyzer.AppContext;
 
 /** Actions that can be suppressed through a config. */

diff --git a/.../java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java b/.../java/org/opensearch/performanceanalyzer/decisionmaker/actions/TimedFlipFlopDetector.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions;
 
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

diff --git a/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java b/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/CacheActionConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java b/...a/org/opensearch/performanceanalyzer/decisionmaker/actions/configs/QueueActionConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.actions.configs;
 
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java b/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/CacheHealthDecider.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decider.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.performanceanalyzer.commons.stats.ServiceMetrics;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Decision.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/DecisionPolicy.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import java.util.List;
 import org.opensearch.performanceanalyzer.decisionmaker.actions.Action;
 

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/EmptyFlowUnit.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import org.opensearch.performanceanalyzer.grpc.FlowUnitMessage;
 import org.opensearch.performanceanalyzer.rca.framework.core.GenericFlowUnit;
 import org.opensearch.performanceanalyzer.rca.framework.util.InstanceDetails;

diff --git a/...main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java b/...main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/HeapBasedDecider.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import com.google.common.collect.ImmutableMap;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java b/src/main/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/Publisher.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Instant;
 import java.util.ArrayList;

diff --git a/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java b/...in/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/QueueHealthDecider.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders;
 
-
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;

diff --git a/...ain/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java b/...ain/java/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/Collator.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
-
 import com.google.common.annotations.VisibleForTesting;
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/.../org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java b/.../org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessment.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...va/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java b/...va/org/opensearch/performanceanalyzer/decisionmaker/deciders/collator/ImpactAssessor.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.collator;
 
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/...ensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java b/...ensearch/performanceanalyzer/decisionmaker/deciders/configs/CachePriorityOrderConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java b/...java/org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/DeciderConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
-
 import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.OldGenDecisionPolicyConfig;
 import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen.JvmGenTuningPolicyConfig;
 import org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.searchbackpressure.SearchBackPressurePolicyConfig;

diff --git a/...org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java b/...org/opensearch/performanceanalyzer/decisionmaker/deciders/configs/WorkLoadTypeConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs;
 
-
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;
 import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 

diff --git a/...h/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java b/...h/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelOneActionBuilderConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
-
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;
 import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 

diff --git a/...performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java b/...performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelThreeActionBuilderConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
-
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;
 import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 

diff --git a/...h/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java b/...h/performanceanalyzer/decisionmaker/deciders/configs/jvm/LevelTwoActionBuilderConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
-
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;
 import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 

diff --git a/...ch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java b/...ch/performanceanalyzer/decisionmaker/deciders/configs/jvm/OldGenDecisionPolicyConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm;
 
-
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;
 import org.opensearch.performanceanalyzer.rca.framework.core.NestedConfig;
 

diff --git a/...rmanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java b/...rmanceanalyzer/decisionmaker/deciders/configs/jvm/young_gen/JvmGenTuningPolicyConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.jvm.young_gen;
 
-
 import java.util.concurrent.TimeUnit;
 import org.opensearch.performanceanalyzer.decisionmaker.deciders.jvm.JvmGenTuningPolicy;
 import org.opensearch.performanceanalyzer.rca.framework.core.Config;

diff --git a/...zer/decisionmaker/deciders/configs/searchbackpressure/SearchBackPressurePolicyConfig.java b/...zer/decisionmaker/deciders/configs/searchbackpressure/SearchBackPressurePolicyConfig.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.performanceanalyzer.decisionmaker.deciders.configs.searchbackpressure;
 
-
 import java.util.concurrent.TimeUnit;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ jobs: @@
           matrix:
             java:
               - 17
+              - 21
         steps:
         - name: Set up JDK
           uses: actions/setup-java@v1
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@

		package org.opensearch.performanceanalyzer;


		import org.opensearch.performanceanalyzer.commons.stats.metrics.StatExceptionCode;

		/**
Expand Down