Initialize wantedDockerImage, require non-null values for required fields

1 files changed, 11 insertions, 5 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
index 15c216a45af..38a27643798 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
@@ -42,6 +42,12 @@ public class ContainerNodeSpec {
             final Optional<Double> minCpuCores,
             final Optional<Double> minMainMemoryAvailableGb,
             final Optional<Double> minDiskAvailableGb) {
+        Objects.requireNonNull(hostname);
+        Objects.requireNonNull(containerName);
+        Objects.requireNonNull(nodeState);
+        Objects.requireNonNull(nodeType);
+        Objects.requireNonNull(nodeFlavor);
+
         this.hostname = hostname;
         this.wantedDockerImage = wantedDockerImage;
         this.containerName = containerName;
@@ -215,16 +221,16 @@ public class ContainerNodeSpec {
 
     public static class Builder {
         private String hostname;
-        private Optional<DockerImage> wantedDockerImage;
+        private Optional<DockerImage> wantedDockerImage = Optional.empty();
         private ContainerName containerName;
         private Node.State nodeState;
         private String nodeType;
         private String nodeFlavor;
-        private Optional<String> vespaVersion = Optional.empty();;
-        private Optional<Owner> owner = Optional.empty();;
-        private Optional<Membership> membership = Optional.empty();;
+        private Optional<String> vespaVersion = Optional.empty();
+        private Optional<Owner> owner = Optional.empty();
+        private Optional<Membership> membership = Optional.empty();
         private Optional<Long> wantedRestartGeneration = Optional.empty();
-        private Optional<Long> currentRestartGeneration = Optional.empty();;
+        private Optional<Long> currentRestartGeneration = Optional.empty();
         private Optional<Double> minCpuCores = Optional.of(1d);
         private Optional<Double> minMainMemoryAvailableGb = Optional.of(1d);
         private Optional<Double> minDiskAvailableGb = Optional.of(1d);