From 9449d38d435a9457642d1ea4ee1c35222444ac4d Mon Sep 17 00:00:00 2001 From: Nick Glorioso Date: Mon, 1 Aug 2022 14:38:42 -0700 Subject: [PATCH] Add the SSTable to the CIRV stats collector. Tested with a local run: https://screenshot.googleplex.com/BKMXArP7HX9ooGD PiperOrigin-RevId: 464626829 --- .../ExternalCanIgnoreReturnValue.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ExternalCanIgnoreReturnValue.java b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ExternalCanIgnoreReturnValue.java index 54a1224df59..520d7d42f5b 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ExternalCanIgnoreReturnValue.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/ExternalCanIgnoreReturnValue.java @@ -37,7 +37,6 @@ import com.sun.tools.javac.util.List; import java.io.IOException; import java.io.UncheckedIOException; -import java.nio.file.Path; import java.nio.file.Paths; import java.util.Optional; import java.util.stream.Stream; @@ -92,26 +91,25 @@ interface MethodPredicate { enum ConfigParser { AS_STRINGS { @Override - MethodPredicate load(Path file) throws IOException { - return configByInterpretingMethodsAsStrings(MoreFiles.asCharSource(file, UTF_8)); + MethodPredicate load(String file, ErrorProneFlags flags) throws IOException { + return configByInterpretingMethodsAsStrings(MoreFiles.asCharSource(Paths.get(file), UTF_8)); } }, PARSE_TOKENS { @Override - MethodPredicate load(Path file) throws IOException { - return configByParsingApiObjects(MoreFiles.asCharSource(file, UTF_8)); + MethodPredicate load(String file, ErrorProneFlags flags) throws IOException { + return configByParsingApiObjects(MoreFiles.asCharSource(Paths.get(file), UTF_8)); } }; - abstract MethodPredicate load(Path file) throws IOException; + abstract MethodPredicate load(String file, ErrorProneFlags flags) throws IOException; } private static MethodPredicate loadConfigListFromFile(String filename, ErrorProneFlags flags) { ConfigParser configParser = flags.getEnum(EXCLUSION_LIST_PARSER, ConfigParser.class).orElse(ConfigParser.AS_STRINGS); try { - Path file = Paths.get(filename); - return configParser.load(file); + return configParser.load(filename, flags); } catch (IOException e) { throw new UncheckedIOException( "Could not load external resource for CanIgnoreReturnValue", e);