nullaway

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java

@@ -1,12 +1,12 @@
 package io.prometheus.metrics.config;
 
-import static java.util.Collections.unmodifiableList;
-
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+
+import static java.util.Collections.unmodifiableList;
 
 /** Properties starting with io.prometheus.metrics */
 public class MetricsProperties {
@@ -414,7 +414,7 @@ public Builder histogramClassicOnly(@Nullable Boolean histogramClassicOnly) {
     }
 
     /** See {@link MetricsProperties#getHistogramClassicUpperBounds()} */
-    public Builder histogramClassicUpperBounds(double... histogramClassicUpperBounds) {
+    public Builder histogramClassicUpperBounds(@Nullable double... histogramClassicUpperBounds) {
       this.histogramClassicUpperBounds = Util.toList(histogramClassicUpperBounds);
       return this;
     }

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/Util.java

@@ -34,7 +34,7 @@ static Boolean loadBoolean(String name, Map<Object, Object> properties)
   }
 
   @Nullable
-  static List<Double> toList(double... values) {
+  static List<Double> toList(@Nullable double... values) {
     if (values == null) {
       return null;
     }

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java

@@ -1,5 +1,7 @@
 package io.prometheus.metrics.core.exemplars;
 
+import static java.util.Objects.requireNonNull;
+
 import io.prometheus.metrics.core.util.Scheduler;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Exemplars;
@@ -12,8 +14,6 @@
 import java.util.function.LongSupplier;
 import javax.annotation.Nullable;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * The ExemplarSampler selects Spans as exemplars.
  *

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerConfig.java

@@ -2,9 +2,8 @@
 
 import io.prometheus.metrics.config.ExemplarsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
-
-import javax.annotation.Nullable;
 import java.util.concurrent.TimeUnit;
+import javax.annotation.Nullable;
 
 public class ExemplarSamplerConfig {
 

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java

@@ -8,13 +8,12 @@
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Labels;
-
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
+import javax.annotation.Nullable;
 
 /**
  * Counter metric.

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CounterWithCallback.java

@@ -2,12 +2,11 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
-
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
+import javax.annotation.Nullable;
 
 /**
  * Example:
@@ -62,8 +61,7 @@ public static Builder builder(PrometheusProperties properties) {
   public static class Builder
       extends CallbackMetric.Builder<CounterWithCallback.Builder, CounterWithCallback> {
 
-    @Nullable
-    private Consumer<Callback> callback;
+    @Nullable private Consumer<Callback> callback;
 
     public Builder callback(Consumer<Callback> callback) {
       this.callback = callback;

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java

@@ -8,12 +8,11 @@
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
-
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.Nullable;
 
 /**
  * Gauge metric.
@@ -169,7 +168,6 @@ private GaugeSnapshot.GaugeDataPointSnapshot collect(Labels labels) {
       }
       return new GaugeSnapshot.GaugeDataPointSnapshot(get(), labels, oldest);
     }
-
   }
 
   public static Builder builder() {

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/GaugeWithCallback.java

@@ -2,12 +2,11 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
-
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
+import javax.annotation.Nullable;
 
 /**
  * Example:
@@ -66,8 +65,7 @@ public static Builder builder(PrometheusProperties properties) {
   public static class Builder
       extends CallbackMetric.Builder<GaugeWithCallback.Builder, GaugeWithCallback> {
 
-    @Nullable
-    private Consumer<Callback> callback;
+    @Nullable private Consumer<Callback> callback;
 
     public Builder callback(Consumer<Callback> callback) {
       this.callback = callback;

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java

@@ -12,8 +12,6 @@
 import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
-
-import javax.annotation.Nullable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,6 +24,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
+import javax.annotation.Nullable;
 
 /**
  * Histogram metric. Example usage:
@@ -70,8 +69,7 @@ public class Histogram extends StatefulMetric<DistributionDataPoint, Histogram.D
   // NATIVE_BOUNDS is used to look up the native bucket index depending on the current schema.
   private static final double[][] NATIVE_BOUNDS;
 
-  @Nullable
-  private final ExemplarSamplerConfig exemplarSamplerConfig;
+  @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
 
   // Upper bounds for the classic histogram buckets. Contains at least +Inf.
   // An empty array indicates that this is a native histogram only.

prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadata.java

@@ -5,10 +5,9 @@
 import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import io.prometheus.metrics.model.snapshots.Unit;
-
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Nullable;
 
 /**
  * Almost all metrics have fixed metadata, i.e. the metric name is known when the metric is created.