Skip to content

Commit ffb57ca

Browse files
authored
SONARPY 1745b Update .collect(Collectors.toList()) to .toList()
1 parent 377b04f commit ffb57ca

36 files changed

+54
-85
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.Optional;
2727
import java.util.Set;
2828
import java.util.function.Predicate;
29-
import java.util.stream.Collectors;
3029
import javax.annotation.Nullable;
3130
import org.sonar.check.Rule;
3231
import org.sonar.plugins.python.api.LocationInFile;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private static void checkCaughtExceptions(SubscriptionContext ctx, Map<ClassSymb
7676
var caughtParentExceptions = caughtExceptionsBySymbol.entrySet()
7777
.stream()
7878
.filter(entry -> entry.getKey() != currentSymbol && currentSymbol.isOrExtends(entry.getKey()))
79-
.collect(Collectors.toList());
79+
.toList();
8080

8181
if (!caughtParentExceptions.isEmpty()) {
8282
var issue = ctx.addIssue(currentException, "Remove this redundant Exception class; it derives from another which is already caught.");

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,19 @@
2121

2222
import java.util.Arrays;
2323
import java.util.List;
24-
import java.util.stream.Collectors;
2524
import java.util.stream.Stream;
2625
import org.sonar.check.Rule;
2726
import org.sonar.check.RuleProperty;
2827
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
2928
import org.sonar.plugins.python.api.SubscriptionContext;
29+
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
30+
import org.sonar.plugins.python.api.quickfix.PythonTextEdit;
3031
import org.sonar.plugins.python.api.tree.Decorator;
3132
import org.sonar.plugins.python.api.tree.FunctionDef;
3233
import org.sonar.plugins.python.api.tree.Name;
3334
import org.sonar.plugins.python.api.tree.Parameter;
3435
import org.sonar.plugins.python.api.tree.ParameterList;
3536
import org.sonar.plugins.python.api.tree.Tree;
36-
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
37-
import org.sonar.plugins.python.api.quickfix.PythonTextEdit;
3837
import org.sonar.python.quickfix.TextEditUtils;
3938
import org.sonar.python.tree.TreeUtils;
4039

@@ -55,7 +54,7 @@ private List<String> classParameterNames() {
5554
if (classParameterNamesList == null) {
5655
classParameterNamesList = Stream.of(classParameterNames.split(","))
5756
.map(String::trim)
58-
.collect(Collectors.toList());
57+
.toList();
5958
}
6059
return classParameterNamesList;
6160
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import java.util.List;
2323
import java.util.Objects;
24-
import java.util.stream.Collectors;
2524
import javax.annotation.CheckForNull;
2625
import org.sonar.check.Rule;
2726
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
@@ -83,7 +82,7 @@ private static boolean couldDictBeAssignedToDataArg(Name dataArg, int recursiveC
8382
.map(Usage::tree)
8483
.map(usage -> TreeUtils.firstAncestorOfKind(usage, Tree.Kind.ASSIGNMENT_STMT, Tree.Kind.ANNOTATED_ASSIGNMENT, Tree.Kind.ASSIGNMENT_EXPRESSION))
8584
.filter(Objects::nonNull)
86-
.collect(Collectors.toList());
85+
.toList();
8786
if (assignmentStmts.size() == 1) {
8887
Tree assignment = assignmentStmts.get(0);
8988
Expression assignedValue = getAssignedValue(assignment);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import java.util.List;
2323
import java.util.Objects;
24-
import java.util.stream.Collectors;
2524
import javax.annotation.CheckForNull;
2625
import org.sonar.check.Rule;
2726
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
@@ -85,7 +84,7 @@ private static void checkIfLocalsIsAssignedToContextParameter(SubscriptionContex
8584
.map(Usage::tree)
8685
.map(usage -> TreeUtils.firstAncestorOfKind(usage, Tree.Kind.ASSIGNMENT_EXPRESSION, Tree.Kind.ASSIGNMENT_STMT, Tree.Kind.ANNOTATED_ASSIGNMENT))
8786
.filter(Objects::nonNull)
88-
.collect(Collectors.toList());
87+
.toList();
8988
if (assignmentStmts.size() == 1) {
9089
Tree assignment = assignmentStmts.get(0);
9190
Expression assignedValue = getAssignedValue(assignment);

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@
2424
import java.util.LinkedList;
2525
import java.util.List;
2626
import java.util.Optional;
27-
import java.util.stream.Collectors;
2827
import org.sonar.check.Rule;
2928
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
3029
import org.sonar.plugins.python.api.SubscriptionContext;
3130
import org.sonar.plugins.python.api.symbols.ClassSymbol;
31+
import org.sonar.plugins.python.api.symbols.Symbol;
32+
import org.sonar.plugins.python.api.tree.BaseTreeVisitor;
3233
import org.sonar.plugins.python.api.tree.ClassDef;
3334
import org.sonar.plugins.python.api.tree.FunctionDef;
3435
import org.sonar.plugins.python.api.tree.Tree;
35-
import org.sonar.plugins.python.api.symbols.Symbol;
36-
import org.sonar.plugins.python.api.tree.BaseTreeVisitor;
3736
import org.sonar.python.tree.TreeUtils;
3837

3938
@Rule(key = "S1845")
@@ -56,7 +55,7 @@ public void initialize(Context context) {
5655
.map(s -> s.usages().stream().findFirst())
5756
.filter(Optional::isPresent)
5857
.map(usage -> usage.get().tree())
59-
.collect(Collectors.toList());
58+
.toList();
6059
lookForDuplications(ctx, fieldNames, methodVisitor.methodNames);
6160
});
6261
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.List;
2424
import java.util.Optional;
2525
import java.util.Set;
26-
import java.util.stream.Collectors;
2726
import javax.annotation.Nullable;
2827
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
2928
import org.sonar.plugins.python.api.SubscriptionContext;
@@ -157,7 +156,7 @@ private void verifyAssignmentStatement(SubscriptionContext ctx) {
157156
.map(ExpressionList::expressions)
158157
.flatMap(List::stream)
159158
.filter(this::isSensitiveProperty)
160-
.collect(Collectors.toList());
159+
.toList();
161160
if (!expressionList.isEmpty()) {
162161
PreciseIssue issue = ctx.addIssue(assignmentStatementTree.assignedValue(), getMessage());
163162
expressionList.forEach(expr -> issue.secondary(expr, SECONDARY_MESSAGE));

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
import java.util.List;
2323
import java.util.Optional;
24-
import java.util.stream.Collectors;
2524
import javax.annotation.CheckForNull;
2625
import javax.annotation.Nullable;
2726
import org.sonar.check.Rule;
2827
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
2928
import org.sonar.plugins.python.api.SubscriptionContext;
29+
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
3030
import org.sonar.plugins.python.api.symbols.Symbol;
3131
import org.sonar.plugins.python.api.tree.BaseTreeVisitor;
3232
import org.sonar.plugins.python.api.tree.CallExpression;
@@ -37,7 +37,6 @@
3737
import org.sonar.plugins.python.api.tree.Token;
3838
import org.sonar.plugins.python.api.tree.Tree;
3939
import org.sonar.plugins.python.api.tree.TryStatement;
40-
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
4140
import org.sonar.python.quickfix.TextEditUtils;
4241
import org.sonar.python.tree.TreeUtils;
4342

@@ -212,7 +211,7 @@ public void initialize(Context context) {
212211
Expression exceptionInstance = exceptClause.exceptionInstance();
213212
Symbol exceptionInstanceSymbol = findExceptionInstanceSymbol(exceptionInstance);
214213

215-
List<Expression> caughtExceptions = TreeUtils.flattenTuples(exceptionExpr).collect(Collectors.toList());
214+
List<Expression> caughtExceptions = TreeUtils.flattenTuples(exceptionExpr).toList();
216215
for (Expression caughtException : caughtExceptions) {
217216
isSystemExitHandled |= handleCaughtException(ctx, caughtException, exceptionInstanceSymbol, exceptClause.body(), isSystemExitHandled);
218217
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.HashSet;
2727
import java.util.List;
2828
import java.util.Set;
29-
import java.util.stream.Collectors;
3029
import javax.annotation.CheckForNull;
3130
import javax.annotation.Nullable;
3231
import org.sonar.check.Rule;
@@ -98,7 +97,7 @@ private static boolean collectRecursiveCallsAndCheckIfEndBlockIsReachable(Functi
9897
if (!blockRecursiveCalls.isEmpty()) {
9998
allRecursiveCalls.addAll(blockRecursiveCalls.stream()
10099
.filter(tree -> !isInsideTryBlock(tree))
101-
.collect(Collectors.toList()));
100+
.toList());
102101
} else {
103102
block.successors().stream().filter(pushedBlocks::add).forEach(blockToVisit::addLast);
104103
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,17 @@
2222
import java.util.Arrays;
2323
import java.util.List;
2424
import java.util.Objects;
25-
import java.util.stream.Collectors;
2625
import org.sonar.check.Rule;
2726
import org.sonar.plugins.python.api.PythonSubscriptionCheck;
2827
import org.sonar.plugins.python.api.SubscriptionContext;
28+
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
2929
import org.sonar.plugins.python.api.symbols.ClassSymbol;
3030
import org.sonar.plugins.python.api.symbols.FunctionSymbol;
3131
import org.sonar.plugins.python.api.symbols.Usage;
3232
import org.sonar.plugins.python.api.tree.ClassDef;
3333
import org.sonar.plugins.python.api.tree.FunctionDef;
3434
import org.sonar.plugins.python.api.tree.Parameter;
3535
import org.sonar.plugins.python.api.tree.Tree;
36-
import org.sonar.plugins.python.api.quickfix.PythonQuickFix;
3736
import org.sonar.python.tree.TreeUtils;
3837

3938
import static org.sonar.python.quickfix.TextEditUtils.insertAfter;
@@ -81,7 +80,7 @@ private static void handleFunctionDef(SubscriptionContext ctx, ClassDef classDef
8180
List<String> decoratorNames = functionDef.decorators()
8281
.stream()
8382
.map(decorator -> TreeUtils.decoratorNameFromExpression(decorator.expression()))
84-
.filter(Objects::nonNull).collect(Collectors.toList());
83+
.filter(Objects::nonNull).toList();
8584

8685
if (decoratorNames.contains("staticmethod")) {
8786
return;

0 commit comments

Comments
 (0)