Fixed a bug where variables were being wrongly removed

Author: andrecsilva

framework/codemodder-base/src/main/java/io/codemodder/ast/ASTs.java

@@ -182,14 +182,14 @@ public static Optional<MethodCallExpr> isScopeInMethodCall(final Expression expr
   }
 
   /**
-   * Test for this pattern: {@link PatternExpr} ({@code node}) -&gt; {@link SimpleName}
+   * Test for this pattern: {@link TypePatternExpr} ({@code node}) -&gt; {@link SimpleName}
    *
    * @return A tuple with the above pattern in order sans the {@link SimpleName}.
    */
-  public static Optional<PatternExpr> isPatternExprDeclarationOf(
+  public static Optional<TypePatternExpr> isPatternExprDeclarationOf(
       final Node node, final String name) {
-    if (node instanceof PatternExpr) {
-      var pexpr = (PatternExpr) node;
+    if (node instanceof TypePatternExpr) {
+      var pexpr = (TypePatternExpr) node;
       if (pexpr.getNameAsString().equals(name)) return Optional.of(pexpr);
     }
     return Optional.empty();

framework/codemodder-base/src/main/java/io/codemodder/remediation/sqlinjection/SQLParameterizer.java

@@ -692,8 +692,12 @@ private MethodCallExpr fixByHijackedStatement(
     topStatement = gatherAndSetParameters(pStmtName, topStatement, queryParameterizer);
 
     // Add PreparedStmt stmt =  conn.prepareStatement() assignment
+    // Need to clone the nodes in the arguments to make sure the parent node is properly set
     MethodCallExpr prepareStatementCall =
-        new MethodCallExpr(new NameExpr(connName), "prepareStatement", executeCall.getArguments());
+        new MethodCallExpr(
+            new NameExpr(connName),
+            "prepareStatement",
+            new NodeList<>(executeCall.getArguments().stream().map(n -> n.clone()).toList()));
     ExpressionStmt pStmtCreation =
         new ExpressionStmt(
             new VariableDeclarationExpr(

framework/codemodder-base/src/main/java/io/codemodder/remediation/sqlinjection/SQLParameterizerWithCleanup.java

@@ -20,7 +20,7 @@ public static void cleanup(final MethodCallExpr pstmtCall) {
     // Remove concatenation with empty strings e.g "first" +  "" -> "first";
     maybeMethodDecl.ifPresent(ASTTransforms::removeEmptyStringConcatenation);
     // Remove potential unused variables left after transform
-    // maybeMethodDecl.ifPresent(md -> ASTTransforms.removeUnusedLocalVariables(md));
+    maybeMethodDecl.ifPresent(md -> ASTTransforms.removeUnusedLocalVariables(md));
 
     // Merge concatenated literals, e.g. "first" + " and second" -> "first and second"
     pstmtCall.getArguments().getFirst().ifPresent(ASTTransforms::mergeConcatenatedLiterals);

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 auto-value = "1.9"
 jackson = "2.13.1"
-javaparser-core = "3.25.4"
+javaparser-core = "3.26.2"
 javaparser-symbolsolver = "3.15.15"
 java-security-toolkit = "1.2.0"
 java-security-toolkit-xstream = "1.0.2"