SONARPY-3284 Fix a few open issues from NEXT (#470)

Wohops · sonartech · commit debe3629ccca · 2025-08-26T09:32:56.000Z
Addressed open issues raised by rules:
- S6204: Simply use 'toList()'
- S6068: Remove useless eq(...)
- S6353: Simplify regex with concise characters
- S1130: Remove exceptions that are not thrown
- S116: Make field a constant

GitOrigin-RevId: 0af0794facc0710a0369a2db60dcf9688c708138
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/RuffReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/RuffReportTest.java
@@ -31,7 +31,7 @@
 
 class RuffReportTest {
 
-  private final String PROJECT = "ruff_project";
+  private static final String PROJECT = "ruff_project";
 
   @RegisterExtension
   public static final ConcurrentOrchestratorExtension ORCHESTRATOR = TestsUtils.dynamicOrchestrator;
diff --git a/python-checks/src/main/java/org/sonar/python/checks/StringFormat.java b/python-checks/src/main/java/org/sonar/python/checks/StringFormat.java
@@ -44,12 +44,12 @@ public class StringFormat {
     %\
     (?<field>(?:\\((?<mapkey>.*?)\\))?\
     (?<flags>[#\\-+0 ]*)?\
-    (?<width>[0-9]*|\\*)?\
-    (?:\\.(?<precision>[0-9]*|\\*))?\
+    (?<width>\\d*|\\*)?\
+    (?:\\.(?<precision>\\d*|\\*))?\
     (?:[lLH])?\
     (?<type>[diueEfFgGoxXrsac]|%))?""");
 
-  private static final Pattern FORMAT_FIELD_PATTERN = Pattern.compile("^(?<name>[^.\\[!:{}]+)?(?:(?:\\.[a-zA-Z0-9_]+)|(?:\\[[^]]+]))*");
+  private static final Pattern FORMAT_FIELD_PATTERN = Pattern.compile("^(?<name>[^.\\[!:{}]+)?(?:(?:\\.\\w+)|(?:\\[[^]]+]))*");
   private static final Pattern FORMAT_NUMBER_PATTERN = Pattern.compile("^\\d+$");
   private static final Pattern FORMAT_UNICODE_PATTERN = Pattern.compile("^\\\\N\\{[a-zA-Z0-9-_\\s]*}");
 
diff --git a/python-checks/src/main/java/org/sonar/python/checks/hotspots/ClearTextProtocolsCheck.java b/python-checks/src/main/java/org/sonar/python/checks/hotspots/ClearTextProtocolsCheck.java
@@ -49,7 +49,7 @@
 @Rule(key = "S5332")
 public class ClearTextProtocolsCheck extends PythonSubscriptionCheck {
   private static final List<String> SENSITIVE_PROTOCOLS = Arrays.asList("http://", "ftp://", "telnet://");
-  private static final Pattern LOOPBACK = Pattern.compile("localhost|127(?:\\.[0-9]+){0,2}\\.[0-9]+$|^(?:0*\\:)*?:?0*1", Pattern.CASE_INSENSITIVE);
+  private static final Pattern LOOPBACK = Pattern.compile("localhost|127(?:\\.\\d+){0,2}\\.\\d+$|^(?:0*\\:)*?:?0*1", Pattern.CASE_INSENSITIVE);
   private static final Map<String, String> ALTERNATIVES = Map.of(
     "http", "https",
     "ftp", "sftp, scp or ftps",
diff --git a/python-checks/src/test/java/org/sonar/python/checks/OpenSourceCheckListTest.java b/python-checks/src/test/java/org/sonar/python/checks/OpenSourceCheckListTest.java
@@ -130,7 +130,7 @@ void test_no_deprecated_rule_in_default_profile() throws IOException, ParseExcep
   }
 
   @Test
-  void test_locally_deprecated_rules_stay_deprecated() throws IOException, ParseException {
+  void test_locally_deprecated_rules_stay_deprecated() throws IOException {
     // Some rules have been deprecated only for Python. When executed, rule-api reverts those rule to "ready" status, which is incorrect.
     // This test is here to ensure it doesn't happen.
     List<String> locallyDeprecatedRules = Arrays.asList("S1523", "S4721");
diff --git a/python-checks/src/test/java/org/sonar/python/checks/regex/ReluctantQuantifierWithEmptyContinuationCheckTest.java b/python-checks/src/test/java/org/sonar/python/checks/regex/ReluctantQuantifierWithEmptyContinuationCheckTest.java
@@ -22,7 +22,7 @@
 class ReluctantQuantifierWithEmptyContinuationCheckTest {
 
   @Test
-  void test() throws Exception {
+  void test() {
     PythonCheckVerifier.verify("src/test/resources/checks/regex/reluctantQuantifierWithEmptyContinuationCheck.py", new ReluctantQuantifierWithEmptyContinuationCheck());
   }
 
diff --git a/python-checks/src/test/java/org/sonar/python/checks/utils/CheckUtilsTest.java b/python-checks/src/test/java/org/sonar/python/checks/utils/CheckUtilsTest.java
@@ -234,7 +234,7 @@ private static FileInput parseFile(String path) throws IOException {
     }
   }
 
-  private static FileInput parseFileWithSymbols(String path) throws IOException {
+  private static FileInput parseFileWithSymbols(String path) {
     return TestPythonVisitorRunner
       .createContext(new File(path))
       .rootTree();
@@ -260,6 +260,6 @@ private static List<FunctionDef> descendantFunctions(Tree tree) {
     }
     return tree.children().stream()
       .flatMap(child -> descendantFunctions(child).stream())
-      .collect(Collectors.toUnmodifiableList());
+      .toList();
   }
 }
diff --git a/python-commons/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java b/python-commons/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java
@@ -199,7 +199,7 @@ void test_unique_report() {
     List<Integer> actual = IntStream.range(1, 18).mapToObj(line -> context.lineHits(FILE4_KEY, line)).toList();
     Integer coverageAtLine6 = actual.get(5);
     assertThat(coverageAtLine6).isOne();
-    verify(analysisWarnings, times(1)).addUnique(eq("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead."));
+    verify(analysisWarnings, times(1)).addUnique("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead.");
   }
 
   @Test
diff --git a/python-commons/src/test/java/org/sonar/plugins/python/xunit/PythonXUnitSensorTest.java b/python-commons/src/test/java/org/sonar/plugins/python/xunit/PythonXUnitSensorTest.java
@@ -120,7 +120,7 @@ void shouldLogWarningWhenGivenInvalidTime() {
       the following exception occurred: java.text.ParseException: Unparseable number: "brrrr"\
       """);
     verify(analysisWarnings, times(1))
-      .addUnique(eq("An error occurred while trying to import XUnit report(s): 'xunit-reports/invalid-time-xunit-report.xml'"));
+      .addUnique("An error occurred while trying to import XUnit report(s): 'xunit-reports/invalid-time-xunit-report.xml'");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ void test_no_deprecated_rule_in_default_profile() throws IOException, ParseExcep`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@Test`
`133`		`- void test_locally_deprecated_rules_stay_deprecated() throws IOException, ParseException {`
	`133`	`+ void test_locally_deprecated_rules_stay_deprecated() throws IOException {`
`134`	`134`	`// Some rules have been deprecated only for Python. When executed, rule-api reverts those rule to "ready" status, which is incorrect.`
`135`	`135`	`// This test is here to ensure it doesn't happen.`
`136`	`136`	`List<String> locallyDeprecatedRules = Arrays.asList("S1523", "S4721");`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`class ReluctantQuantifierWithEmptyContinuationCheckTest {`
`23`	`23`
`24`	`24`	`@Test`
`25`		`- void test() throws Exception {`
	`25`	`+ void test() {`
`26`	`26`	`PythonCheckVerifier.verify("src/test/resources/checks/regex/reluctantQuantifierWithEmptyContinuationCheck.py", new ReluctantQuantifierWithEmptyContinuationCheck());`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ private static FileInput parseFile(String path) throws IOException {`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`- private static FileInput parseFileWithSymbols(String path) throws IOException {`
	`237`	`+ private static FileInput parseFileWithSymbols(String path) {`
`238`	`238`	`return TestPythonVisitorRunner`
`239`	`239`	`.createContext(new File(path))`
`240`	`240`	`.rootTree();`
`@@ -260,6 +260,6 @@ private static List<FunctionDef> descendantFunctions(Tree tree) {`
`260`	`260`	`}`
`261`	`261`	`return tree.children().stream()`
`262`	`262`	`.flatMap(child -> descendantFunctions(child).stream())`
`263`		`- .collect(Collectors.toUnmodifiableList());`
	`263`	`+ .toList();`
`264`	`264`	`}`
`265`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ void test_unique_report() {`
`199`	`199`	`List<Integer> actual = IntStream.range(1, 18).mapToObj(line -> context.lineHits(FILE4_KEY, line)).toList();`
`200`	`200`	`Integer coverageAtLine6 = actual.get(5);`
`201`	`201`	`assertThat(coverageAtLine6).isOne();`
`202`		`- verify(analysisWarnings, times(1)).addUnique(eq("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead."));`
	`202`	`+ verify(analysisWarnings, times(1)).addUnique("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead.");`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void shouldLogWarningWhenGivenInvalidTime() {`
`120`	`120`	`the following exception occurred: java.text.ParseException: Unparseable number: "brrrr"\`
`121`	`121`	`""");`
`122`	`122`	`verify(analysisWarnings, times(1))`
`123`		`- .addUnique(eq("An error occurred while trying to import XUnit report(s): 'xunit-reports/invalid-time-xunit-report.xml'"));`
	`123`	`+ .addUnique("An error occurred while trying to import XUnit report(s): 'xunit-reports/invalid-time-xunit-report.xml'");`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`@Test`