diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-11-06 11:00:22 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-11-06 11:00:22 +0100 |
commit | 04490b5e6c3cd2c166201acd81833e570d33047b (patch) | |
tree | 4951e295952e233fdbb47eec5549f1382b61a484 /controller-api | |
parent | 40cd2c7b371fd8c0b300dd251408eca5fb28bd40 (diff) |
ConfigChangeActions now includes ReindexActions as well
Diffstat (limited to 'controller-api')
3 files changed, 60 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ConfigChangeActions.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ConfigChangeActions.java index 397461a829d..1c1599f318d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ConfigChangeActions.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ConfigChangeActions.java @@ -14,19 +14,23 @@ import java.util.List; public class ConfigChangeActions { @JsonProperty("restart") public final List<RestartAction> restartActions; @JsonProperty("refeed") public final List<RefeedAction> refeedActions; + @JsonProperty("reindex") public final List<ReindexAction> reindexActions; @JsonCreator public ConfigChangeActions(@JsonProperty("restart") List<RestartAction> restartActions, - @JsonProperty("refeed") List<RefeedAction> refeedActions) { + @JsonProperty("refeed") List<RefeedAction> refeedActions, + @JsonProperty("reindex") List<ReindexAction> reindexActions) { this.restartActions = restartActions; this.refeedActions = refeedActions; + this.reindexActions = reindexActions; } @Override public String toString() { return "ConfigChangeActions{" + - "restartActions=" + restartActions + - ", refeedActions=" + refeedActions + - '}'; + "restartActions=" + restartActions + + ", refeedActions=" + refeedActions + + ", reindexActions=" + reindexActions + + '}'; } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java index 0546a3b5c44..faa2c39ee65 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/RefeedAction.java @@ -12,6 +12,7 @@ import java.util.List; */ @JsonIgnoreProperties(ignoreUnknown = true) public class RefeedAction { + public final String name; public final boolean allowed; public final String documentType; @@ -45,4 +46,5 @@ public class RefeedAction { ", messages=" + messages + '}'; } + } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java new file mode 100644 index 00000000000..c5735fbd4a6 --- /dev/null +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/configserverbindings/ReindexAction.java @@ -0,0 +1,50 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.controller.api.application.v4.model.configserverbindings; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +/** + * @author jonmv + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class ReindexAction { + + public final String name; + public final boolean allowed; + public final String documentType; + public final String clusterName; + public final List<ServiceInfo> services; + public final List<String> messages; + + @JsonCreator + public ReindexAction(@JsonProperty("name") String name, + @JsonProperty("allowed") boolean allowed, + @JsonProperty("documentType") String documentType, + @JsonProperty("clusterName") String clusterName, + @JsonProperty("services") List<ServiceInfo> services, + @JsonProperty("messages") List<String> messages) { + this.name = name; + this.allowed = allowed; + this.documentType = documentType; + this.clusterName = clusterName; + this.services = services; + this.messages = messages; + } + + @Override + public String toString() { + return "ReindexAction{" + + "name='" + name + '\'' + + ", allowed=" + allowed + + ", documentType='" + documentType + '\'' + + ", clusterName='" + clusterName + '\'' + + ", services=" + services + + ", messages=" + messages + + '}'; + } + +} |