SONARPY-1745 Update remaining usages of Collectors.toList() to toList() (#1755)

Author: guillaume-dequenne

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/RuffReportTest.java

@@ -49,7 +49,7 @@ void import_report() {
             .setProjectDir(new File("projects/ruff_project")));
 
     List<Issues.Issue> issues = issues(PROJECT).stream().sorted(Comparator.comparing(Issues.Issue::getRule))
-        .collect(Collectors.toList());
+        .toList();
     assertThat(issues).hasSize(2);
 
     Issues.Issue firstIssue = issues.get(0);

python-checks/src/main/java/org/sonar/python/checks/ConsistentReturnCheck.java

@@ -54,7 +54,7 @@ public void initialize(Context context) {
 
       List<Tree> returnsWithValue = endStatements.stream()
         .filter(s -> s.is(Kind.RETURN_STMT) && hasValue((ReturnStatement) s))
-        .collect(Collectors.toList());
+        .toList();
 
       if (returnsWithValue.size() != endStatements.size() && !returnsWithValue.isEmpty()) {
         addIssue(ctx, functionDef, endStatements);
@@ -64,7 +64,7 @@ public void initialize(Context context) {
 
   private static boolean hasExceptOrFinally(ControlFlowGraph cfg) {
     return cfg.blocks().stream().anyMatch(block ->
-      block instanceof CfgBranchingBlock && ((CfgBranchingBlock) block).branchingTree().is(Kind.EXCEPT_CLAUSE, Kind.FINALLY_CLAUSE));
+      block instanceof CfgBranchingBlock cfgBranchingBlock && cfgBranchingBlock.branchingTree().is(Kind.EXCEPT_CLAUSE, Kind.FINALLY_CLAUSE));
   }
 
   private static boolean isWhileTrue(Statement statement) {

python-checks/src/main/java/org/sonar/python/checks/DeadStoreCheck.java

@@ -132,12 +132,12 @@ private static void raiseIssue(SubscriptionContext ctx, DeadStoreUtils.Unnecessa
       .map(DeadStoreCheck::mapToParentAssignmentStatementOrExpression)
       .forEach(tree -> issue.secondary(tree, String.format(SECONDARY_MESSAGE_TEMPLATE, symbolName)));
 
-    if (element instanceof Statement && !isExceptionForQuickFix((Statement) element)) {
+    if (element instanceof Statement statement && !isExceptionForQuickFix(statement)) {
       if (element.is(Tree.Kind.ASSIGNMENT_STMT) && ((AssignmentStatement) element).lhsExpressions().size() > 1) {
         addMultipleAssignmentStatementQuickFix((AssignmentStatement) element, issue, unnecessaryAssignment.symbol);
       } else {
         issue.addQuickFix(PythonQuickFix.newQuickFix(QUICK_FIX_MESSAGE,
-          TextEditUtils.removeStatement((Statement) element)));
+          TextEditUtils.removeStatement(statement)));
       }
     }
 

python-checks/src/test/java/org/sonar/python/checks/CheckListTest.java

@@ -88,17 +88,17 @@ void validate_sqKey_field_in_json() throws IOException {
       List<Path> jsonList = fileStream
         .filter(path -> !path.toString().endsWith("Sonar_way_profile.json"))
         .sorted()
-        .collect(Collectors.toList());
+        .toList();
 
       List<String> fileNames = jsonList.stream()
         .map(Path::getFileName)
         .map(Path::toString)
         .map(name -> name.replaceAll("\\.json$", ""))
-        .collect(Collectors.toList());
+        .toList();
 
       List<String> sqKeys = jsonList.stream()
         .map(CheckListTest::extractSqKey)
-        .collect(Collectors.toList());
+        .toList();
 
       assertThat(fileNames).isEqualTo(sqKeys);
     }
@@ -107,7 +107,7 @@ void validate_sqKey_field_in_json() throws IOException {
   @Test
   void test_no_deprecated_rule_in_default_profile() throws IOException, ParseException {
     try (Stream<Path> fileStream = Files.find(METADATA_DIR, 1, (path, attr) -> path.toString().endsWith(".json"))) {
-      List<Path> jsonList = fileStream.collect(Collectors.toList());
+      List<Path> jsonList = fileStream.toList();
 
       Path sonarWayProfilePath = jsonList.stream().filter(path -> path.toString().endsWith("Sonar_way_profile.json")).findFirst().get();
       List<String> keysInDefaultProfile = getKeysInDefaultProfile(sonarWayProfilePath);
@@ -171,7 +171,7 @@ private static List<String> getKeysInDefaultProfile(Path sonarWayPath) throws IO
     JSONParser jsonParser = new JSONParser();
     JSONObject sonarWayJson = (JSONObject) jsonParser.parse(new InputStreamReader(in, UTF_8));
     JSONArray sonarWayKeys = (JSONArray) sonarWayJson.get("ruleKeys");
-    return (List<String>) sonarWayKeys.stream().sorted().collect(Collectors.toList());
+    return (List<String>) sonarWayKeys.stream().sorted().toList();
   }
 
   private static String extractSqKey(Path jsonFile) {

python-checks/src/test/java/org/sonar/python/checks/quickfix/PythonQuickFixVerifier.java

@@ -96,7 +96,7 @@ public static void verify(Function<String, PythonVisitorContext> createVisitorCo
 
     List<String> appliedQuickFix = issue.quickFixes().stream()
       .map(quickFix -> applyQuickFix(codeWithIssue, quickFix))
-      .collect(Collectors.toList());
+      .toList();
 
     assertThat(appliedQuickFix)
       .as("The code with the quickfix applied is not the expected result.\n" +

python-frontend/src/main/java/org/sonar/plugins/python/api/cfg/ControlFlowGraph.java

@@ -98,7 +98,7 @@ public String toString() {
 
     Function<Collection<CfgBlock>, List<CfgBlock>> sortedByDisplayString = list -> list.stream()
       .sorted(Comparator.comparing(Object::toString))
-      .collect(Collectors.toList());
+      .toList();
 
     List<CfgBlock> sortedBlocks = sortedByDisplayString.apply(blocks);
     int graphNodeId = 0;

python-frontend/src/main/java/org/sonar/python/cfg/fixpoint/ReachingDefinitionsAnalysis.java

@@ -205,7 +205,7 @@ private void updateProgramState(Tree element, Map<Symbol, Set<Expression>> out)
   private void updateStateForAssignment(AssignmentStatement element, Map<Symbol, Set<Expression>> programState) {
     List<Expression> lhsExpressions = element.lhsExpressions().stream()
         .flatMap(exprList -> exprList.expressions().stream())
-        .collect(Collectors.toList());
+        .toList();
     performUpdate(programState, lhsExpressions, element::assignedValue);
   }
 

python-frontend/src/main/java/org/sonar/python/index/DescriptorUtils.java

@@ -65,7 +65,7 @@ private static ClassDescriptor classDescriptor(ClassSymbol classSymbol) {
       .withName(classSymbol.name())
       .withFullyQualifiedName(classSymbol.fullyQualifiedName())
       .withMembers(classSymbol.declaredMembers().stream().map(DescriptorUtils::descriptor).collect(Collectors.toSet()))
-      .withSuperClasses(classSymbol.superClasses().stream().map(Symbol::fullyQualifiedName).filter(Objects::nonNull).collect(Collectors.toList()))
+      .withSuperClasses(classSymbol.superClasses().stream().map(Symbol::fullyQualifiedName).filter(Objects::nonNull).toList())
       .withDefinitionLocation(classSymbol.definitionLocation())
       .withHasMetaClass(((ClassSymbolImpl) classSymbol).hasMetaClass())
       .withHasSuperClassWithoutDescriptor(((ClassSymbolImpl) classSymbol).hasSuperClassWithoutSymbol() ||
@@ -114,7 +114,7 @@ private static List<FunctionDescriptor.Parameter> parameters(List<FunctionSymbol
       parameter.isPositionalVariadic(),
       parameter.isKeywordVariadic(),
       parameter.location()
-    )).collect(Collectors.toList());
+    )).toList();
   }
 
   // TODO SONARPY-958: Cleanup the symbol construction from descriptors by extracting this logic in a builder class
@@ -169,7 +169,7 @@ private static void addMembers(ClassSymbolImpl classSymbol, ClassDescriptor clas
         }
         return member;
       })
-      .collect(Collectors.toList()));
+      .toList());
   }
 
   private static void addSuperClasses(ClassSymbolImpl classSymbol, ClassDescriptor classDescriptor,

python-frontend/src/main/java/org/sonar/python/index/DescriptorsToProtobuf.java

@@ -127,7 +127,7 @@ public static DescriptorsProtos.ClassDescriptor toProtobuf(ClassDescriptor class
   public static DescriptorsProtos.FunctionDescriptor toProtobuf(FunctionDescriptor functionDescriptor) {
     DescriptorsProtos.FunctionDescriptor.Builder builder = DescriptorsProtos.FunctionDescriptor.newBuilder()
       .setName(functionDescriptor.name())
-      .addAllParameters(functionDescriptor.parameters().stream().map(DescriptorsToProtobuf::toProtobuf).collect(Collectors.toList()))
+      .addAllParameters(functionDescriptor.parameters().stream().map(DescriptorsToProtobuf::toProtobuf).toList())
       .setIsAsynchronous(functionDescriptor.isAsynchronous())
       .setIsInstanceMethod(functionDescriptor.isInstanceMethod())
       .addAllDecorators(functionDescriptor.decorators())

python-frontend/src/main/java/org/sonar/python/quickfix/TextEditUtils.java

@@ -97,7 +97,7 @@ public static List<PythonTextEdit> shiftLeft(StatementList statementList) {
       .map(statement -> shiftLeft(statement, offset))
       .flatMap(List::stream)
       .distinct()
-      .collect(Collectors.toList());
+      .toList();
   }
 
   /**
@@ -110,7 +110,7 @@ public static List<PythonTextEdit> shiftLeft(Tree tree, int offset) {
       .map(Token::line)
       .distinct()
       .map(line -> removeRange(line, 0, line, offset))
-      .collect(Collectors.toList());
+      .toList();
   }
 
   public static PythonTextEdit removeRange(int startLine, int startColumn, int endLine, int endColumn) {