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.

4 files changed, 5 insertions, 20 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
index 6ba788aced3..33914face61 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java
@@ -5,8 +5,6 @@ import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.yahoo.collections.Tuple2;
@@ -154,7 +152,7 @@ public class HttpConfigRequest implements GetConfigRequest, TenantRequest {
     private static boolean configNameNotFound(final ConfigKey<?> requestKey, Set<ConfigKey<?>> allConfigsProduced) {
         return !Iterables.any(allConfigsProduced, new Predicate<ConfigKey<?>>() {
             @Override
-            public boolean apply(@Nullable ConfigKey<?> k) {
+            public boolean apply(ConfigKey<?> k) {
                 return k.getName().equals(requestKey.getName()) && k.getNamespace().equals(requestKey.getNamespace());
             }
         });
diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java
index 3b39a85c6b1..3251ba6c382 100644
--- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java
+++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java
@@ -6,22 +6,18 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Model a single cluster of services in the Vespa model.
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public final class Cluster implements Comparable<Cluster> {
-    @NonNull
+
     public final String name;
-    @NonNull
     public final String type;
     /**
      * An ordered list of the service instances in this cluster.
      */
-    @NonNull
     public final ImmutableList<Service> services;
 
     public Cluster(String name, String type, List<Service> services) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java
index b5d18bdbb1f..16a65b965e2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java
+++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java
@@ -10,24 +10,18 @@ import java.util.List;
 import com.google.common.collect.ImmutableList;
 import com.yahoo.text.Utf8;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Model a single service instance as a sortable object.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public final class Service implements Comparable<Service> {
-    @NonNull
+
     public final String serviceType;
-    @NonNull
     public final String host;
     public final int statePort;
-    @NonNull
     public final String configId;
-    @NonNull
     public final List<Integer> ports;
-    @NonNull
     public final String name;
 
     public Service(String serviceType, String host, int statePort, String clusterName, String clusterType,
diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java
index c9574ffaa7e..a155090b79c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java
+++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java
@@ -19,8 +19,6 @@ import com.yahoo.vespa.serviceview.bindings.ModelResponse;
 import com.yahoo.vespa.serviceview.bindings.ServicePort;
 import com.yahoo.vespa.serviceview.bindings.ServiceView;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER;
 
 /**
@@ -37,7 +35,6 @@ public final class ServiceModel {
     /**
      * An ordered list of the clusters in this config model.
      */
-    @NonNull
     public final ImmutableList<Cluster> clusters;
 
     ServiceModel(ModelResponse modelConfig) {
@@ -155,7 +152,7 @@ public final class ServiceModel {
         }
     }
 
-    private Service getFirstServiceInstanceByType(@NonNull String typeName) {
+    private Service getFirstServiceInstanceByType(String typeName) {
         for (Cluster c : clusters) {
             for (Service s : c.services) {
                 if (typeName.equals(s.serviceType)) {