From 3eb26a972031694983cd351b88fd04624be62e0b Mon Sep 17 00:00:00 2001 From: Suzanne Millstein Date: Wed, 13 Dec 2023 12:03:55 -0800 Subject: [PATCH] Fix guava-assertions.astub --- checker/src/main/resources/guava-assertions.astub | 4 +--- .../framework/stub/AnnotationFileElementTypes.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/checker/src/main/resources/guava-assertions.astub b/checker/src/main/resources/guava-assertions.astub index 4a908ae502c..8a00e9fad5e 100644 --- a/checker/src/main/resources/guava-assertions.astub +++ b/checker/src/main/resources/guava-assertions.astub @@ -339,12 +339,10 @@ public final class Verify { @AssertMethod(VerifyException.class) @Pure public static void verify(boolean expression, String errorMessageTemplate, long p1); - } @AssertMethod(VerifyException.class) @Pure - public static void verify( - boolean expression, String errorMessageTemplate,Object p1); + public static void verify(boolean expression, String errorMessageTemplate, Object p1); @AssertMethod(VerifyException.class) @Pure diff --git a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java index 3849205c00d..b633a835d82 100644 --- a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java +++ b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java @@ -358,7 +358,7 @@ private void parseAnnotationFiles(List annotationFiles, AnnotationFileTy // If the file has a prefix of "checker.jar/" then look for the file in the top // level directory of the jar that contains the checker. if (path.startsWith("checker.jar/")) { - path = path.substring("checker.jar/".length()); + path = "/" + path.substring("checker.jar/".length()); } try (InputStream in = checker.getClass().getResourceAsStream(path)) { if (in != null) {