Clean up filter package

6 files changed, 6 insertions, 20 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeFilter.java
index 2c19baad7f3..bc433c83b2e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeFilter.java
@@ -3,8 +3,6 @@ package com.yahoo.vespa.hosted.provision.node.filter;
 
 import com.yahoo.vespa.hosted.provision.Node;
 
-import java.util.Objects;
-
 /**
  * A chainable node filter
  *
@@ -14,7 +12,7 @@ public abstract class NodeFilter {
 
     private final NodeFilter next;
 
-    /** Creates a node filter with a nchained filter, or null if this is the last filter */
+    /** Creates a node filter with a chained filter, or null if this is the last filter */
     protected NodeFilter(NodeFilter next) {
         this.next = next;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeHostFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeHostFilter.java
index 76b5cd2ce27..ed66d085972 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeHostFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeHostFilter.java
@@ -20,8 +20,7 @@ public class NodeHostFilter extends NodeFilter {
     /** Creates a node filter which filters using the given host filter */
     private NodeHostFilter(HostFilter filter, NodeFilter next) {
         super(next);
-        Objects.requireNonNull(filter, "filter cannot be null, use HostFilter.all()");
-        this.filter = filter;
+        this.filter = Objects.requireNonNull(filter, "filter cannot be null, use HostFilter.all()");
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeListFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeListFilter.java
index 34430a8ec0a..9bd9f6400d5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeListFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeListFilter.java
@@ -20,7 +20,7 @@ public class NodeListFilter extends NodeFilter {
 
     private NodeListFilter(List<Node> nodes, NodeFilter next) {
         super(next);
-        this.nodes = ImmutableSet.copyOf(nodes);
+        this.nodes = ImmutableSet.copyOf(Objects.requireNonNull(nodes, "nodes cannot be null"));
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeTypeFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeTypeFilter.java
index 91d155ba069..2a50961e0a4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeTypeFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/NodeTypeFilter.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.provision.node.filter;
 
 import com.google.common.collect.ImmutableSet;
-import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.text.StringUtilities;
 import com.yahoo.vespa.hosted.provision.Node;
@@ -21,8 +20,7 @@ public class NodeTypeFilter extends NodeFilter {
     
     protected NodeTypeFilter(Set<NodeType> types, NodeFilter next) {
         super(next);
-        Objects.requireNonNull(types, "Node types cannot be null");
-        this.types = ImmutableSet.copyOf(types);
+        this.types = ImmutableSet.copyOf(Objects.requireNonNull(types, "Node types cannot be null"));
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java
index 522afc2d859..3c51161d4ca 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/ParentHostFilter.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.provision.node.filter;
 
 import com.google.common.collect.ImmutableSet;
-import com.yahoo.config.provision.HostFilter;
 import com.yahoo.text.StringUtilities;
 import com.yahoo.vespa.hosted.provision.Node;
 
@@ -22,8 +21,7 @@ public class ParentHostFilter extends NodeFilter {
     /** Creates a node filter which filters using the given parent host name */
     private ParentHostFilter(Set<String> parentHostNames, NodeFilter next) {
         super(next);
-        Objects.requireNonNull(parentHostNames, "parentHostNames cannot be null.");
-        this.parentHostNames = ImmutableSet.copyOf(parentHostNames);
+        this.parentHostNames = ImmutableSet.copyOf(Objects.requireNonNull(parentHostNames, "parentHostNames cannot be null"));
     }
 
     @Override
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/StateFilter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/StateFilter.java
index 0cca49c6adb..5778800d02c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/StateFilter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/filter/StateFilter.java
@@ -2,18 +2,11 @@
 package com.yahoo.vespa.hosted.provision.node.filter;
 
 import com.google.common.collect.ImmutableSet;
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ApplicationName;
-import com.yahoo.config.provision.ClusterMembership;
-import com.yahoo.config.provision.HostFilter;
-import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.TenantName;
 import com.yahoo.text.StringUtilities;
 import com.yahoo.vespa.hosted.provision.Node;
 
 import java.util.Collections;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -29,7 +22,7 @@ public class StateFilter extends NodeFilter {
     /** Creates a node filter which filters using the given host filter */
     private StateFilter(Set<Node.State> states, NodeFilter next) {
         super(next);
-        Objects.requireNonNull(states, "state cannot be null, use an empty optional");
+        Objects.requireNonNull(states, "state cannot be null, use an empty set");
         this.states = ImmutableSet.copyOf(states);
     }