diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-11-06 16:10:09 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-11-06 16:10:09 +0100 |
commit | 6dc92b5b36bec70f143453a6e7a924a663b42cff (patch) | |
tree | 8d3ebab06c6cd3d13c5602b19f7f44853304ab5b /controller-api | |
parent | 1407048aaf102fca1b68716ff997ca1fb7833676 (diff) |
NodeHistory is now List instead of Array
Diffstat (limited to 'controller-api')
2 files changed, 16 insertions, 8 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java index 373eb20d013..8fd294f64f8 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/Node.java @@ -12,7 +12,9 @@ import com.yahoo.config.provision.TenantName; import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeHistory; import java.time.Instant; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -54,7 +56,7 @@ public class Node { private final Optional<TenantName> reservedTo; private final Optional<ApplicationId> exclusiveTo; private final Map<String, JsonNode> reports; - private final NodeHistory[] history; + private final List<NodeHistory> history; public Node(HostName hostname, Optional<HostName> parentHostname, State state, NodeType type, NodeResources resources, Optional<ApplicationId> owner, Version currentVersion, Version wantedVersion, Version currentOsVersion, Version wantedOsVersion, @@ -62,7 +64,7 @@ public class Node { Optional<Instant> suspendedSince, long restartGeneration, long wantedRestartGeneration, long rebootGeneration, long wantedRebootGeneration, int cost, String flavor, String clusterId, ClusterType clusterType, boolean wantToRetire, boolean wantToDeprovision, Optional<TenantName> reservedTo, Optional<ApplicationId> exclusiveTo, - DockerImage wantedDockerImage, DockerImage currentDockerImage, Map<String, JsonNode> reports, NodeHistory[] history) { + DockerImage wantedDockerImage, DockerImage currentDockerImage, Map<String, JsonNode> reports, List<NodeHistory> history) { this.hostname = hostname; this.parentHostname = parentHostname; this.state = state; @@ -205,7 +207,7 @@ public class Node { return reports; } - public NodeHistory[] history() { + public List<NodeHistory> history() { return history; } @@ -282,7 +284,7 @@ public class Node { private Optional<TenantName> reservedTo = Optional.empty(); private Optional<ApplicationId> exclusiveTo = Optional.empty(); private Map<String, JsonNode> reports = new HashMap<>(); - private NodeHistory[] history = {}; + private List<NodeHistory> history = new ArrayList<>(); public Builder() { } @@ -459,6 +461,11 @@ public class Node { return this; } + public Builder history(List<NodeHistory> history) { + this.history = history; + return this; + } + public Node build() { return new Node(hostname, parentHostname, state, type, resources, owner, currentVersion, wantedVersion, currentOsVersion, wantedOsVersion, currentFirmwareCheck, wantedFirmwareCheck, serviceState, diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java index 2e5132fe17d..392aa3ab7ad 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; import java.util.Arrays; +import java.util.List; import java.util.Map; import java.util.Set; @@ -77,7 +78,7 @@ public class NodeRepositoryNode { @JsonProperty("cost") private Integer cost; @JsonProperty("history") - private NodeHistory[] history; + private List<NodeHistory> history; @JsonProperty("allowedToBeDown") private Boolean allowedToBeDown; @JsonProperty("suspendedSinceMillis") @@ -305,11 +306,11 @@ public class NodeRepositoryNode { this.cost = cost; } - public NodeHistory[] getHistory() { + public List<NodeHistory> getHistory() { return history; } - public void setHistory(NodeHistory[] history) { + public void setHistory(List<NodeHistory> history) { this.history = history; } @@ -413,7 +414,7 @@ public class NodeRepositoryNode { ", wantToRetire=" + wantToRetire + ", wantToDeprovision=" + wantToDeprovision + ", cost=" + cost + - ", history=" + Arrays.toString(history) + + ", history=" + history + ", allowedToBeDown=" + allowedToBeDown + ", reports=" + reports + ", modelName=" + modelName + |