nullaway

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

Author: zeitlinger

prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java

@@ -18,13 +18,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.zip.GZIPOutputStream;
+import javax.annotation.Nullable;
 
 /** Prometheus scrape endpoint. */
 public class PrometheusScrapeHandler {
 
   private final PrometheusRegistry registry;
   private final ExpositionFormats expositionFormats;
-  private final Predicate<String> nameFilter;
+  @Nullable private final Predicate<String> nameFilter;
   private final AtomicInteger lastResponseSize = new AtomicInteger(2 << 9); //  0.5 MB
   private final List<String> supportedFormats;
 
@@ -97,6 +98,7 @@ public void handleRequest(PrometheusHttpExchange exchange) throws IOException {
     }
   }
 
+  @Nullable
   private Predicate<String> makeNameFilter(ExporterFilterProperties props) {
     if (props.getAllowedMetricNames() == null
         && props.getExcludedMetricNames() == null
@@ -113,7 +115,8 @@ private Predicate<String> makeNameFilter(ExporterFilterProperties props) {
     }
   }
 
-  private Predicate<String> makeNameFilter(String[] includedNames) {
+  @Nullable
+  private Predicate<String> makeNameFilter(@Nullable String[] includedNames) {
     Predicate<String> result = null;
     if (includedNames != null && includedNames.length > 0) {
       result = MetricNameFilter.builder().nameMustBeEqualTo(includedNames).build();

prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java

@@ -29,7 +29,7 @@
 public class PrometheusProtobufWriterImpl implements ExpositionFormatWriter {
 
   @Override
-  public boolean accepts(String acceptHeader) {
+  public boolean accepts(@Nullable String acceptHeader) {
     throw new IllegalStateException("use PrometheusProtobufWriter instead");
   }
 

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriter.java

@@ -4,9 +4,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import javax.annotation.Nullable;
 
 public interface ExpositionFormatWriter {
-  boolean accepts(String acceptHeader);
+  boolean accepts(@Nullable String acceptHeader);
 
   /** Text formats use UTF-8 encoding. */
   void write(OutputStream out, MetricSnapshots metricSnapshots) throws IOException;

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java

@@ -2,6 +2,7 @@
 
 import io.prometheus.metrics.config.ExporterProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
+import javax.annotation.Nullable;
 
 public class ExpositionFormats {
 
@@ -36,7 +37,7 @@ public static ExpositionFormats init(ExporterProperties properties) {
             .build());
   }
 
-  public ExpositionFormatWriter findWriter(String acceptHeader) {
+  public ExpositionFormatWriter findWriter(@Nullable String acceptHeader) {
     if (prometheusProtobufWriter.accepts(acceptHeader)) {
       return prometheusProtobufWriter;
     }

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java

@@ -91,7 +91,7 @@ public static OpenMetricsTextFormatWriter create() {
   }
 
   @Override
-  public boolean accepts(String acceptHeader) {
+  public boolean accepts(@Nullable String acceptHeader) {
     if (acceptHeader == null) {
       return false;
     }

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java

@@ -34,7 +34,7 @@ private static ExpositionFormatWriter createProtobufWriter() {
   }
 
   @Override
-  public boolean accepts(String acceptHeader) {
+  public boolean accepts(@Nullable String acceptHeader) {
     if (acceptHeader == null) {
       return false;
     } else {

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java

@@ -89,7 +89,7 @@ public static PrometheusTextFormatWriter create() {
   }
 
   @Override
-  public boolean accepts(String acceptHeader) {
+  public boolean accepts(@Nullable String acceptHeader) {
     if (acceptHeader == null) {
       return false;
     } else {

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricNameFilter.java

@@ -6,6 +6,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.function.Predicate;
+import javax.annotation.Nullable;
 
 /** Filter samples (i.e. time series) by name. */
 public class MetricNameFilter implements Predicate<String> {
@@ -121,7 +122,7 @@ public Builder nameMustBeEqualTo(String... names) {
      *
      * @param names empty means no restriction.
      */
-    public Builder nameMustBeEqualTo(Collection<String> names) {
+    public Builder nameMustBeEqualTo(@Nullable Collection<String> names) {
       if (names != null) {
         nameEqualTo.addAll(names);
       }
@@ -144,7 +145,7 @@ public Builder nameMustNotBeEqualTo(String... names) {
      *
      * @param names empty means no name will be excluded.
      */
-    public Builder nameMustNotBeEqualTo(Collection<String> names) {
+    public Builder nameMustNotBeEqualTo(@Nullable Collection<String> names) {
       if (names != null) {
         nameNotEqualTo.addAll(names);
       }
@@ -163,7 +164,7 @@ public Builder nameMustStartWith(String... prefixes) {
      *
      * @param prefixes empty means no restriction.
      */
-    public Builder nameMustStartWith(Collection<String> prefixes) {
+    public Builder nameMustStartWith(@Nullable Collection<String> prefixes) {
       if (prefixes != null) {
         nameStartsWith.addAll(prefixes);
       }
@@ -182,7 +183,7 @@ public Builder nameMustNotStartWith(String... prefixes) {
      *
      * @param prefixes empty means no time series will be excluded.
      */
-    public Builder nameMustNotStartWith(Collection<String> prefixes) {
+    public Builder nameMustNotStartWith(@Nullable Collection<String> prefixes) {
       if (prefixes != null) {
         nameDoesNotStartWith.addAll(prefixes);
       }