Issue #17487: Add AutoFixes

Vincent Potucek · Vincent Potucek · commit f7787e93b61c · 2025-10-26T09:08:58.000+01:00
diff --git a/.ci/validation.sh b/.ci/validation.sh
@@ -1273,7 +1273,7 @@ openrewrite-recipes)
   set -e
   echo "Running OpenRewrite recipes..."
   ./mvnw -e --no-transfer-progress -Drewrite.recipeChangeLogLevel=INFO \
-  rewrite:run -P checkstyle-autofix
+    rewrite:run -P checkstyle-autofix
 
   echo "Checking for uncommitted changes..."
   ./.ci/print-diff-as-patch.sh target/rewrite.patch
diff --git a/pom.xml b/pom.xml
@@ -218,9 +218,6 @@
     <maven.versions.plugin.version>2.19.1</maven.versions.plugin.version>
     <maven.compiler.plugin.version>3.14.1</maven.compiler.plugin.version>
     <checkstyle.skipCompileInputResources>true</checkstyle.skipCompileInputResources>
-    <checkstyle.openrewrite.version>1.0.0-SNAPSHOT</checkstyle.openrewrite.version>
-    <rewrite-migrate-java.version>3.20.0</rewrite-migrate-java.version>
-    <rewrite-static-analysis.version>2.20.0</rewrite-static-analysis.version>
     <java.version>17</java.version>
     <next.java.version>21</next.java.version>
     <maven.compiler.release>${java.version}</maven.compiler.release>
@@ -625,6 +622,56 @@
             </upToDateChecking>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.openrewrite.maven</groupId>
+          <artifactId>rewrite-maven-plugin</artifactId>
+          <version>6.21.1</version>
+          <configuration>
+            <exportDatatables>true</exportDatatables>
+            <skipMavenParsing>true</skipMavenParsing>
+            <activeRecipes>
+              <recipe>org.checkstyle.AutoFixes</recipe>
+            </activeRecipes>
+            <exclusions>
+              <exclusion>**.ci-temp**</exclusion>
+              <exclusion>**/resources-noncompilable/**</exclusion>
+              <exclusion>**AvoidEscapedUnicodeCharactersCheckTest.java</exclusion>
+              <exclusion>**FinalClassCheck.java</exclusion>
+              <exclusion>**src/it/resources**</exclusion>
+              <exclusion>**src/test/resources**</exclusion>
+              <exclusion>**xdocs-examples**</exclusion>
+            </exclusions>
+            <plainTextMasks>
+              <plainTextMask>**/*.xml</plainTextMask>
+              <plainTextMask>**/*.yml</plainTextMask>
+              <plainTextMask>**/*.groovy</plainTextMask>
+              <plainTextMask>**/resources/**</plainTextMask>
+              <plainTextMask>**/resources-noncompilable/**</plainTextMask>
+            </plainTextMasks>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.openrewrite.recipe</groupId>
+              <artifactId>rewrite-migrate-java</artifactId>
+              <version>3.20.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.openrewrite.recipe</groupId>
+              <artifactId>rewrite-java-security</artifactId>
+              <version>3.20.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.openrewrite.recipe</groupId>
+              <artifactId>rewrite-static-analysis</artifactId>
+              <version>2.20.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.openrewrite.recipe</groupId>
+              <artifactId>rewrite-rewrite</artifactId>
+              <version>0.14.0</version>
+            </dependency>
+          </dependencies>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
@@ -5506,91 +5553,16 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>6.22.1</version>
-            <configuration>
-              <exportDatatables>true</exportDatatables>
-              <skipMavenParsing>true</skipMavenParsing>
-              <activeRecipes>
-                <recipe>org.checkstyle.CheckstyleAutoFix</recipe>
-                <recipe>org.openrewrite.java.RemoveUnusedImports</recipe>
-                <recipe>org.openrewrite.java.format.RemoveTrailingWhitespace</recipe>
-                <recipe>org.openrewrite.java.migrate.UpgradeToJava17</recipe>
-                <recipe>org.openrewrite.java.recipes.JavaRecipeBestPractices</recipe>
-                <recipe>org.openrewrite.java.recipes.RecipeTestingBestPractices</recipe>
-                <recipe>org.openrewrite.maven.BestPractices</recipe>
-                <recipe>org.openrewrite.staticanalysis.EqualsAvoidsNull</recipe>
-                <recipe>org.openrewrite.staticanalysis.JavaApiBestPractices</recipe>
-                <recipe>org.openrewrite.staticanalysis.LowercasePackage</recipe>
-                <recipe>org.openrewrite.staticanalysis.MissingOverrideAnnotation</recipe>
-                <recipe>org.openrewrite.staticanalysis.ModifierOrder</recipe>
-                <recipe>org.openrewrite.staticanalysis.NoFinalizer</recipe>
-                <recipe>org.openrewrite.staticanalysis.RemoveUnusedLocalVariables</recipe>
-                <recipe>org.openrewrite.staticanalysis.RemoveUnusedPrivateFields</recipe>
-                <recipe>org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.ClassRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.CollectionRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.FileRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.PatternRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.PreconditionsRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.StreamRulesRecipes</recipe>
-                <recipe>tech.picnic.errorprone.refasterrules.TimeRulesRecipes</recipe>
-              </activeRecipes>
-              <exclusions>
-                <exclusion>**.ci-temp**</exclusion>
-                <exclusion>**/resources-noncompilable/**</exclusion>
-                <exclusion>**src/it/resources**</exclusion>
-                <exclusion>**src/test/resources**</exclusion>
-                <exclusion>**xdocs-examples**</exclusion>
-              </exclusions>
-              <plainTextMasks>
-                <plainTextMask>**/*.xml</plainTextMask>
-                <plainTextMask>**/*.yml</plainTextMask>
-                <plainTextMask>**/*.groovy</plainTextMask>
-                <plainTextMask>**/resources/**</plainTextMask>
-                <plainTextMask>**/resources-noncompilable/**</plainTextMask>
-              </plainTextMasks>
-            </configuration>
             <dependencies>
               <dependency>
                 <groupId>com.puppycrawl.tools</groupId>
                 <artifactId>checkstyle-openrewrite-recipes</artifactId>
-                <version>${checkstyle.openrewrite.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.openrewrite.recipe</groupId>
-                <artifactId>rewrite-migrate-java</artifactId>
-                <version>${rewrite-migrate-java.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.openrewrite.recipe</groupId>
-                <artifactId>rewrite-static-analysis</artifactId>
-                <version>${rewrite-static-analysis.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.openrewrite.recipe</groupId>
-                <artifactId>rewrite-rewrite</artifactId>
-                <version>0.14.1</version>
+                <version>1.0.0-SNAPSHOT</version>
               </dependency>
             </dependencies>
           </plugin>
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>spotless-autofix</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.diffplug.spotless</groupId>
-            <artifactId>spotless-maven-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/rewrite.yml b/rewrite.yml
@@ -1,11 +1,11 @@
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.checkstyle.CheckstyleAutoFix
-displayName: Checkstyle Auto Fix Configured
+name: org.checkstyle.CheckstyleOpenRewriteRecipes
+displayName: Checkstyle OpenRewrite Recipes Auto Fix Configuration
 description: |
-  Automatically applies OpenRewrite recipes to fix Checkstyle violations
-  based on the provided Checkstyle XML violation report. This recipe serves
-  as an entry point to apply all auto-fixable rules configured in the report.
+  Automatically applies Checkstyle OpenRewrite recipes to fix Checkstyle violations
+  based on the provided XML violation report. This recipe serves as an
+  entry point, to apply auto-fixable rules configured in the report.
 tags:
   - checkstyle
   - autofix
@@ -17,3 +17,53 @@ recipeList:
       violationReportPath: "target/cs_errors.xml"
       configurationPath: "config/checkstyle-checks.xml"
       propertiesPath: "config/openrewrite-recipes-checkstyle.properties"
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.checkstyle.AutoFixes
+displayName: Auto Fixes
+description: Comprehensive quality recipe combining modernization, security, and best practices.
+recipeList:
+  - org.checkstyle.CheckstyleOpenRewriteRecipes # checkstyle-openrewrite-recipes/issues/116
+  - org.openrewrite.java.RemoveUnusedImports
+  - org.openrewrite.java.format.NormalizeFormat
+  - org.openrewrite.java.format.NormalizeLineBreaks
+  - org.openrewrite.java.format.RemoveTrailingWhitespace
+  - org.openrewrite.java.migrate.UpgradeToJava17
+  - org.openrewrite.java.recipes.JavaRecipeBestPractices
+  - org.openrewrite.java.recipes.RecipeTestingBestPractices
+  - org.openrewrite.maven.BestPractices
+  - org.openrewrite.staticanalysis.BufferedWriterCreationRecipes
+  - org.openrewrite.staticanalysis.EqualsAvoidsNull
+  - org.openrewrite.staticanalysis.InlineVariable
+  - org.openrewrite.staticanalysis.JavaApiBestPractices
+  - org.openrewrite.staticanalysis.LowercasePackage
+  - org.openrewrite.staticanalysis.MissingOverrideAnnotation
+  - org.openrewrite.staticanalysis.ModifierOrder
+  - org.openrewrite.staticanalysis.NoFinalizer
+  - org.openrewrite.staticanalysis.NoToStringOnStringType
+  - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
+  - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
+  - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
+  - org.openrewrite.staticanalysis.ReplaceLambdaWithMethodReference
+  - org.openrewrite.staticanalysis.SimplifyTernaryRecipes
+  - org.openrewrite.staticanalysis.URLEqualsHashCodeRecipes
+  - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
+  - org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments
+  - org.openrewrite.staticanalysis.UnnecessaryParentheses
+  - org.openrewrite.staticanalysis.UnnecessaryReturnAsLastStatement
+  - org.openrewrite.staticanalysis.UseLambdaForFunctionalInterface
+  - tech.picnic.errorprone.refasterrules.BigDecimalRulesRecipes
+  - tech.picnic.errorprone.refasterrules.CharSequenceRulesRecipes
+  - tech.picnic.errorprone.refasterrules.ClassRulesRecipes
+  - tech.picnic.errorprone.refasterrules.CollectionRulesRecipes
+  - tech.picnic.errorprone.refasterrules.ComparatorRulesRecipes
+  - tech.picnic.errorprone.refasterrules.FileRulesRecipes
+  - tech.picnic.errorprone.refasterrules.MapRulesRecipes
+  - tech.picnic.errorprone.refasterrules.MicrometerRulesRecipes
+  - tech.picnic.errorprone.refasterrules.MockitoRulesRecipes
+  - tech.picnic.errorprone.refasterrules.PatternRulesRecipes
+  - tech.picnic.errorprone.refasterrules.PreconditionsRulesRecipes
+  - tech.picnic.errorprone.refasterrules.PrimitiveRulesRecipes
+  - tech.picnic.errorprone.refasterrules.StreamRulesRecipes
+  - tech.picnic.errorprone.refasterrules.TimeRulesRecipes
+---
