diff options
author | gjoranv <gv@verizonmedia.com> | 2019-03-01 16:49:05 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-03-04 13:38:24 +0100 |
commit | 22175435a10e5f54058b75548d260c40e27b61d6 (patch) | |
tree | 3cfb5f45dd953dfa135a4ba4ed7d4e2b8910857b /config-model | |
parent | ac76b7090b26a82d5cdbc801a05196685b059f0c (diff) |
Move ContainerServiceType to config-model-api
.. to make it accessible without depending on config-model.
Diffstat (limited to 'config-model')
5 files changed, 4 insertions, 25 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java index ce5ab30a385..c7941750a91 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.model.admin; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerServiceType; +import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.vespa.model.container.component.Handler; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index 6532105e602..6d047c77594 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -13,7 +13,7 @@ import com.yahoo.vespa.config.content.FleetcontrollerConfig; import static com.yahoo.vespa.defaults.Defaults.getDefaults; import com.yahoo.vespa.model.application.validation.RestartConfigs; import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerServiceType; +import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.vespa.model.container.component.AccessLogComponent; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.Handler; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index af2ecc3c92e..698f606b2c7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -2,8 +2,8 @@ package com.yahoo.vespa.model.container; import com.yahoo.component.ComponentId; -import com.yahoo.component.ComponentSpecification; import com.yahoo.config.application.api.DeployLogger; +import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.container.ComponentsConfig; import com.yahoo.container.QrConfig; @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Objects; import java.util.Optional; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerImpl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerImpl.java index dc05f4b0f7d..8f258da4832 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerImpl.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerImpl.java @@ -1,5 +1,6 @@ package com.yahoo.vespa.model.container; +import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.model.producer.AbstractConfigProducer; /** diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerServiceType.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerServiceType.java deleted file mode 100644 index 9ef407d2ae6..00000000000 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerServiceType.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.model.container; - -/** - * @author gjoranv - */ -public enum ContainerServiceType { - - CONTAINER("container"), - QRSERVER("qrserver"), - CLUSTERCONTROLLER_CONTAINER("container-clustercontroller"), - LOGSERVER_CONTAINER("logserver-container"), - METRICS_PROXY_CONTAINER("metrics-proxy-container"); - - public final String name; - - ContainerServiceType(String name) { - this.name = name; - } - -} |