diff options
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | checker-framework/stubs/guava.astub | 9 | ||||
| -rw-r--r-- | contrib/zpages/src/main/java/io/opencensus/contrib/zpages/TraceConfigzZPageHandler.java | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index 3d8e1c35..af4ff263 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,9 @@ subprojects { } if (useCheckerFramework) { it.options.compilerArgs += [ - '-processor', 'com.google.auto.value.processor.AutoValueProcessor,org.checkerframework.checker.nullness.NullnessChecker' + '-processor', + 'com.google.auto.value.processor.AutoValueProcessor,org.checkerframework.checker.nullness.NullnessChecker', + "-Astubs=$rootDir/checker-framework/stubs" ] } it.options.encoding = "UTF-8" diff --git a/checker-framework/stubs/guava.astub b/checker-framework/stubs/guava.astub new file mode 100644 index 00000000..ff7a795d --- /dev/null +++ b/checker-framework/stubs/guava.astub @@ -0,0 +1,9 @@ +import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; +import org.checkerframework.checker.nullness.qual.Nullable; + +package com.google.common.base; + +class Strings { + @EnsuresNonNullIf(result = false, expression = "#1") + static boolean isNullOrEmpty(@Nullable String str); +} diff --git a/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/TraceConfigzZPageHandler.java b/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/TraceConfigzZPageHandler.java index 5257960d..9b075b30 100644 --- a/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/TraceConfigzZPageHandler.java +++ b/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/TraceConfigzZPageHandler.java @@ -16,6 +16,8 @@ package io.opencensus.contrib.zpages; +import static com.google.common.base.Strings.isNullOrEmpty; + import com.google.common.base.Charsets; import io.opencensus.trace.config.TraceConfig; import io.opencensus.trace.config.TraceParams; @@ -25,11 +27,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.Map; -import javax.annotation.Nullable; - -/*>>> -import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf; -*/ // TODO(bdrutu): Add tests. /** @@ -170,13 +167,6 @@ final class TraceConfigzZPageHandler extends ZPageHandler { } } - // TODO(sebright): Try to use a Checker Framework stub file for the Guava Strings class and use - // Strings.isNullOrEmpty instead. - /*>>> @EnsuresNonNullIf(result = false, expression = "#1") */ - private static boolean isNullOrEmpty(@Nullable String str) { - return str == null || str.isEmpty(); - } - // Prints a table to a PrintWriter that shows existing trace parameters. private static void emitTraceParamsTable(TraceParams params, PrintWriter out) { out.write( |