[prone] Add error-prone.picnic.tech featuring RedundantStringConversion

Signed-off-by: Vincent Potucek <[email protected]>

Author: Vincent Potucek

.github/workflows/precommit.yml

@@ -1,4 +1,4 @@
-name: Gradle Precommit
+name: Gradle PreCommit
 on: [pull_request]
 
 jobs:
@@ -21,8 +21,11 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: temurin
           cache: gradle
-      - name: Run Gradle (precommit)
+      - name: Run Gradle (pre-commit)
         continue-on-error: ${{ matrix.experimental }}
         shell: bash
-        run: |
-          ./gradlew javadoc precommit --parallel
+        run: ./gradlew javadoc precommit --parallel
+      - name: Run Gradle (sanity-check)
+        continue-on-error: ${{ matrix.experimental }}
+        shell: bash
+        run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx8G

CHANGELOG.md

@@ -20,6 +20,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add build-tooling to run in FIPS environment ([#18921](https://github.com/opensearch-project/OpenSearch/pull/18921))
 - Add SMILE/CBOR/YAML document format support to Bulk GRPC endpoint ([#19744](https://github.com/opensearch-project/OpenSearch/pull/19744))
 - Implement GRPC ConstantScoreQuery, FuzzyQuery, MatchBoolPrefixQuery, MatchPhrasePrefix, PrefixQuery, MatchQuery ([#19854](https://github.com/opensearch-project/OpenSearch/pull/19854))
+- [rewrite] Add `GradleBestPractices` ([#19885](https://github.com/opensearch-project/OpenSearch/pull/19885))
+- [prone] Add `error-prone.picnic.tech` featuring `RedundantStringConversion` ([#18791](https://github.com/opensearch-project/OpenSearch/pull/18791))
 
 ### Changed
 - Faster `terms` query creation for `keyword` field with index and docValues enabled ([#19350](https://github.com/opensearch-project/OpenSearch/pull/19350))

build.gradle

@@ -59,6 +59,8 @@ plugins {
   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.19.0' apply false
+  id 'net.ltgt.errorprone' version '4.3.0' apply false
 }
 
 apply from: 'gradle/build-complete.gradle'
@@ -70,14 +72,12 @@ 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/rewrite.gradle'
 
-// Apply FIPS configuration to all projects
 allprojects {
+  apply from: "$rootDir/gradle/error-prone.gradle"
   apply from: "$rootDir/gradle/fips.gradle"
-}
-
-// common maven publishing configuration
-allprojects {
+  // common maven publishing configuration
   group = 'org.opensearch'
   version = VersionProperties.getOpenSearch()
   description = "OpenSearch subproject ${project.path}"

buildSrc/src/integTest/java/org/opensearch/gradle/tar/SymbolicLinkPreservingTarIT.java

@@ -167,7 +167,7 @@ private void runBuild(final String task, final boolean preserveFileTimestamps) {
             .withProjectDir(getProjectDir())
             .withArguments(
                 task,
-                "-Dtests.symbolic_link_preserving_tar_source=" + temporaryFolder.getRoot().toString(),
+                "-Dtests.symbolic_link_preserving_tar_source=" + temporaryFolder.getRoot(),
                 "-Dtests.symbolic_link_preserving_tar_preserve_file_timestamps=" + preserveFileTimestamps,
                 "-i"
             )

buildSrc/src/main/java/org/opensearch/gradle/ReaperService.java

@@ -190,7 +190,7 @@ private Path locateReaperJar() {
 
     private void ensureReaperAlive() {
         if (reaperProcess.isAlive() == false) {
-            throw new IllegalStateException("Reaper process died unexpectedly! Check the log at " + logFile.toString());
+            throw new IllegalStateException("Reaper process died unexpectedly! Check the log at " + logFile);
         }
     }
 }

buildSrc/src/main/java/org/opensearch/gradle/Version.java

@@ -106,7 +106,7 @@ public static Version fromString(final String s, final Mode mode) {
 
     @Override
     public String toString() {
-        return String.valueOf(getMajor()) + "." + String.valueOf(getMinor()) + "." + String.valueOf(getRevision());
+        return getMajor() + "." + getMinor() + "." + getRevision();
     }
 
     public boolean before(Version compareTo) {

buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionDownloadPlugin.java

@@ -176,9 +176,7 @@ private static String distributionProjectName(OpenSearchDistribution distributio
         switch (distribution.getType()) {
             case ARCHIVE:
                 if (Version.fromString(distribution.getVersion()).onOrAfter("7.0.0")) {
-                    projectName += platform.toString() + archString + (platform == OpenSearchDistribution.Platform.WINDOWS
-                        ? "-zip"
-                        : "-tar");
+                    projectName += platform + archString + (platform == OpenSearchDistribution.Platform.WINDOWS ? "-zip" : "-tar");
                 } else {
                     projectName = "zip";
                 }

buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java

@@ -39,7 +39,7 @@ private void addLocalMavenRepo(Project project) {
             publishing.repositories(repositories -> {
                 repositories.maven(maven -> {
                     maven.setName(STAGING_REPO);
-                    maven.setUrl(buildDirectory.toString() + LOCAL_STAGING_REPO_PATH);
+                    maven.setUrl(buildDirectory + LOCAL_STAGING_REPO_PATH);
                 });
             });
         });

buildSrc/src/main/java/org/opensearch/gradle/precommit/ForbiddenPatternsTask.java

@@ -189,7 +189,7 @@ public void rule(Map<String, String> props) {
             throw new InvalidUserDataException("Missing [pattern] for invalid pattern rule");
         }
         if (props.isEmpty() == false) {
-            throw new InvalidUserDataException("Unknown arguments for ForbiddenPatterns rule mapping: " + props.keySet().toString());
+            throw new InvalidUserDataException("Unknown arguments for ForbiddenPatterns rule mapping: " + props.keySet());
         }
         // TODO: fail if pattern contains a newline, it won't work (currently)
         patterns.put(name, pattern);

buildSrc/src/main/java/org/opensearch/gradle/precommit/ValidateJsonAgainstSchemaTask.java

@@ -148,9 +148,8 @@ public void validate(InputChanges inputChanges) throws IOException {
 
     private void maybeLogAndCollectError(Set<ValidationMessage> messages, Map<File, Set<String>> errors, File file) {
         for (ValidationMessage message : messages) {
-            getLogger().error("[validate JSON][ERROR][{}][{}]", file.getName(), message.toString());
-            errors.computeIfAbsent(file, k -> new LinkedHashSet<>())
-                .add(String.format("%s: %s", file.getAbsolutePath(), message.toString()));
+            getLogger().error("[validate JSON][ERROR][{}][{}]", file.getName(), message);
+            errors.computeIfAbsent(file, k -> new LinkedHashSet<>()).add(String.format("%s: %s", file.getAbsolutePath(), message));
         }
     }
 }