Remove use of Nullable and NotNull annotations

Different implementations and using OSGi makes it really
hard to use these annotations and the value of using them
is IMHO not very high.

2 files changed, 3 insertions, 7 deletions

diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
index 5e7b60411c9..edb9e4820d1 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
@@ -16,8 +16,6 @@ import com.yahoo.collections.LazyMap;
 import com.yahoo.collections.LazySet;
 import com.yahoo.log.LogLevel;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * An aggregation of data which is only written to from a single thread.
  *
@@ -136,7 +134,7 @@ public class Bucket {
         return names;
     }
 
-    public Collection<Map.Entry<Point, UntypedMetric>> getValuesForMetric(@NonNull String metricName) {
+    public Collection<Map.Entry<Point, UntypedMetric>> getValuesForMetric(String metricName) {
         List<Map.Entry<Point, UntypedMetric>> singleMetric = new ArrayList<>();
         for (Map.Entry<Identifier, UntypedMetric> entry : values.entrySet()) {
             if (metricName.equals(entry.getKey().getName())) {
@@ -146,7 +144,7 @@ public class Bucket {
         return singleMetric;
     }
 
-    public Map<Point, UntypedMetric> getMapForMetric(@NonNull String metricName) {
+    public Map<Point, UntypedMetric> getMapForMetric(String metricName) {
         Map<Point, UntypedMetric> result = new HashMap<>();
         for (Map.Entry<Identifier, UntypedMetric> entry : values.entrySet()) {
             if (metricName.equals(entry.getKey().getName())) {
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Gauge.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Gauge.java
index 0ddb99e375d..1edefd0ae5a 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Gauge.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Gauge.java
@@ -4,8 +4,6 @@ package com.yahoo.metrics.simple;
 import com.google.common.annotations.Beta;
 import com.yahoo.metrics.simple.UntypedMetric.AssumedType;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
-
 /**
  * A gauge metric, i.e. a bucket of arbitrary sample values. Create a gauge
  * metric by declaring it with {@link MetricReceiver#declareGauge(String)} or
@@ -15,7 +13,7 @@ import edu.umd.cs.findbugs.annotations.Nullable;
  */
 @Beta
 public class Gauge {
-    @Nullable
+
     private final Point defaultPosition;
     private final String name;
     private final MetricReceiver receiver;