diff options
author | gjoranv <gjoranv@gmail.com> | 2019-03-04 13:20:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-04 13:20:31 +0100 |
commit | aa4a3718c0593a683daea6b0f6954d421b8637e8 (patch) | |
tree | ba83ab3ddc8da87fdd3a5ab8ba35d1ce989beaff /config-model/src/main/java/com/yahoo | |
parent | 243a8c2402de679c45e5814d9c2bc41d5e3682eb (diff) |
Revert "Gjoranv/use container service type"
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
5 files changed, 26 insertions, 5 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 c7941750a91..ce5ab30a385 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.config.model.api.container.ContainerServiceType; +import com.yahoo.vespa.model.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 6d047c77594..6532105e602 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.config.model.api.container.ContainerServiceType; +import com.yahoo.vespa.model.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 414125f3cc4..af2ecc3c92e 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,6 +29,7 @@ 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; @@ -198,7 +199,7 @@ public abstract class Container extends AbstractService implements if (myServiceType == null) { myServiceType = myServiceType(); } - return myServiceType.serviceName; + return myServiceType.name; } /** Subclasses must implement this for a custom service name. */ 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 8f258da4832..dc05f4b0f7d 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,6 +1,5 @@ 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 new file mode 100644 index 00000000000..9ef407d2ae6 --- /dev/null +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerServiceType.java @@ -0,0 +1,21 @@ +// 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; + } + +} |