Merge branch 'main' into java_toolchain_21

Author: timtebeek

.github/workflows/ci.yml

@@ -23,8 +23,6 @@ jobs:
     uses: openrewrite/gh-automation/.github/workflows/ci-gradle.yml@main
     secrets:
       gradle_enterprise_access_key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-      gradle_enterprise_cache_username: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
-      gradle_enterprise_cache_password: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
       ossrh_username: ${{ secrets.OSSRH_USERNAME }}
       ossrh_token: ${{ secrets.OSSRH_TOKEN }}
       ossrh_signing_key: ${{ secrets.OSSRH_SIGNING_KEY }}

.github/workflows/comment-pr.yml

@@ -0,0 +1,15 @@
+name: comment-pr
+
+# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+on:
+  workflow_run:
+    workflows: ["receive-pr"]
+    types:
+      - completed
+
+# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+# Since this pull request has write permissions on the target repo, we should **NOT** execute any untrusted code.
+jobs:
+  post-suggestions:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    uses: openrewrite/gh-automation/.github/workflows/comment-pr.yml@main

.github/workflows/receive-pr.yml

@@ -0,0 +1,17 @@
+name: receive-pr
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - main
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.ref }}'
+  cancel-in-progress: true
+
+# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+# Since this pull request receives untrusted code, we should **NOT** have any secrets in the environment.
+jobs:
+  upload-patch:
+    uses: openrewrite/gh-automation/.github/workflows/receive-pr.yml@main

build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     testImplementation("org.projectlombok:lombok:latest.release")
 
     annotationProcessor("org.openrewrite:rewrite-templating:$rewriteVersion")
-    compileOnly("com.google.errorprone:error_prone_core:2.19.1:with-dependencies") {
+    compileOnly("com.google.errorprone:error_prone_core:2.19.1") {
         exclude("com.google.auto.service", "auto-service-annotations")
     }
 
@@ -27,14 +27,8 @@ dependencies {
     implementation("org.openrewrite.recipe:rewrite-github-actions:$rewriteVersion")
     implementation("org.openrewrite.recipe:rewrite-java-dependencies:$rewriteVersion")
     implementation("org.openrewrite.recipe:rewrite-static-analysis:$rewriteVersion")
-    implementation("org.openrewrite.gradle.tooling:model:$rewriteVersion")
     implementation("org.openrewrite:rewrite-templating:$rewriteVersion")
 
-    implementation("commons-io:commons-io:2.+")
-    implementation("org.apache.commons:commons-lang3:3.+")
-    implementation("org.apache.maven.shared:maven-shared-utils:3.+")
-    implementation("org.codehaus.plexus:plexus-utils:3.+")
-
     runtimeOnly("org.openrewrite:rewrite-java-8")
     runtimeOnly("org.openrewrite:rewrite-java-11")
     runtimeOnly("org.openrewrite:rewrite-java-17")
@@ -47,12 +41,11 @@ dependencies {
 
     testImplementation("org.openrewrite:rewrite-test")
     testImplementation("org.openrewrite:rewrite-java-tck")
+    testImplementation("org.openrewrite.gradle.tooling:model:$rewriteVersion")
 
     testImplementation("org.assertj:assertj-core:latest.release")
 
-    testImplementation("com.google.guava:guava:29.0-jre")
-
-    testImplementation("commons-codec:commons-codec:1.+")
+    testImplementation("com.google.guava:guava:33.0.0-jre")
 
     testRuntimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr353")
     testRuntimeOnly("com.fasterxml.jackson.core:jackson-core")

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -8,19 +8,12 @@ plugins {
 gradleEnterprise {
     val isCiServer = System.getenv("CI")?.equals("true") ?: false
     server = "https://ge.openrewrite.org/"
-    val gradleCacheRemoteUsername: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
-    val gradleCacheRemotePassword: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
 
     buildCache {
-        remote(HttpBuildCache::class) {
-            url = uri("https://ge.openrewrite.org/cache/")
-            isPush = isCiServer
-            if (!gradleCacheRemoteUsername.isNullOrBlank() && !gradleCacheRemotePassword.isNullOrBlank()) {
-                credentials {
-                    username = gradleCacheRemoteUsername
-                    password = gradleCacheRemotePassword
-                }
-            }
+        remote(gradleEnterprise.buildCache) {
+            isEnabled = true
+            val accessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY")
+            isPush = isCiServer && !accessKey.isNullOrBlank()
         }
     }
 

settings.gradle.kts

@@ -32,7 +32,7 @@
 @Incubating(since = "0.2.0")
 @Getter
 @RequiredArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class AddSuppressionForIllegalReflectionWarningsPlugin extends Recipe {
 
     private static final XPathMatcher PACKAGING_MATCHER = new XPathMatcher("/project/packaging");

src/main/java/org/openrewrite/java/migrate/AddSuppressionForIllegalReflectionWarningsPlugin.java

@@ -29,7 +29,7 @@
 import java.util.regex.Pattern;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class BeanDiscovery extends Recipe {
 
     private static final XPathMatcher BEANS_MATCHER = new XPathMatcher("/beans");

src/main/java/org/openrewrite/java/migrate/BeanDiscovery.java

@@ -28,7 +28,7 @@
 import static java.util.stream.Collectors.toMap;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class BeansXmlNamespace extends Recipe {
 
     private static final XPathMatcher BEANS_MATCHER = new XPathMatcher("/beans");

src/main/java/org/openrewrite/java/migrate/BeansXmlNamespace.java

@@ -52,8 +52,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
 
     private static class CastArraysAsListToListVisitor extends JavaVisitor<ExecutionContext> {
         @Override
-        public J visitTypeCast(J.TypeCast typeCast, ExecutionContext executionContext) {
-            J j = super.visitTypeCast(typeCast, executionContext);
+        public J visitTypeCast(J.TypeCast typeCast, ExecutionContext ctx) {
+            J j = super.visitTypeCast(typeCast, ctx);
             if (!(j instanceof J.TypeCast) || !(((J.TypeCast) j).getType() instanceof JavaType.Array)) {
                 return j;
             }

src/main/java/org/openrewrite/java/migrate/CastArraysAsListToList.java

@@ -32,7 +32,7 @@
 import static java.util.Collections.emptyList;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class ChangeMethodInvocationReturnType extends Recipe {
 
     @Option(displayName = "Method pattern",

src/main/java/org/openrewrite/java/migrate/ChangeMethodInvocationReturnType.java

@@ -41,11 +41,13 @@
 public class DontOverfetchDto extends Recipe {
 
     @Option(displayName = "DTO type",
-            description = "The fully qualified name of the DTO.")
+            description = "The fully qualified name of the DTO.",
+            example = "animals.Dog")
     String dtoType;
 
     @Option(displayName = "Data element",
-            description = "Replace the DTO as a method parameter when only this data element is used.")
+            description = "Replace the DTO as a method parameter when only this data element is used.",
+            example = "name")
     String dtoDataElement;
 
     @Override
@@ -93,7 +95,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                                                             .withVariables(ListUtils.map(v.getVariables(), nv -> {
                                                                 JavaType.Variable fieldType = nv.getName().getFieldType();
                                                                 return nv
-                                                                        .withName(nv.getName().withSimpleName(dtoDataElement))
+                                                                        .withName(nv.getName().withSimpleName(dtoDataElement).withType(memberType))
                                                                         .withType(memberType)
                                                                         .withVariableType(fieldType
                                                                                 .withName(dtoDataElement).withOwner(memberType));

src/main/java/org/openrewrite/java/migrate/DontOverfetchDto.java

@@ -33,7 +33,7 @@
 import static org.openrewrite.xml.FilterTagChildrenVisitor.filterTagChildren;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class JpaCacheProperties extends Recipe {
     @Override
     public String getDisplayName() {

src/main/java/org/openrewrite/java/migrate/JpaCacheProperties.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 the original author or authors.
+ * <p>
+ * Licensed 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
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+package org.openrewrite.java.migrate;
+
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.search.UsesJavaVersion;
+import org.openrewrite.java.tree.J;
+
+public class RemoveIllegalSemicolons extends Recipe {
+    @Override
+    public String getDisplayName() {
+        return "Remove illegal semicolons";
+    }
+
+    @Override
+    public String getDescription() {
+        //language=markdown
+        return "Remove semicolons after package declarations and imports, no longer accepted in Java 21 as of " +
+               "[JDK-8027682](https://bugs.openjdk.org/browse/JDK-8027682).";
+    }
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return Preconditions.check(new UsesJavaVersion<>(21), new JavaIsoVisitor<ExecutionContext>() {
+            @Override
+            public J.Import visitImport(J.Import _import, ExecutionContext ctx) {
+                J.Import im = super.visitImport(_import, ctx);
+                if (im.getPrefix().getWhitespace().contains(";")) {
+                    im = im.withPrefix(im.getPrefix()
+                            .withWhitespace(im.getPrefix().getWhitespace()
+                                    .replaceAll("\\s*;(\\R*)\\s*", "$1")));
+                }
+                return im;
+            }
+        });
+    }
+}

src/main/java/org/openrewrite/java/migrate/MavenUtils.java

@@ -26,7 +26,7 @@
 import org.openrewrite.staticanalysis.RemoveMethodCallVisitor;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class RemoveMethodInvocation extends Recipe {
     @Option(displayName = "Method Pattern",
             description = "A method pattern for matching required method definition.",

src/main/java/org/openrewrite/java/migrate/RemoveIllegalSemicolons.java

@@ -29,7 +29,7 @@
 import org.openrewrite.java.tree.JavaType;
 
 @Value
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
 public class ReplaceStringLiteralValue extends Recipe {
 
     @Option(displayName = "Old literal `String` value",
@@ -63,6 +63,7 @@ public String getDescription() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaIsoVisitor<ExecutionContext>() {
+            @Override
             public J.Literal visitLiteral(J.Literal literal, ExecutionContext ctx) {
                 J.Literal l = super.visitLiteral(literal, ctx);
                 if (l.getType() != JavaType.Primitive.String || !oldLiteralValue.equals(literal.getValue())) {