From def9be96f1703d99cf4d619ade206b542091a15e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 22 May 2025 09:28:46 -0700
Subject: [PATCH] Add support for the new generate checks and file suppression
 option

---
 .../bld/extension/CheckstyleOperation.java    | 19 +++++++++++++++++++
 .../extension/CheckstyleOperationTest.java    |  9 +++++++++
 src/test/resources/checkstyle-args.txt        |  1 +
 3 files changed, 29 insertions(+)

diff --git a/src/main/java/rife/bld/extension/CheckstyleOperation.java b/src/main/java/rife/bld/extension/CheckstyleOperation.java
index f7689ba..cdcd630 100644
--- a/src/main/java/rife/bld/extension/CheckstyleOperation.java
+++ b/src/main/java/rife/bld/extension/CheckstyleOperation.java
@@ -314,6 +314,25 @@ public class CheckstyleOperation extends AbstractProcessOperation<CheckstyleOper
         return this;
     }
 
+    /**
+     * Generates to output a suppression xml that will have suppress elements with {@code checks} and {@code files}
+     * attributes only to use to suppress all violations from user's config. Instead of printing every violation, all
+     * violations will be catched and single suppressions xml file will be printed out. Used only with the
+     * {@link #configurationFile(String) configurationFile} option. Output location can be
+     * specified with the {@link #outputPath(String) output} option.
+     *
+     * @param generateChecksAndFileSuppression {@code true} or {@code false}
+     * @return the checkstyle operation
+     */
+    public CheckstyleOperation generateChecksAndFileSuppression(boolean generateChecksAndFileSuppression) {
+        if (generateChecksAndFileSuppression) {
+            options_.put("-G", "");
+        } else {
+            options_.remove("-G");
+        }
+        return this;
+    }
+
     /**
      * Generates to output a suppression xml to use to suppress all violations from user's config. Instead of printing
      * every violation, all violations will be caught and single suppressions xml file will be printed out.
diff --git a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java
index be475d1..e4a6511 100644
--- a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java
+++ b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java
@@ -235,6 +235,7 @@ class CheckstyleOperationTest {
                     .executeIgnoredModules(true)
                     .format(OutputFormat.XML)
                     .generateXpathSuppression(true)
+                    .generateChecksAndFileSuppression(true)
                     .javadocTree(true)
                     .outputPath(new File("optionPath"))
                     .propertiesFile(new File("properties"))
@@ -279,6 +280,14 @@ class CheckstyleOperationTest {
             assertThat(op.options().get("-f")).isEqualTo("xml");
         }
 
+        @Test
+        void generateChecksAndFileSuppression() {
+            var op = newCheckstyleOperation().generateChecksAndFileSuppression(true);
+            assertThat(op.options().containsKey("-G")).as(ADD).isTrue();
+            op = op.generateChecksAndFileSuppression(false);
+            assertThat(op.options().containsKey("-G")).as(REMOVE).isFalse();
+        }
+
         @Test
         void generateXpathSuppression() {
             var op = newCheckstyleOperation().generateXpathSuppression(true);
diff --git a/src/test/resources/checkstyle-args.txt b/src/test/resources/checkstyle-args.txt
index fa76eaf..56db2d3 100644
--- a/src/test/resources/checkstyle-args.txt
+++ b/src/test/resources/checkstyle-args.txt
@@ -5,6 +5,7 @@
 -E
 -f
 -g
+-G
 -j
 -J
 -o