diff --git a/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/Checker.java b/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/Checker.java index 854cea053..cec445822 100644 --- a/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/Checker.java +++ b/annotator-core/src/main/java/edu/ucr/cs/riple/core/checkers/Checker.java @@ -29,8 +29,6 @@ import edu.ucr.cs.riple.core.module.ModuleConfiguration; import edu.ucr.cs.riple.core.module.ModuleInfo; import edu.ucr.cs.riple.core.registries.index.Error; -import edu.ucr.cs.riple.core.registries.index.Fix; -import edu.ucr.cs.riple.core.registries.region.Region; import java.util.Set; /** @@ -63,25 +61,6 @@ public interface Checker { */ void preprocess(AnnotationInjector injector); - /** - * Creates an {@link Error} instance from the given parameters. - * - * @param errorType Error type. - * @param errorMessage Error message. - * @param region Region where the error is reported, - * @param offset offset of program point in original version where error is reported. - * @param resolvingFixes Set of fixes that resolve the error. - * @param module Module where the error is reported. - * @return The corresponding error. - */ - T createError( - String errorType, - String errorMessage, - Region region, - int offset, - ImmutableSet resolvingFixes, - ModuleInfo module); - /** * Verifies that the checker representation in Annotator is compatible with the actual running * checker on the target module. 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 index 284a9723b..40c560158 100644 --- 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 @@ -371,8 +371,20 @@ public void preprocess(AnnotationInjector injector) { injector.injectAnnotations(initializers); } - @Override - public NullAwayError createError( + /** + * Creates a {@link NullAwayError} instance using the provided arguments. It also removes + * annotation change requests that are on an element with explict nonnull annotation. + * + * @param errorType Error Type from NullAway. + * @param errorMessage Error Message from NullAway. + * @param region Region where the error is reported. + * @param offset Offset of program point in the source file where the error is reported. + * @param resolvingFixes Resolving fixes that can fix the error if all applied to source code. + * @param module Module where this error is reported. + * @return Creates and returns the corresponding {@link NullAwayError} instance using the provided + * information. + */ + private NullAwayError createError( String errorType, String errorMessage, Region region,