NO-JIRA: Fix quality gate issues related to deprecated assertions (#2038)

* Fix issues related to switch case

* Fix issues related to deprecated assertions

Author: joke1196

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

@@ -38,7 +38,8 @@ public class StringFormat {
 
   private static final String SYNTAX_ERROR_MESSAGE = "Fix this formatted string's syntax.";
 
-  private static final BiConsumer<SubscriptionContext, Expression> DO_NOTHING_VALIDATOR = (ctx, expr) -> {};
+  private static final BiConsumer<SubscriptionContext, Expression> DO_NOTHING_VALIDATOR = (ctx, expr) -> {
+  };
 
   // See https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting
   private static final Pattern PRINTF_PARAMETER_PATTERN = Pattern.compile(
@@ -193,26 +194,22 @@ public StrFormatParser(Consumer<String> issueReporter, String value) {
       this.pos = 0;
     }
 
-
     public Optional<StringFormat> parse() {
       pos = 0;
       result = new ArrayList<>();
 
       while (pos < value.length()) {
         char current = value.charAt(pos);
-        switch (state) {
-          case INIT -> {
-            if (!tryParsingInitial(current)) {
-              return Optional.empty();
-            }
+        if (state == ParseState.INIT) {
+          if (!tryParsingInitial(current)) {
+            return Optional.empty();
           }
-          case RCURLY -> {
-            if (current != '}') {
-              issueReporter.accept(SYNTAX_ERROR_MESSAGE);
-              return Optional.empty();
-            }
-            state = ParseState.INIT;
+        } else if (state == ParseState.RCURLY) {
+          if (current != '}') {
+            issueReporter.accept(SYNTAX_ERROR_MESSAGE);
+            return Optional.empty();
           }
+          state = ParseState.INIT;
         }
 
         pos += 1;
@@ -263,7 +260,6 @@ private boolean tryParsingField() {
       return successful;
     }
 
-
     public void reportIssue(String issue) {
       issueReporter.accept(issue);
     }
@@ -331,7 +327,7 @@ public boolean tryParse() {
           case FINISHED -> throw new IllegalStateException("Unexpected value: " + state);
         };
 
-        if(!successful) {
+        if (!successful) {
           return false;
         }
 
@@ -342,7 +338,7 @@ public boolean tryParse() {
     }
 
     private boolean checkParserState() {
-      if(state != FieldParseState.FINISHED) {
+      if (state != FieldParseState.FINISHED) {
         parent.reportIssue(SYNTAX_ERROR_MESSAGE);
         return false;
       }
@@ -351,7 +347,7 @@ private boolean checkParserState() {
 
     private boolean tryParseFormatSpecifier(char current) {
       if (current == '{') {
-        if(!tryParsingNestedField()) {
+        if (!tryParsingNestedField()) {
           return false;
         }
       } else if (current == '}') {
@@ -362,7 +358,7 @@ private boolean tryParseFormatSpecifier(char current) {
     }
 
     private boolean tryParsingNestedField() {
-      if(this.nesting > 0) {
+      if (this.nesting > 0) {
         parent.reportIssue("Fix this formatted string's syntax; Deep nesting is not allowed.");
         return false;
       }
@@ -431,7 +427,6 @@ private void addCurrentField() {
     }
   }
 
-
   public static Optional<StringFormat> createFromStrFormatStyle(Consumer<String> issueReporter, String value) {
     // Format -> '{' [FieldName] ['!' Conversion] [':' FormatSpec*] '}'
     // FormatSpec -> '{' [FieldName] '}' | Character
@@ -526,7 +521,8 @@ private static BiConsumer<SubscriptionContext, Expression> printfConversionValid
     }
 
     // No case for '%s', '%r' and '%a' - anything can be formatted with those.
-    return (ctx, expression) -> {};
+    return (ctx, expression) -> {
+    };
   }
 
   private static boolean cannotBeOfType(Expression expression, String... types) {

python-frontend/src/test/java/org/sonar/python/semantic/v2/TypeInferenceV2Test.java

@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -1648,7 +1649,7 @@ def f(i):
     Assertions.assertThat(lType)
       .extracting(ObjectType.class::cast)
       .extracting(ObjectType::attributes)
-      .asList()
+      .asInstanceOf(InstanceOfAssertFactories.LIST)
       .hasSize(1)
       .contains(PythonType.UNKNOWN);
 

python-frontend/src/test/java/org/sonar/python/types/v2/UnionTypeTest.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 import org.sonar.plugins.python.api.tree.ExpressionStatement;
 import org.sonar.plugins.python.api.tree.FileInput;
@@ -143,7 +144,7 @@ void unionTypeCandidatesResolution() {
       .extracting(UnionType.class::cast)
       .extracting(UnionType::candidates)
       .extracting(ArrayList::new)
-      .asList()
+      .asInstanceOf(InstanceOfAssertFactories.LIST)
       .hasSize(2)
       .contains(candidate1, candidate2);
   }