clean up fixIsSource flag from fix class

ucr-riple · Oct 3, 2024 · f44edb2 · f44edb2
1 parent 2a750e5
commit f44edb2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 28 deletions.
diff --git a/...-core/src/main/java/edu/ucr/cs/riple/core/cache/downstream/DownstreamImpactCacheImpl.java b/...-core/src/main/java/edu/ucr/cs/riple/core/cache/downstream/DownstreamImpactCacheImpl.java
@@ -123,9 +123,7 @@ public void analyzeDownstreamDependencies() {
             .map(
                 location ->
                     new Fix(
-                        new AddMarkerAnnotation(location, context.config.nullableAnnot),
-                        "null",
-                        false))
+                        new AddMarkerAnnotation(location, context.config.nullableAnnot), "null"))
             .collect(ImmutableSet.toImmutableSet());
     DownstreamImpactEvaluator evaluator = new DownstreamImpactEvaluator(supplier);
     ImmutableSet<Report> reports = evaluator.evaluate(fixes);

diff --git a/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/nullaway/NullAway.java b/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/nullaway/NullAway.java
@@ -130,8 +130,7 @@ private NullAwayError deserializeErrorFromTSVLine(ModuleInfo moduleInfo, String
     Fix resolvingFix =
         nonnullTarget == null
             ? null
-            : new Fix(
-                new AddMarkerAnnotation(nonnullTarget, config.nullableAnnot), errorType, true);
+            : new Fix(new AddMarkerAnnotation(nonnullTarget, config.nullableAnnot), errorType);
     return createError(
         errorType,
         errorMessage,
@@ -201,8 +200,7 @@ protected ImmutableSet<Fix> generateFixesForUninitializedFields(
               return new Fix(
                   new AddMarkerAnnotation(
                       extendVariableList(locationOnField, module), config.nullableAnnot),
-                  NullAwayError.METHOD_INITIALIZER_ERROR,
-                  true);
+                  NullAwayError.METHOD_INITIALIZER_ERROR);
             })
         .filter(Objects::nonNull)
         .collect(ImmutableSet.toImmutableSet());

diff --git a/annotator-core/src/main/java/edu/ucr/cs/riple/core/evaluators/graph/Node.java b/annotator-core/src/main/java/edu/ucr/cs/riple/core/evaluators/graph/Node.java
@@ -186,7 +186,6 @@ public void updateStatus(
   public void mergeTriggered() {
     this.tree.addAll(Error.getResolvingFixesOfErrors(this.triggeredErrors));
     this.tree.addAll(triggeredFixesFromDownstreamErrors);
-    this.tree.forEach(fix -> fix.fixSourceIsInTarget = true);
   }
 
   @Override

diff --git a/...ava/edu/ucr/cs/riple/core/evaluators/graph/processors/AbstractConflictGraphProcessor.java b/...ava/edu/ucr/cs/riple/core/evaluators/graph/processors/AbstractConflictGraphProcessor.java
@@ -81,8 +81,7 @@ protected Set<Fix> getTriggeredFixesFromDownstreamErrors(Node node) {
                 new Fix(
                     new AddMarkerAnnotation(
                         error.toResolvingLocation(), context.config.nullableAnnot),
-                    "PASSING_NULLABLE",
-                    false))
+                    "PASSING_NULLABLE"))
         .collect(Collectors.toSet());
   }
 }
diff --git a/annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Error.java b/annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Error.java
@@ -223,9 +223,7 @@ public static <T extends Error> ImmutableSet<Fix> getResolvingFixesOfErrors(
     for (Fix key : fixReasonsMap.keySet()) {
       // To avoid mutating fixes stored in the given collection, we create new instances.
       // which contain the full set of reasons.
-      builder.add(
-          new Fix(
-              key.change, ImmutableSet.copyOf(fixReasonsMap.get(key)), key.fixSourceIsInTarget));
+      builder.add(new Fix(key.change, ImmutableSet.copyOf(fixReasonsMap.get(key))));
     }
     return builder.build();
   }

diff --git a/annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Fix.java b/annotator-core/src/main/java/edu/ucr/cs/riple/core/registries/index/Fix.java
@@ -48,20 +48,13 @@ public class Fix {
   /** Reasons this fix is suggested by NullAway in string. */
   public final ImmutableSet<String> reasons;
 
-  /**
-   * If true, the fix is suggested due to an error in the target module, false if the fix is
-   * suggested due to error in downstream dependencies.
-   */
-  public boolean fixSourceIsInTarget;
-
-  public Fix(AddAnnotation change, String reason, boolean fixSourceIsInTarget) {
-    this(change, ImmutableSet.of(reason), fixSourceIsInTarget);
+  public Fix(AddAnnotation change, String reason) {
+    this(change, ImmutableSet.of(reason));
   }
 
-  public Fix(AddAnnotation change, ImmutableSet<String> reasons, boolean fixSourceIsInTarget) {
+  public Fix(AddAnnotation change, ImmutableSet<String> reasons) {
     this.change = change;
     this.reasons = reasons;
-    this.fixSourceIsInTarget = fixSourceIsInTarget;
   }
 
   /**

diff --git a/...re/src/main/java/edu/ucr/cs/riple/core/registries/region/generatedcode/LombokHandler.java b/...re/src/main/java/edu/ucr/cs/riple/core/registries/region/generatedcode/LombokHandler.java
@@ -120,8 +120,7 @@ public ImmutableSet<Fix> extendForGeneratedFixes(Set<Fix> fixes) {
                                 new Fix(
                                     new AddMarkerAnnotation(
                                         getterMethod.location, change.getAnnotationName().fullName),
-                                    fix.reasons,
-                                    fix.fixSourceIsInTarget));
+                                    fix.reasons));
                           }
                         })));
     return builder.build();

diff --git a/annotator-core/src/test/java/edu/ucr/cs/riple/core/tools/TFix.java b/annotator-core/src/test/java/edu/ucr/cs/riple/core/tools/TFix.java
@@ -36,6 +36,6 @@
 public class TFix extends Fix {
 
   public TFix(Location location) {
-    super(new DefaultAnnotation(location), ImmutableSet.of(), true);
+    super(new DefaultAnnotation(location), ImmutableSet.of());
   }
 }
diff --git a/annotator-core/src/test/java/edu/ucr/cs/riple/core/tools/TReport.java b/annotator-core/src/test/java/edu/ucr/cs/riple/core/tools/TReport.java
@@ -50,8 +50,7 @@ public TReport(Location root, int effect) {
 
   public TReport(Location root, int effect, Tag tag) {
     super(
-        new Fix(
-            new AddMarkerAnnotation(root, "javax.annotation.Nullable"), ImmutableSet.of(), true),
+        new Fix(new AddMarkerAnnotation(root, "javax.annotation.Nullable"), ImmutableSet.of()),
         effect);
     this.expectedValue = effect;
     if (tag != null) {