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.

7 files changed, 4 insertions, 23 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index 6da8df60161..aa59f9434f0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -7,7 +7,6 @@ import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.Flavor;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -117,7 +116,7 @@ public class HostResource implements Comparable<HostResource> {
     /** Returns the flavor of this resource. Empty for self-hosted Vespa. */
     public Optional<Flavor> getFlavor() { return flavor; }
 
-    public void addClusterMembership(@Nullable ClusterMembership clusterMembership) {
+    public void addClusterMembership(ClusterMembership clusterMembership) {
         if (clusterMembership != null)
             clusterMemberships.add(clusterMembership);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
index b2ab7e19f85..4ff577ab670 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/ConsumersConfigGenerator.java
@@ -9,7 +9,6 @@ import com.yahoo.vespa.model.admin.monitoring.Metric;
 import com.yahoo.vespa.model.admin.monitoring.MetricSet;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
 
-import javax.annotation.Nullable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,7 @@ class ConsumersConfigGenerator {
                                    new MetricSet(original.getMetricSet().getId(), combinedMetrics.values()));
     }
 
-    private static Metric combineMetrics(@Nullable Metric original, Metric newMetric) {
+    private static Metric combineMetrics(Metric original, Metric newMetric) {
         return original != null ? newMetric.addDimensionsFrom(original) : newMetric;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 2b9cd18d64b..54318c0b7ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -23,7 +23,6 @@ import com.yahoo.vespa.model.container.component.Servlet;
 import com.yahoo.vespa.model.container.jersey.Jersey2Servlet;
 import com.yahoo.vespa.model.container.jersey.RestApi;
 import com.yahoo.vespa.model.utils.FileSender;
-import edu.umd.cs.findbugs.annotations.NonNull;
 
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -112,7 +111,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         this.modelEvaluation = modelEvaluation;
     }
 
-    public final void addRestApi(@NonNull RestApi restApi) {
+    public final void addRestApi(RestApi restApi) {
         restApiGroup.addComponent(ComponentId.fromString(restApi.getBindingPath()), restApi);
     }
 
@@ -125,7 +124,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         return servletGroup.getComponentMap();
     }
 
-    public final void addServlet(@NonNull Servlet servlet) {
+    public final void addServlet(Servlet servlet) {
         servletGroup.addComponent(servlet.getGlobalComponentId(), servlet);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 803b06e1e2b..15caebb19cc 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -56,8 +56,6 @@ import com.yahoo.vespa.model.container.search.ContainerSearch;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import com.yahoo.vespa.model.content.Content;
 import com.yahoo.vespa.model.search.AbstractSearchCluster;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -330,7 +328,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         return processingChains;
     }
 
-    @NonNull
     public SearchChains getSearchChains() {
         if (containerSearch == null)
             throw new IllegalStateException("Search components not found in container cluster '" + getSubId() +
@@ -338,7 +335,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         return containerSearch.getChains();
     }
 
-    @Nullable
     public ContainerSearch getSearch() {
         return containerSearch;
     }
@@ -352,12 +348,10 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addChild(http);
     }
 
-    @Nullable
     public Http getHttp() {
         return http;
     }
 
-    @Nullable
     public ContainerDocproc getDocproc() {
         return containerDocproc;
     }
@@ -366,7 +360,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         this.containerDocproc = containerDocproc;
     }
 
-    @Nullable
     public ContainerDocumentApi getDocumentApi() {
         return containerDocumentApi;
     }
@@ -375,7 +368,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         this.containerDocumentApi = containerDocumentApi;
     }
 
-    @NonNull
     public DocprocChains getDocprocChains() {
         if (containerDocproc == null)
             throw new IllegalStateException("Document processing components not found in container cluster '" + getSubId() +
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
index 3fa4db60195..0123ea9cf51 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
@@ -2,14 +2,12 @@
 package com.yahoo.vespa.model.container.component;
 
 import com.yahoo.vespa.model.container.component.chain.Chains;
-import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**
  * Holder for components and options related to either processing/search/docproc
  * for a container cluster.
  *
  * @author gjoranv
- * @since 5.1.9
  */
 public abstract class ContainerSubsystem<CHAINS extends Chains<?>> {
 
@@ -19,7 +17,6 @@ public abstract class ContainerSubsystem<CHAINS extends Chains<?>> {
         this.chains = chains;
     }
 
-    @NonNull
     public CHAINS getChains() {
         if (chains == null)
             throw new IllegalStateException("Null chains for " + this);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
index 5a251194d75..d4b4dcea78e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
@@ -9,7 +9,6 @@ import com.yahoo.container.jdisc.config.SessionConfig;
 import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.ContainerSubsystem;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -89,12 +88,10 @@ public class ContainerDocproc extends ContainerSubsystem<DocprocChains>
         //intentionally high, getMaxQueueMbSize() will probably kick in before this one!
     }
 
-    @Nullable
     private Integer getMaxQueueMbSize() {
         return options.maxQueueMbSize;
     }
 
-
     private Integer getMaxQueueTimeMs() {
         return options.maxQueueTimeMs;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java b/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java
index 9c424431fc5..390539b643a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java
@@ -10,7 +10,6 @@ import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.SimpleComponent;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,7 +36,6 @@ public class RestApiContext extends SimpleComponent implements
 
     private final String bindingPath;
 
-    @Nullable
     private ApplicationContainerCluster containerCluster;
 
     public RestApiContext(AbstractConfigProducer<?> ancestor, String bindingPath) {