diff --git a/.github/workflows/comment-pr.yml b/.github/workflows/comment-pr.yml deleted file mode 100644 index 8338f90..0000000 --- a/.github/workflows/comment-pr.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Description: This workflow is triggered when the `receive-pr` workflow completes to post suggestions on the PR. -# Since this pull request has write permissions on the target repo, we should **NOT** execute any untrusted code. -# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ ---- -name: comment-pr - -on: - workflow_run: - workflows: ["receive-pr"] - types: - - completed - -jobs: - post-suggestions: - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-based-on-the-conclusion-of-another-workflow - if: ${{ github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest - permissions: - pull-requests: write - env: - # https://docs.github.com/en/actions/reference/authentication-in-a-workflow#permissions-for-the-github_token - ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} - timeout-minutes: 10 - steps: - - uses: actions/checkout@v4 - with: - ref: ${{github.event.workflow_run.head_branch}} - repository: ${{github.event.workflow_run.head_repository.full_name}} - - # Download the patch - - uses: actions/download-artifact@v4 - with: - name: patch - github-token: ${{ secrets.GITHUB_TOKEN }} - run-id: ${{ github.event.workflow_run.id }} - - name: Apply patch - run: | - git apply git-diff.patch --allow-empty - rm git-diff.patch - - # Download the PR number - - uses: actions/download-artifact@v4 - with: - name: pr_number - github-token: ${{ secrets.GITHUB_TOKEN }} - run-id: ${{ github.event.workflow_run.id }} - - name: Read pr_number.txt - run: | - PR_NUMBER=$(cat pr_number.txt) - echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV - rm pr_number.txt - - # Post suggestions as a comment on the PR - - uses: googleapis/code-suggester@v4 - with: - command: review - pull_number: ${{ env.PR_NUMBER }} - git_dir: '.' diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml deleted file mode 100644 index e79fdc3..0000000 --- a/.github/workflows/receive-pr.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Description: This workflow runs OpenRewrite recipes against opened pull request and upload the patch. -# Since this pull request receives untrusted code, we should **NOT** have any secrets in the environment. -# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ ---- -name: receive-pr - -on: - pull_request: - types: [opened, synchronize] - branches: - - main - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -defaults: - run: - shell: bash - -env: - MAVEN_OPTS: -Xmx8g - GRADLE_OPTS: -Dorg.gradle.jvmargs='-Xmx8g' - -jobs: - upload-patch: - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - uses: actions/checkout@v4 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - cache: 'maven' - - # Capture the PR number - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow - - name: Create pr_number.txt - run: echo "${{ github.event.number }}" > pr_number.txt - - uses: actions/upload-artifact@v4 - with: - name: pr_number - path: pr_number.txt - - name: Remove pr_number.txt - run: rm -f pr_number.txt - - # Execute recipes - - name: Apply OpenRewrite recipes - run: | - mvn --batch-mode \ - checkstyle:check -Dcheckstyle.failOnViolation=false \ - rewrite:run -Drewrite.activeRecipes=org.checkstyle.recipes.OpenRewriteRecipeBestPractices - - # Capture the diff - - name: Create patch - run: | - git diff | tee git-diff.patch - - uses: actions/upload-artifact@v4 - with: - name: patch - path: git-diff.patch diff --git a/pom.xml b/pom.xml index b20bad6..c5393cb 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ 3.11.0 UTF-8 - 6.16.0 - 3.13.0 + 6.17.0 + 3.14.0 5.13.4 3.27.4 @@ -173,6 +173,9 @@ ${rewrite.maven.plugin} + org.checkstyle.recipes.OpenRewriteRecipeBestPractices + org.checkstyle.recipes.JavaRecipeBestPractices + org.checkstyle.recipes.RecipeTestingBestPracticesSubset CheckstyleAutoFixConfigured @@ -188,7 +191,7 @@ org.openrewrite.recipe rewrite-rewrite - RELEASE + 0.12.1 diff --git a/rewrite.yml b/rewrite.yml index fa836ac..fe77ec7 100644 --- a/rewrite.yml +++ b/rewrite.yml @@ -44,13 +44,14 @@ preconditions: recipeList: - org.openrewrite.java.recipes.BlankLinesAroundFieldsWithAnnotations - org.openrewrite.java.recipes.CorrectlySpacedDescriptions -# - org.openrewrite.java.recipes.ExecutionContextParameterName + - org.openrewrite.java.recipes.ExecutionContextParameterName: + parameterName: executionContext - org.openrewrite.java.recipes.IsLiteralNullRecipe - org.openrewrite.java.recipes.MissingOptionExample - org.openrewrite.java.recipes.NoMutableStaticFieldsInRecipes - org.openrewrite.java.recipes.RecipeEqualsAndHashCodeCallSuper - org.openrewrite.java.recipes.UseTreeRandomId - - org.openrewrite.java.recipes.migrate.RemoveTraitsUsageRecipes + - org.openrewrite.java.InlineMethodCalls - org.openrewrite.staticanalysis.NeedBraces - org.openrewrite.staticanalysis.RemoveSystemOutPrintln - org.openrewrite.java.RemoveAnnotation: diff --git a/src/main/java/org/checkstyle/autofix/recipe/RedundantImport.java b/src/main/java/org/checkstyle/autofix/recipe/RedundantImport.java index f2370f4..173cefb 100644 --- a/src/main/java/org/checkstyle/autofix/recipe/RedundantImport.java +++ b/src/main/java/org/checkstyle/autofix/recipe/RedundantImport.java @@ -60,7 +60,8 @@ private final class RemoveRedundantImportsVisitor extends JavaIsoVisitor