diff options
| author | sebright <sebright@google.com> | 2018-05-02 19:37:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 19:37:58 -0700 |
| commit | 773c7638f448bdb6d33d1c30bc8ec4ba5450da18 (patch) | |
| tree | 1219dbafe128ce67e40652ab166635e474f75f36 /api | |
| parent | 0188eab1de2ad407304f69784d7b71d03f2329a1 (diff) | |
| parent | c917cc24c7912bd3ef24da3a526f7c91bdafe33c (diff) | |
| download | opencensus-java-773c7638f448bdb6d33d1c30bc8ec4ba5450da18.tar.gz | |
Merge pull request #1176 from sebright/upgrade-checker-framework
Checker Framework: 2.5.0 -> 2.5.1
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/main/java/io/opencensus/stats/NoopStats.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/api/src/main/java/io/opencensus/stats/NoopStats.java b/api/src/main/java/io/opencensus/stats/NoopStats.java index 02f7c521..e7e94a38 100644 --- a/api/src/main/java/io/opencensus/stats/NoopStats.java +++ b/api/src/main/java/io/opencensus/stats/NoopStats.java @@ -30,11 +30,14 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.ThreadSafe; +/*>>> +import org.checkerframework.checker.nullness.qual.Nullable; +*/ + /** No-op implementations of stats classes. */ final class NoopStats { @@ -149,7 +152,7 @@ final class NoopStats { // Cached set of exported views. It must be set to null whenever a view is registered or // unregistered. - @Nullable private volatile Set<View> exportedViews; + @javax.annotation.Nullable private volatile Set<View> exportedViews; @Override public void registerView(View newView) { @@ -167,7 +170,7 @@ final class NoopStats { } @Override - @Nullable + @javax.annotation.Nullable @SuppressWarnings("deprecation") public ViewData getView(View.Name name) { Utils.checkNotNull(name, "name"); @@ -178,7 +181,7 @@ final class NoopStats { } else { return ViewData.create( view, - Collections.<List<TagValue>, AggregationData>emptyMap(), + Collections.<List</*@Nullable*/ TagValue>, AggregationData>emptyMap(), view.getWindow() .match( Functions.<ViewData.AggregationWindowData>returnConstant( |