Merge branch 'main' into timtebeek/fix-issue-6833

Author: timtebeek

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

rewrite-core/src/main/java/org/openrewrite/marketplace/RecipeMarketplaceReader.java

@@ -159,7 +159,7 @@ private void readRecipe(@Nullable String[] row, RecipeMarketplace marketplace, L
             String value = row[i];
             if (value != null) {
                 value = value.trim();
-                if (StringUtils.isBlank(value)) {
+                if (StringUtils.isBlank(value) || "null".equals(value)) {
                     value = null;
                 }
             }

rewrite-core/src/test/java/org/openrewrite/marketplace/RecipeMarketplaceReaderTest.java

@@ -350,6 +350,44 @@ void recipeInMultipleCategoriesHasSeparateBundleInstances() {
         assertThat(rtJsListing.getBundle().getRequestedVersion()).isEqualTo(requestedVersion);
     }
 
+    @Test
+    void nullLiteralVersionIsTreatedAsNull() {
+        // When a CSV contains the literal string "null" for version/requestedVersion,
+        // the reader should treat it as null (not the string "null")
+        RecipeMarketplace marketplace = new RecipeMarketplaceReader().fromCsv("""
+          name,displayName,description,category,ecosystem,packageName,requestedVersion,version
+          org.openrewrite.java.cleanup.UnnecessaryParentheses,Remove Unnecessary Parentheses,Removes unnecessary parentheses,Java Cleanup,maven,org.openrewrite:rewrite-java,null,null
+          """);
+
+        RecipeListing listing = marketplace.getAllRecipes().iterator().next();
+        RecipeBundle bundle = listing.getBundle();
+        assertThat(bundle.getRequestedVersion()).isNull();
+        assertThat(bundle.getVersion()).isNull();
+    }
+
+    @Test
+    void roundTripPreservesNullVersions() {
+        // Create a marketplace with null versions, write to CSV, read back,
+        // and verify versions remain null (not the string "null")
+        RecipeMarketplace marketplace = new RecipeMarketplaceReader().fromCsv("""
+          name,displayName,description,category,ecosystem,packageName
+          org.openrewrite.java.cleanup.UnnecessaryParentheses,Remove Unnecessary Parentheses,Removes unnecessary parentheses,Java Cleanup,maven,org.openrewrite:rewrite-java
+          """);
+
+        // Verify initial state has null versions
+        RecipeListing listing = marketplace.getAllRecipes().iterator().next();
+        assertThat(listing.getBundle().getVersion()).isNull();
+        assertThat(listing.getBundle().getRequestedVersion()).isNull();
+
+        // Round-trip through CSV
+        @Language("csv") String csv = new RecipeMarketplaceWriter().toCsv(marketplace);
+        RecipeMarketplace roundTripped = new RecipeMarketplaceReader().fromCsv(csv);
+
+        RecipeListing rtListing = roundTripped.getAllRecipes().iterator().next();
+        assertThat(rtListing.getBundle().getVersion()).isNull();
+        assertThat(rtListing.getBundle().getRequestedVersion()).isNull();
+    }
+
     private void setVersionRecursive(RecipeMarketplace.Category category, String packageName,
                                      String requestedVersion, String version) {
         for (RecipeListing recipe : category.getRecipes()) {

rewrite-core/src/test/resources/gradle-wrapper.properties

@@ -16,7 +16,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-7.6.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

rewrite-gradle-tooling-model/model/src/test/java/org/openrewrite/gradle/toolingapi/AssertionsTest.java

@@ -93,7 +93,7 @@ void customInitScript() {
           }
 
           """;
-        GradleWrapper gradleWrapper = GradleWrapper.create(URI.create("https://services.gradle.org/distributions/gradle-8.6-bin.zip"), null);
+        GradleWrapper gradleWrapper = GradleWrapper.create(URI.create("https://downloads.gradle.org/distributions/gradle-8.6-bin.zip"), null);
         rewriteRun(
           spec -> spec.beforeRecipe(Assertions.withToolingApi(gradleWrapper, alternateInit)),
           //language=groovy

rewrite-gradle/src/main/java/org/openrewrite/gradle/UpdateGradleWrapper.java

@@ -46,31 +46,28 @@
 import static org.openrewrite.gradle.util.GradleWrapper.*;
 import static org.openrewrite.internal.StringUtils.isBlank;
 
+@Getter
 @RequiredArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 @EqualsAndHashCode(callSuper = false)
 public class UpdateGradleWrapper extends ScanningRecipe<UpdateGradleWrapper.GradleWrapperState> {
 
-    @Getter
-    final String displayName = "Update Gradle wrapper";
+    String displayName = "Update Gradle wrapper";
 
-    @Getter
-    final String description = "Update the version of Gradle used in an existing Gradle wrapper. " +
-        "Queries services.gradle.org to determine the available releases, but prefers the artifact repository URL " +
+    String description = "Update the version of Gradle used in an existing Gradle wrapper. " +
+        "Queries `downloads.gradle.org` to determine the available releases, but prefers the artifact repository URL " +
         "which already exists within the wrapper properties file. " +
-        "If your artifact repository does not contain the same Gradle distributions as services.gradle.org, " +
+        "If your artifact repository does not contain the same Gradle distributions as `downloads.gradle.org`, " +
         "then the recipe may suggest a version which is not available in your artifact repository.";
 
-    @Getter
     @Option(displayName = "New version",
             description = "An exact version number or node-style semver selector used to select the version number. " +
-                          "Defaults to the latest release available from services.gradle.org if not specified.",
+                          "Defaults to the latest release available from `downloads.gradle.org` if not specified.",
             example = "7.x",
             required = false)
     @Nullable
-    final String version;
+    String version;
 
-    @Getter
     @Option(displayName = "Distribution type",
             description = "The distribution of Gradle to use. \"bin\" includes Gradle binaries. " +
                           "\"all\" includes Gradle binaries, source code, and documentation. " +
@@ -79,17 +76,15 @@ public class UpdateGradleWrapper extends ScanningRecipe<UpdateGradleWrapper.Grad
             required = false
     )
     @Nullable
-    final String distribution;
+    String distribution;
 
-    @Getter
     @Option(displayName = "Add if missing",
             description = "Add a Gradle wrapper, if it's missing. Defaults to `true`.",
             required = false)
     @Nullable
-    final Boolean addIfMissing;
+    Boolean addIfMissing;
 
-    @Getter
-    @Option(example = "https://services.gradle.org/distributions/gradle-8.5-bin.zip",
+    @Option(example = "https://downloads.gradle.org/distributions/gradle-8.5-bin.zip",
             displayName = "Wrapper URI",
             description = "The URI of the Gradle wrapper distribution.\n" +
                     "Specifies a custom location from which to download the Gradle wrapper scripts (gradlew, gradlew.bat, etc.). This is useful for setting up the Gradle wrapper without relying on Gradle's official distribution services.\n\n" +
@@ -98,16 +93,15 @@ public class UpdateGradleWrapper extends ScanningRecipe<UpdateGradleWrapper.Grad
                     "If the URI is inaccessible, the recipe will leave the existing wrapper files in the repository unchanged, as they are generally compatible with various Gradle versions.",
             required = false)
     @Nullable
-    final String wrapperUri;
+    String wrapperUri;
 
-    @Getter
     @Option(example = "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda",
             displayName = "SHA-256 checksum",
             description = "The SHA-256 checksum of the Gradle distribution. " +
                     "If specified, the recipe will add the checksum along with the custom distribution URL.",
             required = false)
     @Nullable
-    final String distributionChecksum;
+    String distributionChecksum;
 
     @Override
     public String getInstanceNameSuffix() {
@@ -202,7 +196,7 @@ public Properties visitEntry(Properties.Entry entry, ExecutionContext ctx) {
                             return entry;
                         }
 
-                        // Typical example: https://services.gradle.org/distributions/gradle-7.4-all.zip or https://company.com/repo/gradle-8.2-bin.zip
+                        // Typical example: https://downloads.gradle.org/distributions/gradle-7.4-all.zip or https://company.com/repo/gradle-8.2-bin.zip
                         String currentDistributionUrl = entry.getValue().getText();
                         acc.currentDistributionUrl = currentDistributionUrl;
 

rewrite-gradle/src/main/java/org/openrewrite/gradle/util/GradleWrapper.java

@@ -51,8 +51,9 @@
 
 @Value
 public class GradleWrapper {
+    private static final String GRADLE_DOWNLOADS_URL = "https://downloads.gradle.org";
+    private static final String GRADLE_DISTRIBUTIONS_URL = GRADLE_DOWNLOADS_URL + "/distributions";
     private static final String GRADLE_SERVICES_URL = "https://services.gradle.org";
-    private static final String GRADLE_DISTRIBUTIONS_URL = GRADLE_SERVICES_URL + "/distributions";
     private static final String GRADLE_VERSIONS_ALL_URL = GRADLE_SERVICES_URL + "/versions/all";
     public static final String WRAPPER_JAR_LOCATION_RELATIVE_PATH = "gradle/wrapper/gradle-wrapper.jar";
     public static final String WRAPPER_PROPERTIES_LOCATION_RELATIVE_PATH = "gradle/wrapper/gradle-wrapper.properties";
@@ -69,7 +70,7 @@ public class GradleWrapper {
 
     /**
      * Construct a Gradle wrapper from a distribution type and version.
-     * Used in contexts where services.gradle.org is available.
+     * Used in contexts where downloads.gradle.org is available.
      */
     public static GradleWrapper create(@Nullable String distributionTypeName, @Nullable String version, ExecutionContext ctx) {
         return create(null, distributionTypeName, version, ctx);
@@ -96,15 +97,15 @@ public static GradleWrapper create(@Nullable String currentDistributionUrl, @Nul
 
     private static GradleVersion determineGradleVersion(@Nullable String currentDistributionUrl, @Nullable String version, VersionComparator versionComparator,
                                                         DistributionType distributionType, ExecutionContext ctx) {
-        if (currentDistributionUrl == null || currentDistributionUrl.startsWith(GRADLE_SERVICES_URL)) {
+        if (currentDistributionUrl == null || currentDistributionUrl.startsWith(GRADLE_DOWNLOADS_URL) || currentDistributionUrl.startsWith(GRADLE_SERVICES_URL)) {
             // Only list all versions via services endpoint if a wildcard notation was requested or null, e.g. 8.x
             if (!(versionComparator instanceof ExactVersion)) {
                 List<GradleVersion> allVersions = listAllPublicVersions(ctx);
                 return allVersions.stream()
                         .filter(v -> versionComparator.isValid(null, v.version))
                         .filter(v -> v.distributionType == distributionType)
                         .max((v1, v2) -> versionComparator.compare(null, v1.version, v2.version))
-                        .orElseThrow(() -> new IllegalStateException(String.format("Expected to find at least one Gradle wrapper version to select from %s.", GRADLE_SERVICES_URL)));
+                        .orElseThrow(() -> new IllegalStateException(String.format("Expected to find at least one Gradle wrapper version to select from %s.", GRADLE_DOWNLOADS_URL)));
             }
 
             return new GradleVersion(version,
@@ -150,19 +151,22 @@ public static List<GradleVersion> listAllPublicVersions(ExecutionContext ctx) {
                         });
                 List<GradleVersion> allGradleVersions = new ArrayList<>(gradleVersions.size() * 2);
                 for (GradleVersion gradleVersion : gradleVersions) {
+                    String downloadUrl = migrateToDownloadsUrl(gradleVersion.downloadUrl);
+                    String checksumUrl = migrateToDownloadsUrl(gradleVersion.checksumUrl);
+                    String wrapperChecksumUrl = migrateToDownloadsUrl(gradleVersion.wrapperChecksumUrl);
                     allGradleVersions.add(new GradleVersion(
                             gradleVersion.version,
-                            gradleVersion.downloadUrl,
+                            downloadUrl,
                             DistributionType.Bin,
-                            gradleVersion.checksumUrl,
-                            gradleVersion.wrapperChecksumUrl
+                            checksumUrl,
+                            wrapperChecksumUrl
                     ));
                     allGradleVersions.add(new GradleVersion(
                             gradleVersion.version,
-                            gradleVersion.downloadUrl.replace("-bin.zip", "-all.zip"),
+                            downloadUrl.replace("-bin.zip", "-all.zip"),
                             DistributionType.All,
-                            gradleVersion.checksumUrl == null ? null : gradleVersion.checksumUrl.replace("-bin.zip", "-all.zip"),
-                            gradleVersion.wrapperChecksumUrl
+                            checksumUrl == null ? null : checksumUrl.replace("-bin.zip", "-all.zip"),
+                            wrapperChecksumUrl
                     ));
                 }
                 return allGradleVersions;
@@ -200,11 +204,15 @@ private static List<GradleVersion> listAllPrivateArtifactoryVersions(String arti
         }
     }
 
+    private static @Nullable String migrateToDownloadsUrl(@Nullable String url) {
+        return url == null ? null : url.replace(GRADLE_SERVICES_URL, GRADLE_DOWNLOADS_URL);
+    }
+
     private static final Pattern GRADLE_VERSION_PATTERN = Pattern.compile("gradle-([0-9.]+)");
 
     /**
      * Construct a Gradle wrapper from a URI.
-     * Can be used in contexts where services.gradle.org, normally used for version lookups, is unavailable.
+     * Can be used in contexts where downloads.gradle.org, normally used for version lookups, is unavailable.
      */
     public static GradleWrapper create(URI fullDistributionUri, @SuppressWarnings("unused") ExecutionContext ctx) {
         String version = "";

rewrite-gradle/src/main/resources/META-INF/rewrite/examples.yml

@@ -715,13 +715,13 @@ examples:
   - before: |
       distributionBase=GRADLE_USER_HOME
       distributionPath=wrapper/dists
-      distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+      distributionUrl=https\://downloads.gradle.org/distributions/gradle-7.4-bin.zip
       zipStoreBase=GRADLE_USER_HOME
       zipStorePath=wrapper/dists
     after: |
       distributionBase=GRADLE_USER_HOME
       distributionPath=wrapper/dists
-      distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+      distributionUrl=https\://downloads.gradle.org/distributions/gradle-7.4.2-bin.zip
       zipStoreBase=GRADLE_USER_HOME
       zipStorePath=wrapper/dists
       distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
@@ -1281,13 +1281,13 @@ examples:
   - before: |
       distributionBase=GRADLE_USER_HOME
       distributionPath=wrapper/dists
-      distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip
+      distributionUrl=https\\://downloads.gradle.org/distributions/gradle-7.4-all.zip
       zipStoreBase=GRADLE_USER_HOME
       zipStorePath=wrapper/dists
     after: |
       distributionBase=GRADLE_USER_HOME
       distributionPath=wrapper/dists
-      ~~>distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip
+      ~~>distributionUrl=https\\://downloads.gradle.org/distributions/gradle-7.4-all.zip
       zipStoreBase=GRADLE_USER_HOME
       zipStorePath=wrapper/dists
     path: gradle/wrapper/gradle-wrapper.properties