diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-11-11 15:47:10 +0100 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-11-11 15:47:10 +0100 |
commit | 1fc4b4fec3f7f455a45693a85cefb867c249a747 (patch) | |
tree | 6818004319107f89cde8e9ef15eb49b7321aa61c | |
parent | 442f4eb8acfec8fd70a61f8cc9a32b1ba873b19e (diff) |
Initialize wantedDockerImage, require non-null values for required fields
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java | 16 |
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); |