Issue checkstyle#13213: Remove //ok comments for equalavoidsnull module

nrmancuso · Jan 2, 2024 · 13090c5 · 13090c5
1 parent 2e99389
commit 13090c5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/config/checkstyle-input-suppressions.xml b/config/checkstyle-input-suppressions.xml
@@ -66,20 +66,6 @@
           files="[\\/]packageobjectfactory[\\/]zoo[\\/]FooCheck.java"/>
 
   <!-- until https://github.com/checkstyle/checkstyle/issues/13213 -->
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullEnhancedInstanceof.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullRecordsAndCompactCtors.java"/>
-  <suppress id="UnnecessaryOkComment"
-            files="checks[\\/]coding[\\/]equalsavoidnull[\\/]InputEqualsAvoidNullTextBlocks.java"/>
   <suppress id="UnnecessaryOkComment"
             files="checks[\\/]coding[\\/]finallocalvariable[\\/]InputFinalLocalVariableCheckRecords.java"/>
   <suppress id="UnnecessaryOkComment"

diff --git a/...ools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java b/...ools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullEnhancedInstanceof.java
@@ -13,7 +13,7 @@ public InputEqualsAvoidNullEnhancedInstanceof(String str) {
         if (str instanceof String myString) {
             System.out.println("Mystring!!");
             boolean myBool = myString.equals("MyString!!"); // violation 'left .* of .* equals'
-            boolean myOtherBool = myString.equals(str); // ok
+            boolean myOtherBool = myString.equals(str);
         } else if (str instanceof String oneMoreString) {
             if(oneMoreString.equals("test")) { // violation 'left .* of .* equals'
                 System.out.println("Test!!");

diff --git a/.../checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java b/.../checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullRecordsAndCompactCtors.java
@@ -13,7 +13,7 @@ public class InputEqualsAvoidNullRecordsAndCompactCtors {
     record TestRecord1(String str) {
         public TestRecord1 {
             str.equals("my string"); // violation 'left .* of .* equals'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
@@ -23,7 +23,7 @@ public boolean stringCheck1 (String toCheck){
         }
 
         public boolean stringCheck2 (String toCheck){
-            return "my string".equals(toCheck); // ok
+            return "my string".equals(toCheck);
         }
     }
 
@@ -32,22 +32,22 @@ record TestRecord3() {
         TestRecord3 (String str){
             this();
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
     record TestRecord4(String str) {
         public TestRecord4 {
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
     }
 
     record TestRecord5() {
         TestRecord5 (int num) {
             this();
             str.equalsIgnoreCase("my string"); // violation 'left .* of .* equalsIgnoreCase'
-            "my string".equals(str); // ok
+            "my string".equals(str);
         }
         private static String str;
     }

diff --git a/...ycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java b/...ycrawl/tools/checkstyle/checks/coding/equalsavoidnull/InputEqualsAvoidNullTextBlocks.java
@@ -36,7 +36,7 @@ record MyRecord(String a, Object obj) {
           System.out.println("this is my other string");
         }
         else if ("""
-            one more string""".equals(s)) { // ok
+            one more string""".equals(s)) {
           System.out.println("This is one more string");
         }
       }