Small refactoring

pixee · Oct 14, 2024 · d0ead4e · d0ead4e
1 parent 257eaf8
commit d0ead4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...k/codemodder-base/src/main/java/io/codemodder/remediation/SearcherStrategyRemediator.java b/...k/codemodder-base/src/main/java/io/codemodder/remediation/SearcherStrategyRemediator.java
@@ -140,8 +140,7 @@ public CodemodFileScanningResult remediateAll(
     List<CodemodChange> allChanges = new ArrayList<>();
     List<UnfixedFinding> allUnfixed = new ArrayList<>();
 
-    for (var searcher : searcherRemediatorMap.keySet()) {
-      var strategy = searcherRemediatorMap.get(searcher);
+    for (var searcherAndStrategy : searcherRemediatorMap.entrySet()) {
       var pairResult =
           remediateWithStrategy(
               cu,
@@ -152,8 +151,8 @@ public CodemodFileScanningResult remediateAll(
               findingStartLineExtractor,
               findingEndLineExtractor,
               findingColumnExtractor,
-              searcher,
-              strategy);
+              searcherAndStrategy.getKey(),
+              searcherAndStrategy.getValue());
       allChanges.addAll(pairResult.getValue0());
       allUnfixed.addAll(pairResult.getValue1());
     }

diff --git a/framework/codemodder-base/src/main/java/io/codemodder/remediation/SuccessOrReason.java b/framework/codemodder-base/src/main/java/io/codemodder/remediation/SuccessOrReason.java
@@ -3,6 +3,7 @@
 import io.codemodder.DependencyGAV;
 import io.codemodder.Either;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
@@ -27,14 +28,14 @@ public boolean isSuccess() {
 
   public List<DependencyGAV> getDependencies() {
     if (!isSuccess()) {
-      throw new RuntimeException("Trying to get dependencies from a failure result");
+      throw new NoSuchElementException("Trying to get dependencies from a failure result");
     }
     return either.getLeft();
   }
 
   public String getReason() {
     if (isSuccess()) {
-      throw new RuntimeException("Trying to get a reason from a successful result");
+      throw new NoSuchElementException("Trying to get a reason from a successful result");
     }
     return either.getRight();
   }