removing unnecessary changes

Author: nahsra

framework/codemodder-base/src/main/java/io/codemodder/CodemodCheckingAbstractModule.java

@@ -1,8 +1,7 @@
 package io.codemodder.providers.sarif.appscan;
 
+import com.google.inject.AbstractModule;
 import io.codemodder.CodeChanger;
-import io.codemodder.Codemod;
-import io.codemodder.CodemodCheckingAbstractModule;
 import io.codemodder.RuleSarif;
 import java.lang.reflect.Constructor;
 import java.util.List;
@@ -13,25 +12,19 @@
 import java.util.stream.Stream;
 
 /** Responsible for distributing the SARIFS to AppScan based codemods based on rules. */
-public final class AppScanModule extends CodemodCheckingAbstractModule {
+public final class AppScanModule extends AbstractModule {
 
   private final List<Class<? extends CodeChanger>> codemodTypes;
   private final List<RuleSarif> allAppScanRuleSarifs;
 
   public AppScanModule(
       final List<Class<? extends CodeChanger>> codemodTypes, final List<RuleSarif> sarifs) {
-    super(codemodTypes);
     this.codemodTypes = Objects.requireNonNull(codemodTypes);
     this.allAppScanRuleSarifs = sarifs;
   }
 
   @Override
-  protected boolean isResponsibleFor(final Class<? extends CodeChanger> codemod) {
-    return codemod.getAnnotation(Codemod.class).id().startsWith("appscan:");
-  }
-
-  @Override
-  protected void doConfigure() {
+  protected void configure() {
     final Map<String, RuleSarif> map =
         allAppScanRuleSarifs.stream()
             .collect(Collectors.toUnmodifiableMap(RuleSarif::getRule, rs -> rs));

plugins/codemodder-plugin-appscan/src/main/java/io/codemodder/providers/sarif/appscan/AppScanModule.java

@@ -1,8 +1,7 @@
 package io.codemodder.providers.sarif.codeql;
 
+import com.google.inject.AbstractModule;
 import io.codemodder.CodeChanger;
-import io.codemodder.Codemod;
-import io.codemodder.CodemodCheckingAbstractModule;
 import io.codemodder.RuleSarif;
 import java.lang.reflect.Constructor;
 import java.util.List;
@@ -13,25 +12,19 @@
 import java.util.stream.Stream;
 
 /** Responsible for distributing the SARIFS to CodeQL based codemods based on rules. */
-public final class CodeQLModule extends CodemodCheckingAbstractModule {
+public final class CodeQLModule extends AbstractModule {
 
   private final List<Class<? extends CodeChanger>> codemodTypes;
   private final List<RuleSarif> allCodeqlRuleSarifs;
 
   CodeQLModule(
       final List<Class<? extends CodeChanger>> codemodTypes, final List<RuleSarif> sarifs) {
-    super(codemodTypes);
     this.codemodTypes = Objects.requireNonNull(codemodTypes);
     this.allCodeqlRuleSarifs = sarifs;
   }
 
   @Override
-  protected boolean isResponsibleFor(final Class<? extends CodeChanger> codemod) {
-    return codemod.getAnnotation(Codemod.class).id().startsWith("codeql:");
-  }
-
-  @Override
-  protected void doConfigure() {
+  protected void configure() {
     // What if there are multiple sarif files with a given rule?
     // We can safely ignore this case for now.
     final Map<String, RuleSarif> map =

plugins/codemodder-plugin-codeql/src/main/java/io/codemodder/providers/sarif/codeql/CodeQLModule.java

@@ -2,6 +2,7 @@
 
 import com.contrastsecurity.sarif.Result;
 import com.contrastsecurity.sarif.SarifSchema210;
+import com.google.inject.AbstractModule;
 import io.codemodder.*;
 import io.github.classgraph.*;
 import java.lang.reflect.Executable;
@@ -13,7 +14,7 @@
 import org.slf4j.LoggerFactory;
 
 /** Responsible for binding PMD-related things. */
-public final class PmdModule extends CodemodCheckingAbstractModule {
+public final class PmdModule extends AbstractModule {
 
   private final List<Class<? extends CodeChanger>> codemodTypes;
   private final Path codeDirectory;
@@ -24,22 +25,14 @@ public PmdModule(
       final Path codeDirectory,
       final List<Path> includedFiles,
       final List<Class<? extends CodeChanger>> codemodTypes) {
-    super(codemodTypes);
     this.codemodTypes = Objects.requireNonNull(codemodTypes);
     this.codeDirectory = Objects.requireNonNull(codeDirectory);
     this.includedFiles = Objects.requireNonNull(includedFiles);
     this.pmdRunner = PmdRunner.createDefault();
   }
 
   @Override
-  protected boolean isResponsibleFor(final Class<? extends CodeChanger> codemod) {
-    Codemod annotation = codemod.getAnnotation(Codemod.class);
-    String id = annotation.id();
-    return id.startsWith("semgrep:") || id.startsWith("pixee:") || id.startsWith("pmd:");
-  }
-
-  @Override
-  protected void doConfigure() {
+  protected void configure() {
     Set<String> packagesScanned = new HashSet<>();
 
     List<PmdScanTarget> scanTargets = new ArrayList<>();
@@ -88,6 +81,11 @@ protected void doConfigure() {
       }
     }
 
+    if (scanTargets.isEmpty()) {
+      LOG.trace("No @PmdScan annotations found, skipping");
+      return;
+    }
+
     SarifSchema210 allRulesBatchedRun =
         pmdRunner.run(
             scanTargets.stream().map(PmdScanTarget::pmdScan).map(PmdScan::ruleId).toList(),

plugins/codemodder-plugin-pmd/src/main/java/io/codemodder/providers/sarif/pmd/PmdModule.java

@@ -2,6 +2,7 @@
 
 import com.contrastsecurity.sarif.Result;
 import com.contrastsecurity.sarif.SarifSchema210;
+import com.google.inject.AbstractModule;
 import io.codemodder.*;
 import io.github.classgraph.*;
 import java.io.IOException;
@@ -17,7 +18,7 @@
 import org.slf4j.LoggerFactory;
 
 /** Responsible for binding Semgrep-related things. */
-public final class SemgrepModule extends CodemodCheckingAbstractModule {
+public final class SemgrepModule extends AbstractModule {
 
   private final List<Class<? extends CodeChanger>> codemodTypes;
   private final Path codeDirectory;
@@ -48,7 +49,6 @@ public SemgrepModule(
       final List<Class<? extends CodeChanger>> codemodTypes,
       final List<RuleSarif> sarifs,
       final SemgrepRuleFactory semgrepRuleFactory) {
-    super(codemodTypes);
     this.codemodTypes = Objects.requireNonNull(codemodTypes);
     this.codeDirectory = Objects.requireNonNull(codeDirectory);
     this.includePatterns = Objects.requireNonNull(includePatterns);
@@ -59,14 +59,7 @@ public SemgrepModule(
   }
 
   @Override
-  protected boolean isResponsibleFor(final Class<? extends CodeChanger> codemod) {
-    Codemod annotation = codemod.getAnnotation(Codemod.class);
-    String id = annotation.id();
-    return id.startsWith("semgrep:") || id.startsWith("pixee:") || id.startsWith("codemodder:");
-  }
-
-  @Override
-  protected void doConfigure() {
+  protected void configure() {
 
     // find all the @ProvidedSemgrepScan annotations and bind them as is
     Set<String> packagesScanned = new HashSet<>();
@@ -148,6 +141,14 @@ protected void doConfigure() {
       }
     }
 
+    if (rules.isEmpty()) {
+      // no active codemods have rules to bind for, so we can return
+      LOG.info("No active codemods have Semgrep rules to bind for JIT scanning");
+      return;
+    } else {
+      LOG.info("Found {} Semgrep rules to bind for JIT scanning", rules.size());
+    }
+
     /*
      * To avoid running semgrep and eating heavy, redundant file I/O for every codemod, we'll run it once with all rules, calculate which rules didn't "hit", and then storing an empty result for them. This will allow us to only run Semgrep on the rules for which we have evidence will hit. Given that we don't expect most projects to hit most codemods, this is a big time-savings.
      */

plugins/codemodder-plugin-semgrep/src/main/java/io/codemodder/providers/sarif/semgrep/SemgrepModule.java

@@ -1,8 +1,7 @@
 package io.codemodder.providers.sonar;
 
+import com.google.inject.AbstractModule;
 import io.codemodder.CodeChanger;
-import io.codemodder.Codemod;
-import io.codemodder.CodemodCheckingAbstractModule;
 import io.codemodder.sonar.model.Hotspot;
 import io.codemodder.sonar.model.Issue;
 import io.codemodder.sonar.model.SonarFinding;
@@ -15,7 +14,7 @@
 import java.util.*;
 import javax.inject.Inject;
 
-final class SonarModule<T extends SonarFinding> extends CodemodCheckingAbstractModule {
+final class SonarModule<T extends SonarFinding> extends AbstractModule {
 
   private final List<Class<? extends CodeChanger>> codemodTypes;
   private final Path repository;
@@ -28,20 +27,14 @@ final class SonarModule<T extends SonarFinding> extends CodemodCheckingAbstractM
       final Path repository,
       final List<T> findings,
       final Class<? extends RuleFinding<T>> ruleFindingClass) {
-    super(codemodTypes);
     this.codemodTypes = Objects.requireNonNull(codemodTypes);
     this.repository = Objects.requireNonNull(repository);
     this.sonarFindings = findings;
     this.ruleFindingClass = ruleFindingClass;
   }
 
   @Override
-  protected boolean isResponsibleFor(final Class<? extends CodeChanger> codemod) {
-    return codemod.getAnnotation(Codemod.class).id().startsWith("sonar:");
-  }
-
-  @Override
-  protected void doConfigure() {
+  protected void configure() {
 
     Map<String, List<T>> findingsByRuleMap = groupFindingsByRule(sonarFindings);