SONARPY-4937 Migrate S6890 to TypeV2

GitOrigin-RevId: 7ed12753021cd08b28d6566c9cf6c9a51ed3d574

Author: joke1196

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

@@ -23,17 +23,19 @@
 import org.sonar.plugins.python.api.PythonSubscriptionCheck;
 import org.sonar.plugins.python.api.PythonVersionUtils;
 import org.sonar.plugins.python.api.SubscriptionContext;
-import org.sonar.plugins.python.api.symbols.Symbol;
 import org.sonar.plugins.python.api.tree.AliasedName;
 import org.sonar.plugins.python.api.tree.DottedName;
 import org.sonar.plugins.python.api.tree.ImportFrom;
 import org.sonar.plugins.python.api.tree.ImportName;
 import org.sonar.plugins.python.api.tree.Tree;
+import org.sonar.plugins.python.api.types.v2.matchers.TypeMatcher;
+import org.sonar.plugins.python.api.types.v2.matchers.TypeMatchers;
 import org.sonar.python.tree.TreeUtils;
 
 @Rule(key = "S6890")
 public class PytzUsageCheck extends PythonSubscriptionCheck {
   private static final String MESSAGE = "Don't use `pytz` module with Python 3.9 and later.";
+  private static final TypeMatcher PYTZ_PREFIX_MATCHER = TypeMatchers.withFQNPrefix("pytz.");
 
   @Override
   public void initialize(Context context) {
@@ -50,10 +52,19 @@ private static void checkImport(SubscriptionContext context) {
       return;
     }
 
+    if (context.syntaxNode() instanceof ImportFrom importFrom) {
+      if (importFrom.dottedPrefixForModule().isEmpty()) {
+        Optional.ofNullable(importFrom.module())
+          // V1 associated the imported symbol with the alias rather than the imported name.
+          // Preserve that behavior: an aliased "from pytz import ..." import is not reported.
+          .ifPresent(module -> importFrom.importedNames().stream()
+            .filter(name -> name.alias() == null && (isPytzModule(module) || isPytzImportedName(name)))
+            .forEach(name -> context.addIssue(module, MESSAGE)));
+      }
+      return;
+    }
+
     Stream.of(
-      Optional.of(context.syntaxNode())
-        .flatMap(TreeUtils.toOptionalInstanceOfMapper(ImportFrom.class))
-        .map(ImportFrom::importedNames),
       Optional.of(context.syntaxNode())
         .flatMap(TreeUtils.toOptionalInstanceOfMapper(ImportName.class))
         .map(ImportName::modules))
@@ -65,18 +76,17 @@ private static void checkImport(SubscriptionContext context) {
       .filter(list -> !list.isEmpty())
       .map(names -> names.get(0))
       .filter(name -> "pytz".equals(name.name())
-        || Optional.ofNullable(name.symbol())
-          .map(Symbol::fullyQualifiedName)
-          .filter(fqn -> fqn.startsWith("pytz")).isPresent())
-      .forEach(name -> raiseIssue(context, name));
+        || PYTZ_PREFIX_MATCHER.isTrueFor(name, context))
+      .forEach(name -> context.addIssue(name, MESSAGE));
   }
 
-  private static void raiseIssue(SubscriptionContext context, Tree tree) {
-    if (context.syntaxNode().is(Tree.Kind.IMPORT_FROM)) {
-      ImportFrom importFrom = (ImportFrom) context.syntaxNode();
-      Optional.ofNullable(importFrom.module()).ifPresent(module -> context.addIssue(module, MESSAGE));
-    } else {
-      context.addIssue(tree, MESSAGE);
-    }
+  private static boolean isPytzModule(DottedName module) {
+    return !module.names().isEmpty()
+      && "pytz".equals(module.names().get(0).name());
+  }
+
+  private static boolean isPytzImportedName(AliasedName name) {
+    return !name.dottedName().names().isEmpty()
+      && "pytz".equals(name.dottedName().names().get(0).name());
   }
 }

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

@@ -50,4 +50,11 @@ void test_explicit_python_3_9() {
     ProjectPythonVersion.setCurrentVersions(EnumSet.of(PythonVersionUtils.Version.V_39));
     PythonCheckVerifier.verify("src/test/resources/checks/pytzUsage.py", new PytzUsageCheck());
   }
+
+  @Test
+  void test_multiple_imports_raise_an_issue_for_each_imported_name() {
+    assertThat(PythonCheckVerifier.issues("src/test/resources/checks/pytzUsageMultipleImports.py", new PytzUsageCheck()))
+      .hasSize(2)
+      .allSatisfy(issue -> assertThat(issue.primaryLocation().startLine()).isEqualTo(1));
+  }
 }

python-checks/src/test/resources/checks/pytzUsage.py

@@ -5,6 +5,11 @@ def on_import():
           #^^^^
     from pytz import timezone # Noncompliant {{Don't use `pytz` module with Python 3.9 and later.}}
         #^^^^
+    from pytz import timezone as pytz_timezone
+    from pytz.tzinfo import BaseTzInfo # Noncompliant {{Don't use `pytz` module with Python 3.9 and later.}}
+        #^^^^^^^^^^^
+    from pip._vendor import pytz # Noncompliant {{Don't use `pytz` module with Python 3.9 and later.}}
+        #^^^^^^^^^^^
     import pytz as p # Noncompliant {{Don't use `pytz` module with Python 3.9 and later.}}
           #^^^^
     from something.different.pytz import a_function

python-checks/src/test/resources/checks/pytzUsageMultipleImports.py

@@ -0,0 +1 @@
+from pytz import timezone, utc