SONARPY-3940 Fix QG (#976)

GitOrigin-RevId: a3f1b7805bd02b915f03b140dd9ae07758a7ef4e

Author: joke1196

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

@@ -28,7 +28,6 @@
 import org.sonar.plugins.python.api.tree.ComprehensionIf;
 import org.sonar.plugins.python.api.tree.ConditionalExpression;
 import org.sonar.plugins.python.api.tree.Expression;
-import org.sonar.plugins.python.api.tree.FileInput;
 import org.sonar.plugins.python.api.tree.HasSymbol;
 import org.sonar.plugins.python.api.tree.IfStatement;
 import org.sonar.plugins.python.api.tree.Name;

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

@@ -51,15 +51,14 @@ public class HttpNoContentNonEmptyBodyCheck extends PythonSubscriptionCheck {
     TypeMatchers.withFQN("fastapi.applications.FastAPI.patch"),
     TypeMatchers.withFQN("fastapi.applications.FastAPI.options"),
     TypeMatchers.withFQN("fastapi.applications.FastAPI.head"),
-    TypeMatchers.withFQN("fastapi.applications.FastAPI.trace")
-  );
+    TypeMatchers.withFQN("fastapi.applications.FastAPI.trace"));
 
   @Override
   public void initialize(Context context) {
-    context.registerSyntaxNodeConsumer(Tree.Kind.FUNCDEF, this::checkFunctionDef);
+    context.registerSyntaxNodeConsumer(Tree.Kind.FUNCDEF, HttpNoContentNonEmptyBodyCheck::checkFunctionDef);
   }
 
-  private void checkFunctionDef(SubscriptionContext ctx) {
+  private static void checkFunctionDef(SubscriptionContext ctx) {
     FunctionDef functionDef = (FunctionDef) ctx.syntaxNode();
 
     if (!isFastApiEndpointWithNoContentStatus(ctx, functionDef)) {
@@ -73,9 +72,7 @@ private static boolean isFastApiEndpointWithNoContentStatus(SubscriptionContext
     for (Decorator decorator : functionDef.decorators()) {
       Expression decoratorExpression = decorator.expression();
 
-      if (decoratorExpression.is(Tree.Kind.CALL_EXPR)) {
-        CallExpression callExpr = (CallExpression) decoratorExpression;
-
+      if (decoratorExpression instanceof CallExpression callExpr) {
         if (!FASTAPI_METHODS_MATCHER.isTrueFor(callExpr.callee(), ctx)) {
           continue;
         }
@@ -100,7 +97,7 @@ private static boolean isNoContentStatusValue(Expression expr) {
     return false;
   }
 
-  private void findProblematicReturns(SubscriptionContext ctx, FunctionDef functionDef) {
+  private static void findProblematicReturns(SubscriptionContext ctx, FunctionDef functionDef) {
     List<ReturnStatement> allReturns = new ArrayList<>();
     collectReturnStatements(functionDef.body(), allReturns);
 
@@ -135,7 +132,7 @@ private static void collectReturnStatements(Tree tree, List<ReturnStatement> ret
     tree.children().forEach(child -> collectReturnStatements(child, returns));
   }
 
-  private ValidationResult isValidReturnStatement(SubscriptionContext ctx, ReturnStatement returnStmt) {
+  private static ValidationResult isValidReturnStatement(SubscriptionContext ctx, ReturnStatement returnStmt) {
     List<Expression> expressions = returnStmt.expressions();
 
     if (expressions.isEmpty()) {
@@ -161,39 +158,31 @@ private ValidationResult isValidReturnStatement(SubscriptionContext ctx, ReturnS
     return new ValidationResult(false);
   }
 
-  private ValidationResult isValidResponseObject(SubscriptionContext ctx, Expression expr) {
+  private static ValidationResult isValidResponseObject(SubscriptionContext ctx, Expression expr) {
     if (!FASTAPI_RESPONSE_INSTANCE.isTrueFor(expr, ctx)) {
       return new ValidationResult(false);
     }
 
     List<Tree> secondaryLocations = new ArrayList<>();
 
-    if (expr.is(Tree.Kind.NAME)) {
-      Name name = (Name) expr;
+    if (expr instanceof Name name) {
       var assignedValues = ctx.valuesAtLocation(name);
 
       boolean anyInvalid = false;
       for (Expression assignedValue : assignedValues) {
-        if (assignedValue.is(Tree.Kind.CALL_EXPR)) {
-          CallExpression callExpr = (CallExpression) assignedValue;
-
+        if (assignedValue instanceof CallExpression callExpr && isInvalidResponseCall(callExpr)) {
           // Check if this Response has invalid arguments
-          if (isInvalidResponseCall(callExpr)) {
-            anyInvalid = true;
-            secondaryLocations.add(assignedValue);
-          }
+          anyInvalid = true;
+          secondaryLocations.add(assignedValue);
         }
       }
 
       if (anyInvalid) {
         return new ValidationResult(false, secondaryLocations);
       }
-    } else if (expr.is(Tree.Kind.CALL_EXPR)) {
+    } else if (expr instanceof CallExpression callExpr && isInvalidResponseCall(callExpr)) {
       // Direct Response constructor call
-      CallExpression callExpr = (CallExpression) expr;
-      if (isInvalidResponseCall(callExpr)) {
-        return new ValidationResult(false);
-      }
+      return new ValidationResult(false);
     }
 
     return new ValidationResult(true);

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

@@ -50,7 +50,7 @@ private void checkNumpyArrayCall(SubscriptionContext ctx) {
       .ifPresent(fqn -> checkGeneratorCallee(call, ctx));
   }
 
-  private void checkGeneratorCallee(CallExpression call, SubscriptionContext ctx) {
+  private static void checkGeneratorCallee(CallExpression call, SubscriptionContext ctx) {
     List<Argument> argList = call.arguments();
     if (argList.isEmpty()) {
       return;

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

@@ -53,7 +53,7 @@ private void checkCallExpression(SubscriptionContext context) {
     }
   }
 
-  private void checkArgument(RegularArgument argument, SubscriptionContext context) {
+  private static void checkArgument(RegularArgument argument, SubscriptionContext context) {
     if (argument.expression().is(Tree.Kind.CALL_EXPR)) {
       CallExpression callExpression = (CallExpression) argument.expression();
       Symbol calleeSymbol = callExpression.calleeSymbol();

python-checks/src/main/java/org/sonar/python/checks/tests/UnconditionalAssertionCheck.java

@@ -108,13 +108,13 @@ private static boolean isFalseOrZeroLiteral(Expression expression) {
     return false;
   }
 
-  private void checkNoneAssertion(SubscriptionContext ctx, CallExpression call, RegularArgument arg) {
+  private static void checkNoneAssertion(SubscriptionContext ctx, CallExpression call, RegularArgument arg) {
     if (isUnconditional(arg, ctx)) {
       ctx.addIssue(call, NONE_MESSAGE);
     }
   }
 
-  private void checkBooleanAssertion(SubscriptionContext ctx, RegularArgument arg) {
+  private static void checkBooleanAssertion(SubscriptionContext ctx, RegularArgument arg) {
     if (isUnconditional(arg, ctx)) {
       ctx.addIssue(arg, BOOLEAN_MESSAGE);
     }