removeUnusedPrivateMethods

build.gradle

@@ -48,26 +48,26 @@ import java.nio.charset.StandardCharsets
 import static org.opensearch.gradle.util.GradleUtils.maybeConfigure
 
 plugins {
+  id "test-report-aggregation"
+  id 'jacoco-report-aggregation'
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "6.25.0" apply false
-  id "org.openrewrite.rewrite" version "7.11.0" apply false
+  id "com.diffplug.spotless" version "7.1.0" apply false
   id "org.gradle.test-retry" version "1.6.2" apply false
-  id "test-report-aggregation"
-  id 'jacoco-report-aggregation'
+  id "org.openrewrite.rewrite" version "7.11.0" apply false
 }
 
 apply from: 'gradle/build-complete.gradle'
-apply from: 'gradle/runtime-jdk-provision.gradle'
-apply from: 'gradle/ide.gradle'
+apply from: 'gradle/code-convention.gradle'
+apply from: 'gradle/code-coverage.gradle'
 apply from: 'gradle/forbidden-dependencies.gradle'
 apply from: 'gradle/formatting.gradle'
-apply from: 'gradle/rewrite.gradle'
+apply from: 'gradle/ide.gradle'
 apply from: 'gradle/local-distribution.gradle'
-apply from: 'gradle/run.gradle'
 apply from: 'gradle/missing-javadoc.gradle'
-apply from: 'gradle/code-coverage.gradle'
+apply from: 'gradle/run.gradle'
+apply from: 'gradle/runtime-jdk-provision.gradle'
 
 // common maven publishing configuration
 allprojects {

client/sniffer/licenses/jackson-core-2.17.3.jar.sha1

@@ -0,0 +1 @@
+1d6eb3e959c737692b720d3492b2f1f34c4c8579

gradle.properties

@@ -14,7 +14,7 @@ org.gradle.caching=true
 org.gradle.warning.mode=none
 org.gradle.parallel=true
 # https://github.com/openrewrite/rewrite-gradle-plugin/issues/212
-#org.gradle.workers.max=3
+org.gradle.workers.max=3
 org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Xss2m \
     --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
     --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \

gradle/code-convention.gradle

@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.opensearch.gradle.BuildPlugin
+
+import static java.lang.System.getenv
+
+allprojects {
+  plugins.withType(BuildPlugin).whenPluginAdded {
+    project.apply plugin: "org.openrewrite.rewrite"
+    rewrite {
+      activeRecipe("org.opensearch.openrewrite.recipe.CodeCleanup")
+      configFile = file("$rootDir/gradle/code-convention.yml")
+      exclusions.add("**OpenSearchTestCaseTests.java")
+      exclusions.add("**/simple-bulk11.json")
+      exclusions.add("**/simple-msearch5.json")
+      exclusions.add("**AbstractBenchmark.java")
+      exclusions.add("**ScriptClassPathResolutionContext.java")
+      exclusions.add("**StarTreeMapper.java")
+      failOnDryRunResults = true
+    }
+    repositories {
+      mavenCentral()
+    }
+    dependencies {
+      rewrite("org.openrewrite.recipe:rewrite-rewrite:0.9.0")
+      rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.12.0")
+    }
+    tasks {
+      if (getenv("dogFoodDev")) {
+        assemble {
+          dependsOn(rewriteRun)
+        }
+      }
+      if (!getenv("skipDogFood")) {
+        check {
+          dependsOn(rewriteDryRun)
+        }
+      }
+    }
+  }
+}

gradle/code-convention.yml

@@ -0,0 +1,15 @@
+type: specs.openrewrite.org/v1beta/recipe
+name: org.opensearch.openrewrite.recipe.CodeCleanup
+displayName: CodeCleanup
+description: Automatically cleanup code, e.g. remove unnecessary parentheses, simplify expressions.
+recipeList:
+  - org.openrewrite.java.RemoveUnusedImports
+  - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
+#  - org.openrewrite.text.EndOfLineAtEndOfFile
+#  - org.openrewrite.java.OrderImports
+#  - org.openrewrite.java.format.RemoveTrailingWhitespace
+#  - org.openrewrite.staticanalysis.EmptyBlock
+#  - org.openrewrite.staticanalysis.RemoveCallsToSystemGc
+#  - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
+#  - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
+#  - org.openrewrite.staticanalysis.UnnecessaryThrows

gradle/formatting.gradle

@@ -30,81 +30,56 @@
 
 import org.opensearch.gradle.BuildPlugin
 
-/*
- * This script plugin configures formatting for Java source using Spotless
- * for Gradle. Since the act of formatting existing source can interfere
- * with developers' workflows, we don't automatically format all code
- * (yet). Instead, we maintain a list of projects that are excluded from
- * formatting, until we reach a point where we can comfortably format them
- * in one go without too much disruption.
- *
- * Any new sub-projects must not be added to the exclusions list!
- *
- * To perform a reformat, run:
- *
- *     ./gradlew spotlessApply
- *
- * To check the current format, run:
- *
- *     ./gradlew spotlessJavaCheck
- *
- * This is also carried out by the `precommit` task.
- *
- * For more about Spotless, see:
- *
- * https://github.com/diffplug/spotless/tree/master/plugin-gradle
- */
+import static java.lang.System.getenv
 
 allprojects {
   plugins.withType(BuildPlugin).whenPluginAdded {
-      project.apply plugin: "com.diffplug.spotless"
-
-      spotless {
-        java {
-          // Normally this isn't necessary, but we have Java sources in
-          // non-standard places
-          target '**/*.java'
-
-          importOrder(
-              'de.thetaphi',
-              'com.carrotsearch',
-              'com.fasterxml',
-              'com.avast',
-              'com.sun',
-              'com.maxmind|com.github|com.networknt|groovy|nebula',
-              'org.antlr',
-              'software.amazon',
-              'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit',
-              'javax',
-              'java',
-              '',
-              '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#'
-          )
-
-          eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('buildSrc/formatterConfig.xml')
-          endWithNewline()
-
-          custom 'Refuse wildcard imports', {
-                // Wildcard imports can't be resolved; fail the build
-                if (it =~ /\s+import .*\*;/) {
-                    throw new AssertionError("Do not use wildcard imports.  'spotlessApply' cannot resolve this issue.")
-                }
-          }
-
-          // See DEVELOPER_GUIDE.md for details of when to enable this.
-          if (System.getProperty('spotless.paddedcell') != null) {
-            paddedCell()
-          }
+    project.apply plugin: "com.diffplug.spotless"
+    spotless {
+      java {
+        // Normally this isn't necessary, but we have Java sources in
+        // non-standard places
+        target '**/*.java'
+        importOrder(
+          'de.thetaphi',
+          'com.carrotsearch',
+          'com.fasterxml',
+          'com.avast',
+          'com.sun',
+          'com.maxmind|com.github|com.networknt|groovy|nebula',
+          'org.antlr',
+          'software.amazon',
+          'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit',
+          'javax',
+          'java',
+          '',
+          '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#'
+        )
+        eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('buildSrc/formatterConfig.xml')
+        endWithNewline()
+        removeWildcardImports()
+        // See DEVELOPER_GUIDE.md for details of when to enable this.
+        if (System.getProperty('spotless.paddedcell') != null) {
+          paddedCell()
         }
-        format 'misc', {
-            target '*.md', '*.gradle', '**/*.json', '**/*.yaml', '**/*.yml', '**/*.svg'
-
-            targetExclude '**/simple-bulk11.json', '**/simple-msearch5.json'
-
-            endWithNewline()
+      }
+      format 'misc', {
+        target '*.md', '*.gradle', '**/*.json', '**/*.yaml', '**/*.yml', '**/*.svg'
+        targetExclude '**/simple-bulk11.json', '**/simple-msearch5.json'
+        endWithNewline()
+      }
+    }
+    tasks {
+      if (getenv("dogFoodDev")) {
+        assemble {
+          dependsOn(spotlessJavaApply)
         }
       }
-
-      precommit.dependsOn 'spotlessJavaCheck'
+      if (!getenv("skipDogFood")) {
+        check {
+          dependsOn(spotlessJavaCheck)
+        }
+      }
+    }
   }
 }

libs/core/licenses/jackson-core-2.17.3.jar.sha1

@@ -0,0 +1 @@
+1d6eb3e959c737692b720d3492b2f1f34c4c8579

libs/task-commons/src/main/java/org/opensearch/task/commons/clients/TaskListRequest.java

@@ -71,16 +71,6 @@ public TaskListRequest taskType(TaskStatus... taskStatus) {
         return this;
     }
 
-    /**
-     * Update worker node to filter with in the request
-     * @param workerNode WorkerNode
-     * @return ListTaskRequest
-     */
-    private TaskListRequest workerNode(WorkerNode workerNode) {
-        this.workerNodes = workerNode;
-        return this;
-    }
-
     /**
      * Update page number to start with when fetching the list of tasks
      * @param startPageNumber startPageNumber

libs/x-content/licenses/jackson-core-2.17.3.jar.sha1

@@ -0,0 +1 @@
+1d6eb3e959c737692b720d3492b2f1f34c4c8579

libs/x-content/licenses/jackson-dataformat-cbor-2.17.3.jar.sha1

@@ -0,0 +1 @@
+5286b5df35824b8c2a8ceae9a54e99dca9220e15

libs/x-content/licenses/jackson-dataformat-smile-2.17.3.jar.sha1

@@ -0,0 +1 @@
+cd19020c7bace93ce269e85ac6fee782a6bf4e16

libs/x-content/licenses/jackson-dataformat-yaml-2.17.3.jar.sha1

@@ -0,0 +1 @@
+536e9d9ee966cf40a8b5d2f9ba505551364d0ad5

modules/cache-common/src/test/java/org/opensearch/cache/common/tier/TieredSpilloverCacheTests.java

@@ -2600,17 +2600,6 @@ private TieredSpilloverCache<String, String> getTieredSpilloverCache(
         return builder.build();
     }
 
-    private TieredSpilloverCache<String, String> initializeTieredSpilloverCache(
-        int keyValueSize,
-        int diskCacheSize,
-        RemovalListener<ICacheKey<String>, String> removalListener,
-        Settings settings,
-        long diskDeliberateDelay
-
-    ) {
-        return initializeTieredSpilloverCache(keyValueSize, diskCacheSize, removalListener, settings, diskDeliberateDelay, null, 256);
-    }
-
     private TieredSpilloverCache<String, String> initializeTieredSpilloverCache(
         int keyValueSize,
         int diskCacheSize,

modules/ingest-geoip/licenses/jackson-annotations-2.17.3.jar.sha1

@@ -0,0 +1 @@
+4f30a05d2eee0ab700cdc27aa5967e934d3042b2

modules/ingest-geoip/licenses/jackson-databind-2.17.3.jar.sha1

@@ -0,0 +1 @@
+42c617beb411ee813bdc39a287424bfb19d99185

modules/ingest-geoip/licenses/jackson-datatype-jsr310-2.17.3.jar.sha1

@@ -0,0 +1 @@
+a25fe2f5607fea9e00ed00cf81b7aa2eaacbbd6e

modules/lang-expression/licenses/asm-9.8.jar.sha1

@@ -0,0 +1 @@
+dc19ecb3f7889b7860697215cae99c0f9b6f6b4b

modules/lang-painless/licenses/asm-9.8.jar.sha1

@@ -0,0 +1 @@
+dc19ecb3f7889b7860697215cae99c0f9b6f6b4b

modules/lang-painless/licenses/asm-util-9.8.jar.sha1

@@ -0,0 +1 @@
+395f1c1f035258511f27bc9b2583d76e4b143f59

plugins/arrow-flight-rpc/licenses/error_prone_annotations-2.36.0.jar.sha1

@@ -0,0 +1 @@
+227d4d4957ccc3dc5761bd897e3a0ee587e750a7

plugins/arrow-flight-rpc/licenses/jackson-annotations-2.17.3.jar.sha1

@@ -0,0 +1 @@
+4f30a05d2eee0ab700cdc27aa5967e934d3042b2

plugins/arrow-flight-rpc/licenses/jackson-databind-2.17.3.jar.sha1

@@ -0,0 +1 @@
+42c617beb411ee813bdc39a287424bfb19d99185

plugins/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightClientManager.java

@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -247,10 +246,6 @@ private static boolean isValidNode(DiscoveryNode node) {
         return node != null && !node.getVersion().before(MIN_SUPPORTED_VERSION) && FeatureFlags.isEnabled(ARROW_STREAMS_SETTING);
     }
 
-    private Set<String> getCurrentClusterNodes() {
-        return Objects.requireNonNull(clientConfig.clusterService).state().nodes().getNodes().keySet();
-    }
-
     @VisibleForTesting
     Map<String, ClientHolder> getFlightClients() {
         return flightClients;

plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/impl/BaseFlightProducerTests.java

@@ -566,8 +566,9 @@ public void testGetFlightInfo_LocationNotFound() {
     }
 
     public void testGetFlightInfo_SchemaError() {
-        when(streamManager.getStreamProducer(any(FlightStreamTicket.class)))
-            .thenReturn(Optional.of(FlightStreamManager.StreamProducerHolder.create(streamProducer, allocator)));
+        when(streamManager.getStreamProducer(any(FlightStreamTicket.class))).thenReturn(
+            Optional.of(FlightStreamManager.StreamProducerHolder.create(streamProducer, allocator))
+        );
         Location location = Location.forGrpcInsecure("localhost", 8815);
         when(flightClientManager.getFlightClientLocation(LOCAL_NODE_ID)).thenReturn(Optional.of(location));
         when(streamProducer.createRoot(allocator)).thenReturn(mock(VectorSchemaRoot.class));

plugins/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/impl/FlightStreamReaderTests.java

@@ -58,7 +58,7 @@ public void tearDown() throws Exception {
     public void testNext_ReturnsTrue_WhenFlightStreamHasNext() throws Exception {
         when(mockFlightStream.next()).thenReturn(true);
         assertTrue(iterator.next());
-        assert(mockFlightStream).next();
+        assert (mockFlightStream).next();
     }
 
     public void testNext_ReturnsFalse_WhenFlightStreamHasNoNext() throws Exception {