fix: Removed signature of methods using UTF-8 in DefaultEncodingDetector

Contrary to what was repored in #2114 and as noted in #2634, methods added in JDK 11 are using UTF-8 (not the default charset)
spotbugs · Oct 16, 2023 · 0084a18 · 0084a18
1 parent 3db5c68
commit 0084a18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Currently the versioning policy of this project follows [Semantic Versioning v2.
 - Fixed schema location for findbugsfilter.xsd ([[#1416](https://github.com/spotbugs/spotbugs/issues/1416)])
 - Fixed missing null checks ([[#2629](https://github.com/spotbugs/spotbugs/issues/2629)])
 - Disabled DontReusePublicIdentifiers due to the high false positives rate ([[#2627](https://github.com/spotbugs/spotbugs/issues/2627)])
+- Removed signature of methods using UTF-8 in DefaultEncodingDetector ([[#2634](https://github.com/spotbugs/spotbugs/issues/2634)])
 
 ## 4.8.0 - 2023-10-11
 

diff --git a/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/Issue2114Test.java b/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/Issue2114Test.java
@@ -18,19 +18,19 @@ class Issue2114Test extends AbstractIntegrationTest {
     void testIssue() {
         performAnalysis("../java11/Issue2114.class");
 
-        assertFoundDefaultEncodingRelianceInMethod("filesReadString");
-        assertFoundDefaultEncodingRelianceInMethod("filesReadAllLines");
-        assertFoundDefaultEncodingRelianceInMethod("filesWriteString");
-        assertFoundDefaultEncodingRelianceInMethod("filesNewBufferedReader");
-        assertFoundDefaultEncodingRelianceInMethod("filesNewBufferedWriter");
+        assertDidNotFindDefaultEncodingRelianceInMethod("filesReadString");
+        assertDidNotFindDefaultEncodingRelianceInMethod("filesReadAllLines");
+        assertDidNotFindDefaultEncodingRelianceInMethod("filesWriteString");
+        assertDidNotFindDefaultEncodingRelianceInMethod("filesNewBufferedReader");
+        assertDidNotFindDefaultEncodingRelianceInMethod("filesNewBufferedWriter");
     }
 
-    private void assertFoundDefaultEncodingRelianceInMethod(String methodName) {
+    private void assertDidNotFindDefaultEncodingRelianceInMethod(String methodName) {
         BugInstanceMatcher matcher = new BugInstanceMatcherBuilder()
                 .bugType("DM_DEFAULT_ENCODING")
                 .inMethod(methodName)
                 .build();
 
-        assertThat(getBugCollection(), containsExactly(1, matcher));
+        assertThat(getBugCollection(), containsExactly(0, matcher));
     }
 }
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/DefaultEncodingDetector.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/DefaultEncodingDetector.java
@@ -139,19 +139,6 @@ public void loadAuxiliaryAnnotations() {
                     DefaultEncodingAnnotation.DEFAULT_ENCODING);
             addMethodAnnotation("java.util.Formatter", Const.CONSTRUCTOR_NAME, "(Ljava/io/OutputStream;)V", false,
                     DefaultEncodingAnnotation.DEFAULT_ENCODING);
-
-            addMethodAnnotation("java.nio.file.Files", "readString", "(Ljava/nio/file/Path;)Ljava/lang/String;", true,
-                    DefaultEncodingAnnotation.DEFAULT_ENCODING);
-            addMethodAnnotation("java.nio.file.Files", "readAllLines", "(Ljava/nio/file/Path;)Ljava/util/List;", true,
-                    DefaultEncodingAnnotation.DEFAULT_ENCODING);
-            addMethodAnnotation("java.nio.file.Files", "writeString",
-                    "(Ljava/nio/file/Path;Ljava/lang/CharSequence;[Ljava/nio/file/OpenOption;)Ljava/nio/file/Path;", true,
-                    DefaultEncodingAnnotation.DEFAULT_ENCODING);
-            addMethodAnnotation("java.nio.file.Files", "newBufferedReader", "(Ljava/nio/file/Path;)Ljava/io/BufferedReader;", true,
-                    DefaultEncodingAnnotation.DEFAULT_ENCODING);
-            addMethodAnnotation("java.nio.file.Files", "newBufferedWriter",
-                    "(Ljava/nio/file/Path;[Ljava/nio/file/OpenOption;)Ljava/io/BufferedWriter;", true,
-                    DefaultEncodingAnnotation.DEFAULT_ENCODING);
         }
 
     }