From 6736431673de53e9481dacbb36fe6b46d3222a87 Mon Sep 17 00:00:00 2001
From: Tahanima Chowdhury <tahanimachowdhury@gmail.com>
Date: Tue, 6 Feb 2024 22:03:41 +0600
Subject: [PATCH] Issue #13213: Removed //ok from matchxpath

---
 config/checkstyle-input-suppressions.xml      | 24 -------------------
 .../coding/matchxpath/InputMatchXpath.java    |  2 +-
 .../coding/matchxpath/InputMatchXpath2.java   |  2 +-
 .../coding/matchxpath/InputMatchXpath3.java   |  2 +-
 .../coding/matchxpath/InputMatchXpath4.java   |  2 +-
 ...hXpathAvoidInstanceCreationWithoutVar.java |  2 +-
 ...putMatchXpathExecutableStatementCount.java |  2 +-
 ...chXpathForbidParameterizedConstructor.java |  2 +-
 .../InputMatchXpathForbidPrintStackTrace.java |  1 -
 .../InputMatchXpathIllegalThrows.java         |  4 ++--
 .../InputMatchXpathNoStackoverflowError.java  |  2 +-
 .../InputMatchXpathSingleLineComments.java    |  2 +-
 12 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/config/checkstyle-input-suppressions.xml b/config/checkstyle-input-suppressions.xml
index bca73632471..39dabac647c 100644
--- a/config/checkstyle-input-suppressions.xml
+++ b/config/checkstyle-input-suppressions.xml
@@ -248,30 +248,6 @@
             files="checks[\\/]coding[\\/]illegaltype[\\/]InputIllegalTypeWhitespaceInConfig.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]coding[\\/]innerassignment[\\/]InputInnerAssignmentLambdaExpressions.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath2.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath3.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpath4.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathAvoidInstanceCreationWithoutVar.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathExecutableStatementCount.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathForbidParameterizedConstructor.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathForbidPrintStackTrace.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathIllegalThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathIllegalThrows.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathNoStackoverflowError.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]matchxpath[\\/]InputMatchXpathSingleLineComments.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]coding[\\/]modifiedcontrolvariable[\\/]InputModifiedControlVariableEnhancedForLoopVariable.java"/>
   <suppress id="UnnecessaryOkComment"
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
index a7edd84e37b..05b44ad7a66 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
index 49a6b65cced..10ba9570e0c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
index 4d890f2d496..6a6f4bb65d9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath3.java
@@ -12,5 +12,5 @@ public void test() { } // violation
 
     public void foo() { } // violation
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
index 32370b443a8..5eec937999a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java
@@ -12,5 +12,5 @@ public void test() { }
 
     public void foo() { }
 
-    public void correct() { } // ok
+    public void correct() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
index a5b3422a19a..bfff4718836 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathAvoidInstanceCreationWithoutVar.java
@@ -11,7 +11,7 @@
 public class InputMatchXpathAvoidInstanceCreationWithoutVar {
     public void test() {
         SomeObject a = new SomeObject(); // violation
-        var b = new SomeObject(); // OK
+        var b = new SomeObject();
     }
 
     class SomeObject {}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
index 39b9b5a3c78..acc317eae7e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathExecutableStatementCount.java
@@ -10,7 +10,7 @@
 
 public class InputMatchXpathExecutableStatementCount {
     public void test() {
-        while (true) { // ok
+        while (true) {
             Runnable runnable = new Runnable() {
                 public void run() {
                     while (true) {
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
index 3affa8166a3..f4fcdfc4fc7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidParameterizedConstructor.java
@@ -14,5 +14,5 @@ public InputMatchXpathForbidParameterizedConstructor(Object c) { } // violation
 
     public InputMatchXpathForbidParameterizedConstructor(int a, String b) { } // violation
 
-    public InputMatchXpathForbidParameterizedConstructor() { } // ok
+    public InputMatchXpathForbidParameterizedConstructor() { }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
index 1b92e81d9e3..9ea5e5ed29f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathForbidPrintStackTrace.java
@@ -23,7 +23,6 @@ public void test2() {
       try {
          throw new IOException();
       } catch (IOException e) {
-         // ok
       }
    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
index 93a0a2e1672..a72592888eb 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathIllegalThrows.java
@@ -11,8 +11,8 @@
 
 public class InputMatchXpathIllegalThrows {
     public void func1() throws RuntimeException {} // violation
-    public void func2() throws Exception {}  // ok
+    public void func2() throws Exception {}
     public void func3() throws Error {}  // violation
     public void func4() throws Throwable {} // violation
-    public void func5() throws NullPointerException {} // ok
+    public void func5() throws NullPointerException {}
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
index b479011659d..99a0ef7ea65 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathNoStackoverflowError.java
@@ -39,5 +39,5 @@ public class InputMatchXpathNoStackoverflowError {
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
       +""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""+""
-      ; // ok
+      ;
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
index 77f7bcedd08..a86fb9722e0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathSingleLineComments.java
@@ -8,7 +8,7 @@
 
 public class InputMatchXpathSingleLineComments {
     void foo() {
-        int num; // Trailing comment // ok
+        int num; // Trailing comment
 
         boolean isTrue; //Some Comment // violation
         double pi = 3.14; //Constant PI value // violation