SONARPY-1745 Update code syntax to match Java 17 (#1753)

Author: guillaume-dequenne

python-checks-testkit/src/main/java/org/sonar/python/checks/utils/PythonCheckVerifier.java

@@ -24,7 +24,6 @@
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.plugins.python.api.IssueLocation;
 import org.sonar.plugins.python.api.PythonCheck;
@@ -49,8 +48,8 @@ private PythonCheckVerifier() {
 
   private static List<PreciseIssue> scanFileForIssues(PythonCheck check, PythonVisitorContext context) {
     check.scanFile(context);
-    if (check instanceof PythonSubscriptionCheck) {
-      SubscriptionVisitor.analyze(Collections.singletonList((PythonSubscriptionCheck) check), context);
+    if (check instanceof PythonSubscriptionCheck subscriptionCheck) {
+      SubscriptionVisitor.analyze(Collections.singletonList(subscriptionCheck), context);
     }
     return context.getIssues();
   }
@@ -65,14 +64,14 @@ public static void verifyNoIssue(String path, PythonCheck check) {
   }
 
   public static void verify(List<String> paths, PythonCheck check) {
-    List<File> files = paths.stream().map(File::new).collect(Collectors.toList());
+    List<File> files = paths.stream().map(File::new).toList();
     File baseDirFile = new File(files.get(0).getParent());
     ProjectLevelSymbolTable projectLevelSymbolTable = TestPythonVisitorRunner.globalSymbols(files, baseDirFile);
     createVerifier(files, check, projectLevelSymbolTable, baseDirFile).assertOneOrMoreIssues();
   }
 
   public static void verifyNoIssue(List<String> paths, PythonCheck check) {
-    List<File> files = paths.stream().map(File::new).collect(Collectors.toList());
+    List<File> files = paths.stream().map(File::new).toList();
     File baseDirFile = new File(files.get(0).getParent());
     ProjectLevelSymbolTable projectLevelSymbolTable = TestPythonVisitorRunner.globalSymbols(files, baseDirFile);
     createVerifier(files, check, projectLevelSymbolTable, baseDirFile).assertNoIssues();

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

@@ -178,12 +178,11 @@ private static boolean containsPossibleSideEffect(Expression expression) {
     if (expression.is(Tree.Kind.CALL_EXPR)) {
       return true;
     }
-    if (expression instanceof BinaryExpression) {
-      BinaryExpression binaryExpression = (BinaryExpression) expression;
+    if (expression instanceof BinaryExpression binaryExpression) {
       return containsPossibleSideEffect(binaryExpression.leftOperand()) || containsPossibleSideEffect(binaryExpression.rightOperand());
     }
-    if (expression instanceof ParenthesizedExpression) {
-      return containsPossibleSideEffect(((ParenthesizedExpression) expression).expression());
+    if (expression instanceof ParenthesizedExpression parenthesizedExpression) {
+      return containsPossibleSideEffect(parenthesizedExpression.expression());
     }
     return false;
   }

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

@@ -89,7 +89,7 @@ private static void checkPositionalParameters(SubscriptionContext ctx, CallExpre
 
     List<RegularArgument> arguments = callExpression.arguments().stream()
       .map(RegularArgument.class::cast)
-      .collect(Collectors.toList());
+      .toList();
     long nbPositionalArgs = arguments.stream().filter(a -> a.keywordArgument() == null).count();
     long nbNonKeywordOnlyPassedWithKeyword = arguments.stream()
       .map(RegularArgument::keywordArgument)

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

@@ -57,15 +57,10 @@ public void initialize(Context context) {
   private static boolean isBackslashedSpaceAfterInlineMarkup(boolean isThreeQuotes, String string, int position, char current) {
     if (isThreeQuotes && current == ' ' && position > 6) {
       char twoCharactersBefore = string.charAt(position - 2);
-      switch (twoCharactersBefore) {
-        case '`':
-        case '*':
-        case '_':
-        case '|':
-          return true;
-        default:
-          return false;
-      }
+      return switch (twoCharactersBefore) {
+        case '`', '*', '_', '|' -> true;
+        default -> false;
+      };
     }
     return false;
   }

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

@@ -72,8 +72,7 @@ private static void checkForTypingModule(SubscriptionContext subscriptionContext
   }
 
   private static void checkForGenericsFromTypingModule(SubscriptionContext subscriptionContext, Expression expression) {
-    if (expression instanceof SubscriptionExpression) {
-      SubscriptionExpression subscriptionExpression = (SubscriptionExpression) expression;
+    if (expression instanceof SubscriptionExpression subscriptionExpression) {
       getGenericsCounterPartFromTypingModule(subscriptionContext, subscriptionExpression)
         .ifPresent(preferredGenerics -> raiseIssueForGenerics(subscriptionContext, subscriptionExpression, preferredGenerics));
     }

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

@@ -173,7 +173,7 @@ private static PythonQuickFix createQuickFix(Symbol symbol) {
       .map(Usage::tree)
       .map(Tree::firstToken)
       .map(token -> TextEditUtils.insertBefore(token, RENAME_PREFIX))
-      .collect(Collectors.toList());
+      .toList();
 
     return PythonQuickFix.newQuickFix(String.format(QUICK_FIX_MESSAGE_FORMAT, symbol.name()))
       .addTextEdit(edits)

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

@@ -105,7 +105,7 @@ private static void reportOnMissingParameters(SubscriptionContext ctx, FunctionS
     var missingParameters = overriddenParams.subList(indexFirstMissingParam, overriddenParams.size())
       .stream()
       .map(FunctionSymbol.Parameter::name)
-      .collect(Collectors.toList());
+      .toList();
     if (!missingParameters.isEmpty()) {
 //      If at least one parameter missing name - set message as "Add missing N parameters" where N is amount of missing parameters
       reportIssue(ctx, getMissingParametersMessage(missingParameters), method.definitionLocation(), overriddenMethod);

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

@@ -148,8 +148,8 @@ private static PythonQuickFix createQuickFix(Expression currentException) {
   }
 
   private static void addExceptionExpression(Expression exceptionExpression, Map<ClassSymbol, List<Expression>> caughtExceptionsByFQN) {
-    if (exceptionExpression instanceof HasSymbol) {
-      Symbol symbol = ((HasSymbol) exceptionExpression).symbol();
+    if (exceptionExpression instanceof HasSymbol hasSymbol) {
+      Symbol symbol = hasSymbol.symbol();
       if (symbol != null && symbol.kind().equals(Symbol.Kind.CLASS)) {
         ClassSymbol classSymbol = (ClassSymbol) symbol;
         caughtExceptionsByFQN.computeIfAbsent(classSymbol, k -> new ArrayList<>()).add(exceptionExpression);

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

@@ -125,8 +125,8 @@ private static boolean isUsedInsideInExpression(Expression subscriptionObject) {
 
     private static boolean isRightOperandInExpression(Tree tree) {
       Tree parent = tree.parent();
-      if (parent instanceof InExpression) {
-        return ((InExpression) parent).rightOperand() == tree;
+      if (parent instanceof InExpression inExpression) {
+        return inExpression.rightOperand() == tree;
       }
       return false;
     }

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

@@ -135,8 +135,8 @@ private static void addQuickFix(PreciseIssue issue, FunctionDef originalMethod,
 
   private static boolean isClassOrStaticMethod(FunctionDef originalMethod) {
     return originalMethod.decorators().stream()
-      .anyMatch(d -> d.expression() instanceof NameImpl
-        && CLASS_AND_STATIC_DECORATORS.contains(((NameImpl) d.expression()).name()));
+      .anyMatch(d -> d.expression() instanceof NameImpl nameImpl
+        && CLASS_AND_STATIC_DECORATORS.contains(nameImpl.name()));
   }
 
   private static class MethodVisitor extends BaseTreeVisitor {