Fix errors in update-spring-dependencies.yml

.github/workflows/update-spring-dependencies.yml

@@ -82,7 +82,40 @@ jobs:
           git add -A
           git commit -m "Upgrade external dependencies to align with Spring Boot ${{ env.spring_boot_version }}"
           git push "https://${{ secrets.USER }}:${{ secrets.ACCESS_TOKEN }}@github.com/${{ secrets.USER }}/azure-sdk-for-java.git" "HEAD:${{ env.update_branch }}"
+      - name: Close Old Pull Requests
+        if: ${{ env.need_update_version == 'true' }}
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.ACCESS_TOKEN }}
+          script: |
+            const prTitlePrefix = 'External dependencies upgrade - Spring Boot';
+            const { data: pullRequests } = await github.rest.pulls.list({
+              owner: 'Azure',
+              repo: 'azure-sdk-for-java',
+              state: 'open',
+              per_page: 100
+            });
+
+            const oldPRs = pullRequests.filter(pr => pr.title.startsWith(prTitlePrefix));
+
+            for (const pr of oldPRs) {
+              console.log(`Closing PR #${pr.number} with comment`);
+              await github.rest.issues.createComment({
+                owner: 'Azure',
+                repo: 'azure-sdk-for-java',
+                issue_number: pr.number,
+                body: 'This PR has been superseded by a newer update. Closing automatically.'
+              });
+
+              await github.rest.pulls.update({
+                owner: 'Azure',
+                repo: 'azure-sdk-for-java',
+                pull_number: pr.number,
+                state: 'closed'
+              });
+            }
       - name: Create Pull Request
+        id: create_pr
         if: ${{ env.need_update_version == 'true' }}
         uses: vsoch/pull-request-action@master
         env:
@@ -99,42 +132,19 @@ jobs:
         with:
           github-token: ${{ secrets.ACCESS_TOKEN }}
           script: |
-            const { data: pullRequests } = await github.rest.pulls.list({
-              owner: 'Azure',
-              repo: 'azure-sdk-for-java',
-              state: 'open',
-              per_page: 100
-            });
+            const prNumber = '${{ steps.create_pr.outputs.pull_request_number }}';
 
-            const prTitlePrefix = 'External dependencies upgrade - Spring Boot';
-            const matchingPRs = pullRequests
-              .filter(pr => pr.title.startsWith(prTitlePrefix))
-              .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
-
-            if (matchingPRs.length <= 1) {
-              console.log('No old pull requests found to comment on.');
+            if (!prNumber) {
+              console.log('No pull request was created, nothing to comment on.');
               return;
             }
 
-            const latestPR = matchingPRs[0];
             const comment1 = `/azp run java - spring - tests`;
-            
-            console.log(`Commenting on latest PR #${latestPR.number}`);
+
+            console.log(`Commenting on PR #${prNumber}`);
             await github.rest.issues.createComment({
-                owner: 'Azure',
-                repo: 'azure-sdk-for-java',
-                issue_number: latestPR.number,
-                body: comment1
+              owner: 'Azure',
+              repo: 'azure-sdk-for-java',
+              issue_number: prNumber,
+              body: comment1
             });
-
-            const comment2 = `A newer update PR has been created: #${latestPR.number} (${latestPR.html_url}). Please track updates there.`;
-
-            for (const pr of matchingPRs.slice(1)) {
-              console.log(`Commenting on old PR #${pr.number}`);
-              await github.rest.issues.createComment({
-                owner: 'Azure',
-                repo: 'azure-sdk-for-java',
-                issue_number: pr.number,
-                body: comment2
-              });
-            }

src/main/java/com/azure/spring/dev/tools/actions/UpdateSpringDependenciesRunner.java

@@ -47,13 +47,17 @@ public UpdateSpringDependenciesRunner(SpringProjectMetadataReader metadataReader
     @Override
     public void run(String... args) throws Exception {
         LOGGER.info("---------- starting {} ----------", UpdateSpringDependenciesRunner.class.getSimpleName());
-        String latestSpringBootVersion = metadataReader.getCurrentVersion(ReleaseStatus.GENERAL_AVAILABILITY);
-        String RCSpringBootVersion = metadataReader.getCurrentVersion(ReleaseStatus.PRERELEASE);
+        String latestSpringBootVersion = metadataReader.getCurrentVersion(ReleaseStatus.GENERAL_AVAILABILITY).orElse(null);
+        String RCSpringBootVersion = metadataReader.getCurrentVersion(ReleaseStatus.PRERELEASE).orElse(null);
         String azureSupportedSpringBootVersion = azureCurrentVersionReader.getCurrentSupportedSpringBootVersion();
         String azureSupportedSpringCloudVersion = azureCurrentVersionReader.getCurrentSupportedSpringCloudVersion();
         String releaseNotesContents;
         String latestSpringBootMatchedSpringCloudVersion;
-        if (!azureSupportedSpringBootVersion.equals(latestSpringBootVersion) || !azureSupportedSpringBootVersion.equals(RCSpringBootVersion)) {
+        boolean isNewGaVersionAvailable = latestSpringBootVersion != null
+            && !azureSupportedSpringBootVersion.equals(latestSpringBootVersion);
+        boolean isNewRcVersionAvailable = RCSpringBootVersion != null
+            && !azureSupportedSpringBootVersion.equals(RCSpringBootVersion);
+        if (isNewGaVersionAvailable || isNewRcVersionAvailable) {
             try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter("spring-versions.txt"))) {
                 latestSpringBootMatchedSpringCloudVersion = springCloudCompatibleSpringBootVersionRanges
                         .entrySet()
@@ -62,7 +66,7 @@ public void run(String... args) throws Exception {
                         .map(Map.Entry::getKey)
                         .findFirst()
                         .get();
-                if (!azureSupportedSpringBootVersion.equals(latestSpringBootVersion)) {
+                if (isNewGaVersionAvailable) {
                     releaseNotesContents = springBootReleaseNotesReader.getReleaseNotes(latestSpringBootVersion);
                     bufferedWriter.write(latestSpringBootVersion);
                     bufferedWriter.newLine();

src/main/java/com/azure/spring/dev/tools/dependency/support/SpringProjectMetadataReader.java

@@ -1,6 +1,7 @@
 package com.azure.spring.dev.tools.dependency.support;
 
 import com.azure.spring.dev.tools.dependency.configuration.DependencyProperties;
+import com.azure.spring.dev.tools.dependency.metadata.maven.Version;
 import com.azure.spring.dev.tools.dependency.metadata.maven.VersionParser;
 import com.azure.spring.dev.tools.dependency.metadata.spring.ProjectRelease;
 import com.azure.spring.dev.tools.dependency.metadata.spring.ReleaseStatus;
@@ -10,6 +11,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * Read a Spring project's metadata from https://spring.io/project_metadata endpoint.
@@ -39,17 +41,16 @@ public List<ProjectRelease> getProjectReleases() {
         return metadata.getProjectReleases();
     }
 
-    public String getCurrentVersion(ReleaseStatus releaseStatus) {
+    public Optional<String> getCurrentVersion(ReleaseStatus releaseStatus) {
         return getProjectReleases()
             .stream()
             .filter(p -> p.getReleaseStatus().equals(releaseStatus))
             .filter(p -> p.getVersion().startsWith("4"))
             .map(ProjectRelease::getVersion)
             .map(VersionParser.DEFAULT::parse)
-            .sorted(Comparator.reverseOrder())
             .filter(Objects::nonNull)
+            .sorted(Comparator.reverseOrder())
             .findFirst()
-            .get()
-            .toString();
+            .map(Version::toString);
     }
 }