diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-03-13 17:11:26 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-03-13 17:11:26 +0100 |
| commit | 0d5f9869279c942e2cb8b0e22782326377143354 (patch) | |
| tree | 7ff1b6637c45ed53acd5043d4d26376ba3cabc69 /config-model | |
| parent | 81e89336be35e9f9ecbcb3a3409d4546705c87fc (diff) | |
Rename Container(Cluster)Impl -> ApplicationContainer(Cluster)
Diffstat (limited to 'config-model')
26 files changed, 159 insertions, 182 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 858600259f9..d7fc30f19af 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -33,7 +33,7 @@ import com.yahoo.searchdefinition.RankingConstants; import com.yahoo.searchdefinition.derived.AttributeFields; import com.yahoo.searchdefinition.derived.RankProfileList; import com.yahoo.searchdefinition.processing.Processing; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.search.QueryProfiles; import com.yahoo.vespa.model.ml.ConvertedModel; import com.yahoo.vespa.config.ConfigDefinitionKey; @@ -554,11 +554,11 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } /** Returns a map of container clusters by ID */ - public Map<String, ContainerClusterImpl> getContainerClusters() { - Map<String, ContainerClusterImpl> clusters = new LinkedHashMap<>(); + public Map<String, ApplicationContainerCluster> getContainerClusters() { + Map<String, ApplicationContainerCluster> clusters = new LinkedHashMap<>(); for (ContainerModel model : configModelRepo.getModels(ContainerModel.class)) { - if (model.getCluster() instanceof ContainerClusterImpl) { - clusters.put(model.getId(), (ContainerClusterImpl) model.getCluster()); + if (model.getCluster() instanceof ApplicationContainerCluster) { + clusters.put(model.getId(), (ApplicationContainerCluster) model.getCluster()); } } return Collections.unmodifiableMap(clusters); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java index 18cee19cfd8..d26ff49c4fa 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SecretStoreValidator.java @@ -6,7 +6,6 @@ import com.yahoo.config.model.deploy.DeployState; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; import com.yahoo.vespa.model.container.IdentityProvider; import com.yahoo.vespa.model.container.component.Component; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java index 4e65785c49c..96295d16445 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/first/AccessControlValidator.java @@ -7,7 +7,7 @@ import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.application.validation.Validator; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Handler; import java.util.ArrayList; @@ -32,8 +32,8 @@ public class AccessControlValidator extends Validator { List<String> offendingClusters = new ArrayList<>(); for (ContainerCluster<? extends Container> c : model.getContainerClusters().values()) { - if (! (c instanceof ContainerClusterImpl)) continue; - ContainerClusterImpl cluster = (ContainerClusterImpl)c; + if (! (c instanceof ApplicationContainerCluster)) continue; + ApplicationContainerCluster cluster = (ApplicationContainerCluster)c; if (cluster.getHttp() == null || ! cluster.getHttp().getAccessControl().isPresent() || ! cluster.getHttp().getAccessControl().get().writeEnabled) @@ -47,7 +47,7 @@ public class AccessControlValidator extends Validator { mkString(offendingClusters, "[", ", ", "].")); } - private boolean hasHandlerThatNeedsProtection(ContainerClusterImpl cluster) { + private boolean hasHandlerThatNeedsProtection(ApplicationContainerCluster cluster) { return cluster.getHandlers().stream().anyMatch(this::handlerNeedsProtection); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java index cd36b307270..7d8c219d5ef 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java @@ -16,8 +16,6 @@ import com.yahoo.vespa.model.admin.LogserverContainer; import com.yahoo.vespa.model.admin.LogserverContainerCluster; import com.yahoo.vespa.model.admin.Slobrok; import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; import com.yahoo.vespa.model.container.ContainerModel; import org.w3c.dom.Element; 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/ApplicationContainer.java index 57be3a86870..66362e2708e 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/ApplicationContainer.java @@ -5,15 +5,17 @@ import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.model.producer.AbstractConfigProducer; /** + * A container that is typically used by container clusters set up from the user application. + * * @author gjoranv */ -public final class ContainerImpl extends Container { +public final class ApplicationContainer extends Container { - public ContainerImpl(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) { + public ApplicationContainer(AbstractConfigProducer parent, String name, int index, boolean isHostedVespa) { super(parent, name, index, isHostedVespa); } - public ContainerImpl(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) { + public ApplicationContainer(AbstractConfigProducer parent, String name, boolean retired, int index, boolean isHostedVespa) { super(parent, name, retired, index, isHostedVespa); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerClusterImpl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 50f7029657d..e8b4e8f505c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerClusterImpl.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -27,11 +27,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * The default container cluster implementation. + * A container cluster that is typically set up from the user application. * * @author gjoranv */ -public final class ContainerClusterImpl extends ContainerCluster<ContainerImpl> implements +public final class ApplicationContainerCluster extends ContainerCluster<ApplicationContainer> implements BundlesConfig.Producer, RankProfilesConfig.Producer, RankingConstantsConfig.Producer, @@ -45,7 +45,7 @@ public final class ContainerClusterImpl extends ContainerCluster<ContainerImpl> private ContainerModelEvaluation modelEvaluation; - public ContainerClusterImpl(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) { + public ApplicationContainerCluster(AbstractConfigProducer<?> parent, String subId, String name, DeployState deployState) { super(parent, subId, name, deployState); restApiGroup = new ConfigProducerGroup<>(this, "rest-api"); servletGroup = new ConfigProducerGroup<>(this, "servlet"); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java index 127f81883ed..b7c8460a9a5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModelEvaluation.java @@ -26,13 +26,13 @@ public class ContainerModelEvaluation implements RankProfilesConfig.Producer, Ra /** Global rank profiles, aka models */ private final RankProfileList rankProfileList; - public ContainerModelEvaluation(ContainerClusterImpl cluster, RankProfileList rankProfileList) { + public ContainerModelEvaluation(ApplicationContainerCluster cluster, RankProfileList rankProfileList) { this.rankProfileList = Objects.requireNonNull(rankProfileList, "rankProfileList cannot be null"); cluster.addSimpleComponent(EVALUATOR_NAME, null, BUNDLE_NAME); cluster.addComponent(ContainerModelEvaluation.getHandler()); } - public void prepare(List<ContainerImpl> containers) { + public void prepare(List<ApplicationContainer> containers) { rankProfileList.sendConstantsTo(containers); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index 69a109b38c1..08268f5085d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -12,8 +12,7 @@ import com.yahoo.log.LogLevel; import com.yahoo.text.XML; import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.chain.Chain; import com.yahoo.vespa.model.container.http.AccessControl; import com.yahoo.vespa.model.container.http.FilterChains; @@ -97,14 +96,14 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> .orElse(ApplicationId.defaultId().application()); } - private static Optional<ContainerClusterImpl> getContainerCluster(AbstractConfigProducer configProducer) { + private static Optional<ApplicationContainerCluster> getContainerCluster(AbstractConfigProducer configProducer) { AbstractConfigProducer currentProducer = configProducer; - while (! ContainerClusterImpl.class.isAssignableFrom(currentProducer.getClass())) { + while (! ApplicationContainerCluster.class.isAssignableFrom(currentProducer.getClass())) { currentProducer = currentProducer.getParent(); if (currentProducer == null) return Optional.empty(); } - return Optional.of((ContainerClusterImpl) currentProducer); + return Optional.of((ApplicationContainerCluster) currentProducer); } private List<Binding> readFilterBindings(Element filteringSpec) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java b/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java index 4d5becec6b5..9c424431fc5 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/jersey/RestApiContext.java @@ -7,8 +7,7 @@ import com.yahoo.container.di.config.JerseyBundlesConfig; import com.yahoo.container.di.config.JerseyInjectionConfig; import com.yahoo.container.di.config.JerseyInjectionConfig.Inject; import com.yahoo.osgi.provider.model.ComponentModel; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.SimpleComponent; import edu.umd.cs.findbugs.annotations.Nullable; @@ -39,14 +38,14 @@ public class RestApiContext extends SimpleComponent implements private final String bindingPath; @Nullable - private ContainerClusterImpl containerCluster; + private ApplicationContainerCluster containerCluster; public RestApiContext(AbstractConfigProducer<?> ancestor, String bindingPath) { super(componentModel(bindingPath)); this.bindingPath = bindingPath; - if (ancestor instanceof ContainerClusterImpl) - containerCluster = (ContainerClusterImpl)ancestor; + if (ancestor instanceof ApplicationContainerCluster) + containerCluster = (ApplicationContainerCluster)ancestor; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java index 61328059a04..ab734c506c1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ConfigServerContainerModelBuilder.java @@ -2,8 +2,7 @@ package com.yahoo.vespa.model.container.xml; import com.yahoo.config.model.ConfigModelContext; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.configserver.ConfigserverCluster; import com.yahoo.vespa.model.container.configserver.option.CloudConfigOptions; @@ -34,7 +33,7 @@ public class ConfigServerContainerModelBuilder extends ContainerModelBuilder { // Need to override this method since we need to use the values in CloudConfigOptions (the ones // in ConfigModelContext.DeployState.properties are not set) @Override - protected void addStatusHandlers(ContainerClusterImpl cluster, boolean isHostedVespa) { + protected void addStatusHandlers(ApplicationContainerCluster cluster, boolean isHostedVespa) { super.addStatusHandlers(cluster, options.hostedVespa().orElse(Boolean.FALSE)); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 0d4cfb03bc1..7325105c8f0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -46,8 +46,8 @@ import com.yahoo.vespa.model.builder.xml.dom.chains.search.DomSearchChainsBuilde import com.yahoo.vespa.model.clients.ContainerDocumentApi; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; +import com.yahoo.vespa.model.container.ApplicationContainer; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.ContainerModelEvaluation; import com.yahoo.vespa.model.container.IdentityProvider; @@ -134,7 +134,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { checkVersion(spec); this.log = modelContext.getDeployLogger(); - ContainerClusterImpl cluster = createContainerCluster(spec, modelContext); + ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext); addClusterContent(cluster, spec, modelContext); addBundlesForPlatformComponents(cluster); cluster.setRpcServerEnabled(rpcServerEnabled); @@ -142,7 +142,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { model.setCluster(cluster); } - private void addBundlesForPlatformComponents(ContainerClusterImpl cluster) { + private void addBundlesForPlatformComponents(ApplicationContainerCluster cluster) { for (Component<?, ?> component : cluster.getAllComponents()) { String componentClass = component.model.bundleInstantiationSpec.getClassName(); BundleMapper.getBundlePath(componentClass). @@ -150,17 +150,17 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private ContainerClusterImpl createContainerCluster(Element spec, ConfigModelContext modelContext) { - return new VespaDomBuilder.DomConfigProducerBuilder<ContainerClusterImpl>() { + private ApplicationContainerCluster createContainerCluster(Element spec, ConfigModelContext modelContext) { + return new VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainerCluster>() { @Override - protected ContainerClusterImpl doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) { - return new ContainerClusterImpl(ancestor, modelContext.getProducerId(), - modelContext.getProducerId(), deployState); + protected ApplicationContainerCluster doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) { + return new ApplicationContainerCluster(ancestor, modelContext.getProducerId(), + modelContext.getProducerId(), deployState); } }.build(modelContext.getDeployState(), modelContext.getParentProducer(), spec); } - private void addClusterContent(ContainerClusterImpl cluster, Element spec, ConfigModelContext context) { + private void addClusterContent(ApplicationContainerCluster cluster, Element spec, ConfigModelContext context) { DeployState deployState = context.getDeployState(); DocumentFactoryBuilder.buildDocumentFactories(cluster, spec); addConfiguredComponents(deployState, cluster, spec); @@ -191,7 +191,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addAthensCopperArgos(cluster, context); // Must be added after nodes. } - private void addSecretStore(ContainerClusterImpl cluster, Element spec) { + private void addSecretStore(ApplicationContainerCluster cluster, Element spec) { Element secretStoreElement = XML.getChild(spec, "secret-store"); if (secretStoreElement != null) { SecretStore secretStore = new SecretStore(); @@ -202,7 +202,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addAthensCopperArgos(ContainerClusterImpl cluster, ConfigModelContext context) { + private void addAthensCopperArgos(ApplicationContainerCluster cluster, ConfigModelContext context) { app.getDeployment().map(DeploymentSpec::fromXml) .ifPresent(deploymentSpec -> { addIdentityProvider(cluster, @@ -216,7 +216,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { }); } - private void addRotationProperties(ContainerClusterImpl cluster, Zone zone, Set<Rotation> rotations, DeploymentSpec spec) { + private void addRotationProperties(ApplicationContainerCluster cluster, Zone zone, Set<Rotation> rotations, DeploymentSpec spec) { cluster.getContainers().forEach(container -> { setRotations(container, rotations, spec.globalServiceId(), cluster.getName()); container.setProp("activeRotation", Boolean.toString(zoneHasActiveRotation(zone, spec))); @@ -245,7 +245,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addRoutingAliases(ContainerClusterImpl cluster, Element spec, Environment environment) { + private void addRoutingAliases(ApplicationContainerCluster cluster, Element spec, Environment environment) { if (environment != Environment.prod) return; Element aliases = XML.getChild(spec, "aliases"); @@ -257,7 +257,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addConfiguredComponents(DeployState deployState, ContainerClusterImpl cluster, Element spec) { + private void addConfiguredComponents(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { for (Element components : XML.getChildren(spec, "components")) { addIncludes(components); addConfiguredComponents(deployState, cluster, components, "component"); @@ -265,7 +265,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addConfiguredComponents(deployState, cluster, spec, "component"); } - protected void addStatusHandlers(ContainerClusterImpl cluster, boolean isHostedVespa) { + protected void addStatusHandlers(ApplicationContainerCluster cluster, boolean isHostedVespa) { if (isHostedVespa) { String name = "status.html"; Optional<String> statusFile = Optional.ofNullable(System.getenv(HOSTED_VESPA_STATUS_FILE_INSTALL_SETTING)); @@ -277,17 +277,17 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addClientProviders(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addClientProviders(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { for (Element clientSpec: XML.getChildren(spec, "client")) { cluster.addComponent(new DomClientProviderBuilder().build(deployState, cluster, clientSpec)); } } - private void addServerProviders(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addServerProviders(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { addConfiguredComponents(deployState, cluster, spec, "server"); } - private void addAccessLogs(DeployState deployState, ContainerClusterImpl cluster, Element spec) { + private void addAccessLogs(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { List<Element> accessLogElements = getAccessLogElements(spec); for (Element accessLog : accessLogElements) { @@ -303,14 +303,14 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } - private void addHttp(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addHttp(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { Element httpElement = XML.getChild(spec, "http"); if (httpElement != null) { cluster.setHttp(buildHttp(deployState, cluster, httpElement)); } } - private Http buildHttp(DeployState deployState, ContainerClusterImpl cluster, Element httpElement) { + private Http buildHttp(DeployState deployState, ApplicationContainerCluster cluster, Element httpElement) { Http http = new HttpBuilder().build(deployState, cluster, httpElement); if (networking == Networking.disable) @@ -319,36 +319,36 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return http; } - private void addRestApis(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addRestApis(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { for (Element restApiElem : XML.getChildren(spec, "rest-api")) { cluster.addRestApi( new RestApiBuilder().build(deployState, cluster, restApiElem)); } } - private void addServlets(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addServlets(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { for (Element servletElem : XML.getChildren(spec, "servlet")) cluster.addServlet(new ServletBuilder().build(deployState, cluster, servletElem)); } - private void addDocumentApi(Element spec, ContainerClusterImpl cluster) { + private void addDocumentApi(Element spec, ApplicationContainerCluster cluster) { ContainerDocumentApi containerDocumentApi = buildDocumentApi(cluster, spec); if (containerDocumentApi == null) return; cluster.setDocumentApi(containerDocumentApi); } - private void addDocproc(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addDocproc(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { ContainerDocproc containerDocproc = buildDocproc(deployState, cluster, spec); if (containerDocproc == null) return; cluster.setDocproc(containerDocproc); ContainerDocproc.Options docprocOptions = containerDocproc.options; - cluster.setMbusParams(new ContainerClusterImpl.MbusParams( + cluster.setMbusParams(new ApplicationContainerCluster.MbusParams( docprocOptions.maxConcurrentFactor, docprocOptions.documentExpansionFactor, docprocOptions.containerCoreMemory)); } - private void addSearch(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addSearch(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { Element searchElement = XML.getChild(spec, "search"); if (searchElement == null) return; @@ -360,7 +360,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { validateAndAddConfiguredComponents(deployState, cluster, searchElement, "renderer", ContainerModelBuilder::validateRendererElement); } - private void addModelEvaluation(Element spec, ContainerClusterImpl cluster, ConfigModelContext context) { + private void addModelEvaluation(Element spec, ApplicationContainerCluster cluster, ConfigModelContext context) { Element modelEvaluationElement = XML.getChild(spec, "model-evaluation"); if (modelEvaluationElement == null) return; @@ -369,7 +369,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.setModelEvaluation(new ContainerModelEvaluation(cluster, profiles)); } - private void addProcessing(DeployState deployState, Element spec, ContainerClusterImpl cluster) { + private void addProcessing(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { Element processingElement = XML.getChild(spec, "processing"); if (processingElement == null) return; @@ -379,7 +379,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { validateAndAddConfiguredComponents(deployState, cluster, processingElement, "renderer", ContainerModelBuilder::validateRendererElement); } - private ContainerSearch buildSearch(DeployState deployState, ContainerClusterImpl containerCluster, Element producerSpec) { + private ContainerSearch buildSearch(DeployState deployState, ApplicationContainerCluster containerCluster, Element producerSpec) { SearchChains searchChains = new DomSearchChainsBuilder(null, false).build(deployState, containerCluster, producerSpec); ContainerSearch containerSearch = new ContainerSearch(containerCluster, searchChains, new ContainerSearch.Options()); @@ -396,7 +396,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { containerSearch.setPageTemplates(PageTemplates.create(applicationPackage)); } - private void addHandlers(DeployState deployState, ContainerClusterImpl cluster, Element spec) { + private void addHandlers(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { for (Element component: XML.getChildren(spec, "handler")) { cluster.addComponent( new DomHandlerBuilder().build(deployState, cluster, component)); @@ -411,15 +411,15 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addNodes(ContainerClusterImpl cluster, Element spec, ConfigModelContext context) { + private void addNodes(ApplicationContainerCluster cluster, Element spec, ConfigModelContext context) { if (standaloneBuilder) addStandaloneNode(cluster); else addNodesFromXml(cluster, spec, context); } - private void addStandaloneNode(ContainerClusterImpl cluster) { - ContainerImpl container = new ContainerImpl(cluster, "standalone", cluster.getContainers().size(), cluster.isHostedVespa()); + private void addStandaloneNode(ApplicationContainerCluster cluster) { + ApplicationContainer container = new ApplicationContainer(cluster, "standalone", cluster.getContainers().size(), cluster.isHostedVespa()); cluster.addContainers(Collections.singleton(container)); } @@ -438,7 +438,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return ContainerCluster.G1GC; } } - private static String getJvmOptions(ContainerClusterImpl cluster, Element nodesElement, DeployLogger deployLogger) { + private static String getJvmOptions(ApplicationContainerCluster cluster, Element nodesElement, DeployLogger deployLogger) { String jvmOptions = ""; if (nodesElement.hasAttribute(VespaDomBuilder.JVM_OPTIONS)) { jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVM_OPTIONS); @@ -456,17 +456,17 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } return jvmOptions; } - private void addNodesFromXml(ContainerClusterImpl cluster, Element containerElement, ConfigModelContext context) { + private void addNodesFromXml(ApplicationContainerCluster cluster, Element containerElement, ConfigModelContext context) { Element nodesElement = XML.getChild(containerElement, "nodes"); Element rotationsElement = XML.getChild(containerElement, "rotations"); if (nodesElement == null) { // default single node on localhost - ContainerImpl node = new ContainerImpl(cluster, "container.0", 0, cluster.isHostedVespa()); + ApplicationContainer node = new ApplicationContainer(cluster, "container.0", 0, cluster.isHostedVespa()); HostResource host = allocateSingleNodeHost(cluster, log, containerElement, context); node.setHostResource(host); node.initService(context.getDeployLogger()); cluster.addContainers(Collections.singleton(node)); } else { - List<ContainerImpl> nodes = createNodes(cluster, nodesElement, rotationsElement, context); + List<ApplicationContainer> nodes = createNodes(cluster, nodesElement, rotationsElement, context); applyNodesTagJvmArgs(nodes, getJvmOptions(cluster, nodesElement, context.getDeployLogger())); if ( !cluster.getJvmGCOptions().isPresent()) { @@ -500,7 +500,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return sb.toString(); } - private List<ContainerImpl> createNodes(ContainerClusterImpl cluster, Element nodesElement, Element rotationsElement, ConfigModelContext context) { + private List<ApplicationContainer> createNodes(ApplicationContainerCluster cluster, Element nodesElement, Element rotationsElement, ConfigModelContext context) { if (nodesElement.hasAttribute("count")) // regular, hosted node spec return createNodesFromNodeCount(cluster, nodesElement, rotationsElement, context); else if (nodesElement.hasAttribute("type")) // internal use for hosted system infrastructure nodes @@ -511,7 +511,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return createNodesFromNodeList(context.getDeployState(), cluster, nodesElement); } - private void applyRoutingAliasProperties(List<ContainerImpl> result, ContainerClusterImpl cluster) { + private void applyRoutingAliasProperties(List<ApplicationContainer> result, ApplicationContainerCluster cluster) { if (!cluster.serviceAliases().isEmpty()) { result.forEach(container -> { container.setProp("servicealiases", cluster.serviceAliases().stream().collect(Collectors.joining(","))); @@ -524,7 +524,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void applyMemoryPercentage(ContainerClusterImpl cluster, String memoryPercentage) { + private void applyMemoryPercentage(ApplicationContainerCluster cluster, String memoryPercentage) { if (memoryPercentage == null || memoryPercentage.isEmpty()) return; memoryPercentage = memoryPercentage.trim(); @@ -543,7 +543,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } /** Creates a single host when there is no nodes tag */ - private HostResource allocateSingleNodeHost(ContainerClusterImpl cluster, DeployLogger logger, Element containerElement, ConfigModelContext context) { + private HostResource allocateSingleNodeHost(ApplicationContainerCluster cluster, DeployLogger logger, Element containerElement, ConfigModelContext context) { DeployState deployState = context.getDeployState(); HostSystem hostSystem = cluster.getHostSystem(); if (deployState.isHosted()) { @@ -568,7 +568,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private List<ContainerImpl> createNodesFromNodeCount(ContainerClusterImpl cluster, Element nodesElement, Element rotationsElement, ConfigModelContext context) { + private List<ApplicationContainer> createNodesFromNodeCount(ApplicationContainerCluster cluster, Element nodesElement, Element rotationsElement, ConfigModelContext context) { NodesSpecification nodesSpecification = NodesSpecification.from(new ModelElement(nodesElement), context); Set<RotationName> rotations = Set.of(); if (zoneHasActiveRotation(context.getDeployState().zone())) { @@ -582,7 +582,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return createNodesFromHosts(context.getDeployLogger(), hosts, cluster); } - private List<ContainerImpl> createNodesFromNodeType(ContainerClusterImpl cluster, Element nodesElement, ConfigModelContext context) { + private List<ApplicationContainer> createNodesFromNodeType(ApplicationContainerCluster cluster, Element nodesElement, ConfigModelContext context) { NodeType type = NodeType.valueOf(nodesElement.getAttribute("type")); ClusterSpec clusterSpec = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from(cluster.getName()), @@ -595,7 +595,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return createNodesFromHosts(context.getDeployLogger(), hosts, cluster); } - private List<ContainerImpl> createNodesFromContentServiceReference(ContainerClusterImpl cluster, Element nodesElement, ConfigModelContext context) { + private List<ApplicationContainer> createNodesFromContentServiceReference(ApplicationContainerCluster cluster, Element nodesElement, ConfigModelContext context) { // Resolve references to content clusters at the XML level because content clusters must be built after container clusters String referenceId = nodesElement.getAttribute("of"); Element services = servicesRootOf(nodesElement).orElseThrow(() -> clusterReferenceNotFoundException(cluster, referenceId)); @@ -623,7 +623,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { * If there are content clusters this will pick the first host in the first cluster as the container node. * If there are no content clusters this will return empty (such that the node can be created by the container here). */ - private Optional<HostResource> getHostResourceFromContentClusters(ContainerClusterImpl cluster, Element containersElement, ConfigModelContext context) { + private Optional<HostResource> getHostResourceFromContentClusters(ApplicationContainerCluster cluster, Element containersElement, ConfigModelContext context) { Optional<Element> services = servicesRootOf(containersElement); if ( ! services.isPresent()) return Optional.empty(); @@ -655,11 +655,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return servicesRootOf(parentElement); } - private List<ContainerImpl> createNodesFromHosts(DeployLogger deployLogger, Map<HostResource, ClusterMembership> hosts, ContainerClusterImpl cluster) { - List<ContainerImpl> nodes = new ArrayList<>(); + private List<ApplicationContainer> createNodesFromHosts(DeployLogger deployLogger, Map<HostResource, ClusterMembership> hosts, ApplicationContainerCluster cluster) { + List<ApplicationContainer> nodes = new ArrayList<>(); for (Map.Entry<HostResource, ClusterMembership> entry : hosts.entrySet()) { String id = "container." + entry.getValue().index(); - ContainerImpl container = new ContainerImpl(cluster, id, entry.getValue().retired(), entry.getValue().index(), cluster.isHostedVespa()); + ApplicationContainer container = new ApplicationContainer(cluster, id, entry.getValue().retired(), entry.getValue().index(), cluster.isHostedVespa()); container.setHostResource(entry.getKey()); container.initService(deployLogger); nodes.add(container); @@ -667,8 +667,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return nodes; } - private List<ContainerImpl> createNodesFromNodeList(DeployState deployState, ContainerClusterImpl cluster, Element nodesElement) { - List<ContainerImpl> nodes = new ArrayList<>(); + private List<ApplicationContainer> createNodesFromNodeList(DeployState deployState, ApplicationContainerCluster cluster, Element nodesElement) { + List<ApplicationContainer> nodes = new ArrayList<>(); int nodeIndex = 0; for (Element nodeElem: XML.getChildren(nodesElement, "node")) { nodes.add(new ContainerServiceBuilder("container." + nodeIndex, nodeIndex).build(deployState, cluster, nodeElem)); @@ -677,7 +677,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return nodes; } - private IllegalArgumentException clusterReferenceNotFoundException(ContainerClusterImpl cluster, String referenceId) { + private IllegalArgumentException clusterReferenceNotFoundException(ApplicationContainerCluster cluster, String referenceId) { return new IllegalArgumentException(cluster + " references service '" + referenceId + "' but this service is not defined"); } @@ -695,20 +695,20 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return false; } - private void applyNodesTagJvmArgs(List<ContainerImpl> containers, String jvmArgs) { + private void applyNodesTagJvmArgs(List<ApplicationContainer> containers, String jvmArgs) { for (Container container: containers) { if (container.getAssignedJvmOptions().isEmpty()) container.prependJvmOptions(jvmArgs); } } - private void applyDefaultPreload(List<ContainerImpl> containers, Element nodesElement) { + private void applyDefaultPreload(List<ApplicationContainer> containers, Element nodesElement) { if (! nodesElement.hasAttribute(VespaDomBuilder.PRELOAD_ATTRIB_NAME)) return; for (Container container: containers) container.setPreLoad(nodesElement.getAttribute(VespaDomBuilder.PRELOAD_ATTRIB_NAME)); } - private void addSearchHandler(ContainerClusterImpl cluster, Element searchElement) { + private void addSearchHandler(ApplicationContainerCluster cluster, Element searchElement) { ProcessingHandler<SearchChains> searchHandler = new ProcessingHandler<>( cluster.getSearch().getChains(), "com.yahoo.search.handler.SearchHandler"); @@ -720,7 +720,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.addComponent(searchHandler); } - private void addGUIHandler(ContainerClusterImpl cluster) { + private void addGUIHandler(ApplicationContainerCluster cluster) { Handler<?> guiHandler = new GUIHandler(); guiHandler.addServerBindings("http://"+GUIHandler.BINDING, "https://"+GUIHandler.BINDING); cluster.addComponent(guiHandler); @@ -747,7 +747,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return result.toArray(new String[result.size()]); } - private ContainerDocumentApi buildDocumentApi(ContainerClusterImpl cluster, Element spec) { + private ContainerDocumentApi buildDocumentApi(ApplicationContainerCluster cluster, Element spec) { Element documentApiElement = XML.getChild(spec, "document-api"); if (documentApiElement == null) return null; @@ -755,7 +755,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return new ContainerDocumentApi(cluster, documentApiOptions); } - private ContainerDocproc buildDocproc(DeployState deployState, ContainerClusterImpl cluster, Element spec) { + private ContainerDocproc buildDocproc(DeployState deployState, ApplicationContainerCluster cluster, Element spec) { Element docprocElement = XML.getChild(spec, "document-processing"); if (docprocElement == null) return null; @@ -811,7 +811,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addIdentityProvider(ContainerClusterImpl cluster, + private void addIdentityProvider(ApplicationContainerCluster cluster, List<ConfigServerSpec> configServerSpecs, HostName loadBalancerName, URI ztsUrl, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java index 7e5666eda43..fd0797d6098 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerServiceBuilder.java @@ -4,14 +4,13 @@ package com.yahoo.vespa.model.container.xml; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder; -import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainer; import org.w3c.dom.Element; /** * @author Tony Vaagenes */ -public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ContainerImpl> { +public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBuilder<ApplicationContainer> { private final String id; private final int index; @@ -22,8 +21,8 @@ public class ContainerServiceBuilder extends VespaDomBuilder.DomConfigProducerBu } @Override - protected ContainerImpl doBuild(DeployState deployState, AbstractConfigProducer parent, Element nodeElem) { - return new ContainerImpl(parent, id, index, deployState.isHosted()); + protected ApplicationContainer doBuild(DeployState deployState, AbstractConfigProducer parent, Element nodeElem) { + return new ApplicationContainer(parent, id, index, deployState.isHosted()); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java index 2201fea6dd9..74caf2d8026 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java @@ -22,13 +22,12 @@ import com.yahoo.vespa.model.SimpleConfigProducer; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; +import com.yahoo.vespa.model.container.ApplicationContainer; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.docproc.ContainerDocproc; import com.yahoo.vespa.model.container.docproc.DocprocChain; import com.yahoo.vespa.model.container.docproc.DocprocChains; -import com.yahoo.vespa.model.container.xml.ContainerModelBuilder; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.search.AbstractSearchCluster; import com.yahoo.vespa.model.search.IndexedSearchCluster; @@ -56,7 +55,7 @@ public class Content extends ConfigModel { private static final Logger log = Logger.getLogger(Content.class.getName()); private ContentCluster cluster; - private Optional<ContainerClusterImpl> ownedIndexingCluster = Optional.empty(); + private Optional<ApplicationContainerCluster> ownedIndexingCluster = Optional.empty(); private final boolean isHosted; // Dependencies to other models @@ -80,7 +79,7 @@ public class Content extends ConfigModel { * Returns indexing cluster implicitly created by this, * or empty if an explicit cluster is used (or if called before the build phase) */ - public Optional<ContainerClusterImpl> ownedIndexingCluster() { return ownedIndexingCluster; } + public Optional<ApplicationContainerCluster> ownedIndexingCluster() { return ownedIndexingCluster; } public void createTlds(DeployLogger deployLogger, ConfigModelRepo modelRepo) { IndexedSearchCluster indexedCluster = cluster.getSearch().getIndexed(); @@ -308,7 +307,7 @@ public class Content extends ConfigModel { AbstractConfigProducer parent = root.getChildren().get(ContainerModel.DOCPROC_RESERVED_NAME); if (parent == null) parent = new SimpleConfigProducer(root, ContainerModel.DOCPROC_RESERVED_NAME); - ContainerClusterImpl indexingCluster = new ContainerClusterImpl(parent, "cluster." + indexerName, indexerName, modelContext.getDeployState()); + ApplicationContainerCluster indexingCluster = new ApplicationContainerCluster(parent, "cluster." + indexerName, indexerName, modelContext.getDeployState()); ContainerModel indexingClusterModel = new ContainerModel(modelContext.withParent(parent).withId(indexingCluster.getSubId())); indexingClusterModel.setCluster(indexingCluster); modelContext.getConfigModelRepoAdder().add(indexingClusterModel); @@ -317,15 +316,15 @@ public class Content extends ConfigModel { indexingCluster.addDefaultHandlersWithVip(); addDocproc(indexingCluster); - List<ContainerImpl> nodes = new ArrayList<>(); + List<ApplicationContainer> nodes = new ArrayList<>(); int index = 0; Set<HostResource> processedHosts = new LinkedHashSet<>(); for (SearchNode searchNode : cluster.getSearchNodes()) { HostResource host = searchNode.getHostResource(); if (!processedHosts.contains(host)) { String containerName = String.valueOf(searchNode.getDistributionKey()); - ContainerImpl docprocService = new ContainerImpl(indexingCluster, containerName, index, - modelContext.getDeployState().isHosted()); + ApplicationContainer docprocService = new ApplicationContainer(indexingCluster, containerName, index, + modelContext.getDeployState().isHosted()); index++; docprocService.useDynamicPorts(); docprocService.setHostResource(host); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index b48270ca6b5..79675febe2f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -32,9 +32,8 @@ import com.yahoo.vespa.model.builder.xml.dom.ModelElement; import com.yahoo.vespa.model.builder.xml.dom.NodesSpecification; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerModel; -import com.yahoo.vespa.model.container.xml.ContainerModelBuilder; import com.yahoo.vespa.model.content.ClusterControllerConfig; import com.yahoo.vespa.model.content.ContentSearch; import com.yahoo.vespa.model.content.ContentSearchCluster; @@ -372,7 +371,7 @@ public class ContentCluster extends AbstractConfigProducer implements if (containerClusters.isEmpty()) return Collections.emptyList(); List<HostResource> allHosts = new ArrayList<>(); - for (ContainerClusterImpl cluster : clustersSortedByName(containerClusters)) + for (ApplicationContainerCluster cluster : clustersSortedByName(containerClusters)) allHosts.addAll(hostResourcesSortedByIndex(cluster)); // Don't use hosts already selected to be assigned a cluster controllers as part of building this, @@ -387,16 +386,16 @@ public class ContentCluster extends AbstractConfigProducer implements return uniqueHostsWithoutClusterController.subList(0, Math.min(uniqueHostsWithoutClusterController.size(), count)); } - private List<ContainerClusterImpl> clustersSortedByName(Collection<ContainerModel> containerModels) { + private List<ApplicationContainerCluster> clustersSortedByName(Collection<ContainerModel> containerModels) { return containerModels.stream() .map(ContainerModel::getCluster) - .filter(cluster -> cluster instanceof ContainerClusterImpl) - .map(cluster -> (ContainerClusterImpl) cluster) + .filter(cluster -> cluster instanceof ApplicationContainerCluster) + .map(cluster -> (ApplicationContainerCluster) cluster) .sorted(Comparator.comparing(ContainerCluster::getName)) .collect(Collectors.toList()); } - private List<HostResource> hostResourcesSortedByIndex(ContainerClusterImpl cluster) { + private List<HostResource> hostResourcesSortedByIndex(ApplicationContainerCluster cluster) { return cluster.getContainers().stream() .sorted(Comparator.comparing(Container::index)) .map(Container::getHostResource) diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java index 1e6812ee2e3..8fa2d1e5e76 100644 --- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java @@ -3,8 +3,7 @@ package com.yahoo.config.model; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainer; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg; import org.junit.Test; import org.xml.sax.SAXException; @@ -29,7 +28,7 @@ public class QrserverAndGatewayPortAllocationTest { String appDir = "src/test/cfg/application/app_qrserverandgw/"; VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg(appDir); VespaModel vespaModel = creator.create(); - List<ContainerImpl> qrservers = vespaModel.getContainerClusters().get("container").getContainers(); + List<ApplicationContainer> qrservers = vespaModel.getContainerClusters().get("container").getContainers(); assertThat(qrservers.size(), is(1)); assertThat(qrservers.get(0).getSearchPort(), is(Container.BASEPORT)); } diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index 0e9e66a66a7..f395ef680da 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -25,8 +25,8 @@ import com.yahoo.vespa.model.admin.Slobrok; import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster; import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; +import com.yahoo.vespa.model.container.ApplicationContainer; import com.yahoo.vespa.model.content.ContentSearchCluster; import com.yahoo.vespa.model.content.StorageNode; import com.yahoo.vespa.model.content.cluster.ContentCluster; @@ -112,8 +112,8 @@ public class ModelProvisioningTest { + "</hosts>"; VespaModelCreatorWithMockPkg creator = new VespaModelCreatorWithMockPkg(null, services); VespaModel model = creator.create(new DeployState.Builder().modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(new StringReader(hosts)), true))); - ContainerClusterImpl mydisc = model.getContainerClusters().get("mydisc"); - ContainerClusterImpl mydisc2 = model.getContainerClusters().get("mydisc2"); + ApplicationContainerCluster mydisc = model.getContainerClusters().get("mydisc"); + ApplicationContainerCluster mydisc2 = model.getContainerClusters().get("mydisc2"); assertThat(mydisc.getContainers().size(), is(3)); assertThat(mydisc.getContainers().get(0).getConfigId(), is("mydisc/container.0")); assertTrue(mydisc.getContainers().get(0).isInitialized()); @@ -1712,17 +1712,17 @@ public class ModelProvisioningTest { } } - private void checkThatTldAndContainerRunningOnSameHostHaveSameId(Collection<ContainerClusterImpl> containerClusters, + private void checkThatTldAndContainerRunningOnSameHostHaveSameId(Collection<ApplicationContainerCluster> containerClusters, Collection<ContentCluster> contentClusters, int startIndexForContainerIds) { for (ContentCluster contentCluster : contentClusters) { String contentClusterName = contentCluster.getName(); int i = 0; - for (ContainerClusterImpl containerCluster : containerClusters) { + for (ApplicationContainerCluster containerCluster : containerClusters) { String containerClusterName = containerCluster.getName(); for (int j = 0; j < 2; j++) { Dispatch tld = contentCluster.getSearch().getIndexed().getTLDs().get(2 * i + j); - ContainerImpl container = containerCluster.getContainers().get(j); + ApplicationContainer container = containerCluster.getContainers().get(j); int containerConfigIdIndex = j + startIndexForContainerIds; assertEquals(container.getHostName(), tld.getHostname()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java index 95da485c822..2c8887b0247 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java @@ -19,8 +19,7 @@ import com.yahoo.container.jdisc.config.HealthMonitorConfig; import com.yahoo.net.HostName; import com.yahoo.vespa.config.core.StateserverConfig; import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.StatisticsComponent; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg; @@ -218,7 +217,7 @@ public class AdminTestCase { public void testContainerMetricsSnapshotInterval() { VespaModel vespaModel = getVespaModel(TESTDIR + "metricconfig"); - ContainerClusterImpl qrCluster = vespaModel.getContainerClusters().get("container"); + ApplicationContainerCluster qrCluster = vespaModel.getContainerClusters().get("container"); HealthMonitorConfig.Builder builder = new HealthMonitorConfig.Builder(); qrCluster.getConfig(builder); HealthMonitorConfig qrClusterConfig = new HealthMonitorConfig(builder); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index eae7e099c35..ba7fbef439c 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -37,7 +37,7 @@ public class ContainerClusterTest { @Test public void requireThatClusterInfoIsPopulated() { - ContainerClusterImpl cluster = newContainerCluster(); + ApplicationContainerCluster cluster = newContainerCluster(); ClusterInfoConfig config = getClusterInfoConfig(cluster); assertEquals("name", config.clusterId()); assertEquals(2, config.nodeCount()); @@ -61,7 +61,7 @@ public class ContainerClusterTest { .zone(new Zone(SystemName.cd, Environment.test, RegionName.from("some-region"))) .build(); MockRoot root = new MockRoot("foo", state); - ContainerCluster cluster = new ContainerClusterImpl(root, "container0", "container1", state); + ContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state); ConfigserverConfig.Builder builder = new ConfigserverConfig.Builder(); cluster.getConfig(builder); ConfigserverConfig config = new ConfigserverConfig(builder); @@ -70,11 +70,11 @@ public class ContainerClusterTest { assertEquals("cd", config.system()); } - private ContainerClusterImpl createContainerCluster(MockRoot root, boolean isCombinedCluster) { + private ApplicationContainerCluster createContainerCluster(MockRoot root, boolean isCombinedCluster) { return createContainerCluster(root, isCombinedCluster, null); } - private ContainerClusterImpl createContainerCluster(MockRoot root, boolean isCombinedCluster, Integer memoryPercentage) { - ContainerClusterImpl cluster = new ContainerClusterImpl(root, "container0", "container1", root.getDeployState()); + private ApplicationContainerCluster createContainerCluster(MockRoot root, boolean isCombinedCluster, Integer memoryPercentage) { + ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", root.getDeployState()); if (isCombinedCluster) cluster.setHostClusterId("test-content-cluster"); cluster.setMemoryPercentage(memoryPercentage); @@ -127,13 +127,13 @@ public class ContainerClusterTest { private void verifyJvmArgs(boolean isHosted, boolean hasDocProc) { MockRoot root = createRoot(isHosted); - ContainerClusterImpl cluster = createContainerCluster(root, false); + ApplicationContainerCluster cluster = createContainerCluster(root, false); if (hasDocProc) { cluster.setDocproc(new ContainerDocproc(cluster, null)); } addContainer(root.deployLogger(), cluster, "c1", "host-c1"); assertEquals(1, cluster.getContainers().size()); - ContainerImpl container = cluster.getContainers().get(0); + ApplicationContainer container = cluster.getContainers().get(0); verifyJvmArgs(isHosted, hasDocProc, "", container.getJvmOptions()); container.setJvmOptions("initial"); verifyJvmArgs(isHosted, hasDocProc, "initial", container.getJvmOptions()); @@ -189,7 +189,7 @@ public class ContainerClusterTest { @Test public void requireThatWeCanhandleNull() { MockRoot root = createRoot(false); - ContainerClusterImpl cluster = createContainerCluster(root, false); + ApplicationContainerCluster cluster = createContainerCluster(root, false); addContainer(root.deployLogger(), cluster, "c1", "host-c1"); Container container = cluster.getContainers().get(0); container.setJvmOptions(""); @@ -202,7 +202,7 @@ public class ContainerClusterTest { public void requireThatRoutingProviderIsDisabledForNonHosted() { DeployState state = new DeployState.Builder().properties(new TestProperties().setHostedVespa(false)).build(); MockRoot root = new MockRoot("foo", state); - ContainerClusterImpl cluster = new ContainerClusterImpl(root, "container0", "container1", state); + ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "container0", "container1", state); RoutingProviderConfig.Builder builder = new RoutingProviderConfig.Builder(); cluster.getConfig(builder); RoutingProviderConfig config = new RoutingProviderConfig(builder); @@ -211,8 +211,8 @@ public class ContainerClusterTest { } - private static void addContainer(DeployLogger deployLogger, ContainerClusterImpl cluster, String name, String hostName) { - ContainerImpl container = new ContainerImpl(cluster, name, 0, cluster.isHostedVespa()); + private static void addContainer(DeployLogger deployLogger, ApplicationContainerCluster cluster, String name, String hostName) { + ApplicationContainer container = new ApplicationContainer(cluster, name, 0, cluster.isHostedVespa()); container.setHostResource(new HostResource(new Host(null, hostName))); container.initService(deployLogger); cluster.addContainer(container); @@ -225,10 +225,10 @@ public class ContainerClusterTest { cluster.addContainer(container); } - private static ContainerClusterImpl newContainerCluster() { + private static ApplicationContainerCluster newContainerCluster() { DeployState deployState = DeployState.createTestState(); MockRoot root = new MockRoot("foo", deployState); - ContainerClusterImpl cluster = new ContainerClusterImpl(root, "subId", "name", deployState); + ApplicationContainerCluster cluster = new ApplicationContainerCluster(root, "subId", "name", deployState); addContainer(deployState.getDeployLogger(), cluster, "c1", "host-c1"); addContainer(deployState.getDeployLogger(), cluster, "c2", "host-c2"); return cluster; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java index 7d7a664447d..183df4ce471 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java @@ -6,8 +6,7 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.container.core.AccessLogConfig; import com.yahoo.container.logging.JSONAccessLog; import com.yahoo.container.logging.VespaAccessLog; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Component; import org.junit.Test; import org.w3c.dom.Element; @@ -61,11 +60,11 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { } private Component<?, ?> getVespaAccessLog(String clusterName) { - ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get(clusterName); + ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName); return cluster.getComponentsMap().get(ComponentId.fromString((VespaAccessLog.class.getName()))); } private Component<?, ?> getJsonAccessLog(String clusterName) { - ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get(clusterName); + ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get(clusterName); return cluster.getComponentsMap().get(ComponentId.fromString((JSONAccessLog.class.getName()))); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java index 15d49ef8873..1c971307fb3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java @@ -7,16 +7,14 @@ import com.yahoo.config.model.test.MockRoot; import com.yahoo.container.ComponentsConfig; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.search.ContainerSearch; import com.yahoo.vespa.model.search.AbstractSearchCluster; import org.junit.Before; import org.w3c.dom.Element; -import org.xml.sax.SAXException; -import java.io.IOException; import java.util.Collections; /** @@ -70,8 +68,8 @@ public abstract class ContainerModelBuilderTestBase { return null; } - public ContainerClusterImpl getContainerCluster(String clusterId) { - return (ContainerClusterImpl) root.getChildren().get(clusterId); + public ApplicationContainerCluster getContainerCluster(String clusterId) { + return (ApplicationContainerCluster) root.getChildren().get(clusterId); } public Component<?, ?> getContainerComponent(String clusterId, String componentId) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java index 192acbda65d..a3aeeff6ca7 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/DocprocBuilderTest.java @@ -12,10 +12,8 @@ import com.yahoo.container.jdisc.ContainerMbusConfig; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.HostPorts; -import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; +import com.yahoo.vespa.model.container.ApplicationContainer; import com.yahoo.vespa.model.container.ContainerModel; import com.yahoo.vespa.model.container.docproc.DocprocChain; import com.yahoo.vespa.model.container.docproc.DocumentProcessor; @@ -39,7 +37,7 @@ import static org.junit.Assert.*; */ public class DocprocBuilderTest extends DomBuilderTest { - private ContainerClusterImpl cluster; + private ApplicationContainerCluster cluster; private DocumentmanagerConfig documentmanagerConfig; private ContainerMbusConfig containerMbusConfig; private ComponentsConfig componentsConfig; @@ -52,7 +50,7 @@ public class DocprocBuilderTest extends DomBuilderTest { @Before public void setupCluster() { ContainerModel model = new ContainerModelBuilder(false, Networking.disable).build(DeployState.createTestState(), null, null, root, servicesXml()); - cluster = (ContainerClusterImpl) model.getCluster(); + cluster = (ApplicationContainerCluster) model.getCluster(); cluster.getDocproc().getChains().addServersAndClientsForChains(); root.freezeModelTopology(); @@ -90,9 +88,9 @@ public class DocprocBuilderTest extends DomBuilderTest { assertThat(cluster.getDocproc().isCompressDocuments(), is(true)); //assertThat(cluster.getContainerDocproc().isPreferLocalNode(), is(true)); //assertThat(cluster.getContainerDocproc().getNumNodesPerClient(), is(2)); - List<ContainerImpl> services = cluster.getContainers(); + List<ApplicationContainer> services = cluster.getContainers(); assertThat(services.size(), is(1)); - ContainerImpl service = services.get(0); + ApplicationContainer service = services.get(0); assertThat(service, notNullValue()); Map<String, DocprocChain> chains = new HashMap<>(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java index bfed20a22c5..03e115f0608 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java @@ -6,7 +6,7 @@ import com.yahoo.container.ComponentsConfig; import com.yahoo.container.jdisc.FilterBindingsProvider; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.SimpleComponent; import com.yahoo.vespa.model.container.http.ConnectorFactory; import com.yahoo.vespa.model.container.http.JettyHttpServer; @@ -270,7 +270,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas } private ComponentsConfig containerComponentsConfig() { - final ContainerClusterImpl cluster = (ContainerClusterImpl) root.getChildren().get("default"); + final ApplicationContainerCluster cluster = (ApplicationContainerCluster) root.getChildren().get("default"); return root.getConfig( ComponentsConfig.class, cluster.getContainers().get(0).getConfigId()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java index 791369b5312..2e5d2dc914c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java @@ -9,10 +9,8 @@ import com.yahoo.config.model.test.MockRoot; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.model.container.Container; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; -import com.yahoo.vespa.model.container.ContainerImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; +import com.yahoo.vespa.model.container.ApplicationContainer; import org.junit.Test; import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -48,24 +46,24 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase { .build(); //root = new MockRoot("root", applicationPackage); for (String region : Arrays.asList("us-north-1", "us-north-3")) { - ContainerImpl container = getContainer(applicationPackage, region, clusterElem); + ApplicationContainer container = getContainer(applicationPackage, region, clusterElem); assertEquals("Region " + region + " is active", "true", container.getServicePropertyString("activeRotation")); } for (String region : Arrays.asList("us-north-2", "us-north-4")) { - ContainerImpl container = getContainer(applicationPackage, region, clusterElem); + ApplicationContainer container = getContainer(applicationPackage, region, clusterElem); assertEquals("Region " + region + " is inactive", "false", container.getServicePropertyString("activeRotation")); } - ContainerImpl container = getContainer(applicationPackage, "unknown", clusterElem); + ApplicationContainer container = getContainer(applicationPackage, "unknown", clusterElem); assertEquals("Unknown region is inactive", "false", container.getServicePropertyString("activeRotation")); } - private ContainerImpl getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException { + private ApplicationContainer getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException { DeployState deployState = new DeployState.Builder() .applicationPackage(applicationPackage) .zone(new Zone(Environment.prod, RegionName.from(region))) @@ -73,7 +71,7 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase { root = new MockRoot("root", deployState); createModel(root, deployState, null, clusterElem); - ContainerClusterImpl cluster = getContainerCluster("default"); + ApplicationContainerCluster cluster = getContainerCluster("default"); return cluster.getContainers().get(0); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java index 524e98b3f6d..4862c747742 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java @@ -4,20 +4,15 @@ package com.yahoo.vespa.model.container.xml; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.jdisc.JdiscBindingsConfig; -import com.yahoo.searchdefinition.parser.ParseException; import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.search.GUIHandler; import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; import org.junit.Test; import org.w3c.dom.Element; -import org.xml.sax.SAXException; - -import java.io.IOException; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; import static com.yahoo.test.Matchers.hasItemWithMethod; @@ -48,7 +43,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString(); assertThat(discBindingsConfig, containsString(GUIHandler.BINDING)); - ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default"); + ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default"); GUIHandler guiHandler = null; for (Handler<?> handler : cluster.getHandlers()) { @@ -100,7 +95,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase { @Test public void cluster_with_only_search_gets_qrserver_as_service_name() throws Exception { createClusterWithOnlyDefaultChains(); - ContainerClusterImpl cluster = (ContainerClusterImpl)root.getChildren().get("default"); + ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default"); assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName)); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index 97540f09b41..bf8e2a353cf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -9,8 +9,7 @@ import com.yahoo.messagebus.routing.RoutingTableSpec; import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.vespa.config.search.core.ProtonConfig; import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.content.cluster.ContentCluster; import com.yahoo.vespa.model.routing.DocumentProtocol; import com.yahoo.vespa.model.routing.Routing; @@ -278,7 +277,7 @@ public class IndexedTest extends ContentBaseTest { @Test public void requireThatIndexingDocprocGetsConfigIdBasedOnDistributionKey() { VespaModel model = getIndexedVespaModel(); - ContainerClusterImpl cluster = model.getContainerClusters().get("jdisc"); + ApplicationContainerCluster cluster = model.getContainerClusters().get("jdisc"); assertEquals("jdisc/container.0", cluster.getContainers().get(0).getConfigId()); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java index c0ba932534f..216f90240f7 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/ModelEvaluationTest.java @@ -17,8 +17,7 @@ import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.container.ContainerCluster; -import com.yahoo.vespa.model.container.ContainerClusterImpl; +import com.yahoo.vespa.model.container.ApplicationContainerCluster; import org.junit.Test; import java.io.IOException; @@ -44,7 +43,7 @@ public class ModelEvaluationTest { try { ImportedModelTester tester = new ImportedModelTester("ml_serving", appDir); VespaModel model = tester.createVespaModel(); - ContainerClusterImpl cluster = model.getContainerClusters().get("container"); + ApplicationContainerCluster cluster = model.getContainerClusters().get("container"); assertNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluator.class.getName()))); RankProfilesConfig.Builder b = new RankProfilesConfig.Builder(); @@ -81,7 +80,7 @@ public class ModelEvaluationTest { } private void assertHasMlModels(VespaModel model) { - ContainerClusterImpl cluster = model.getContainerClusters().get("container"); + ApplicationContainerCluster cluster = model.getContainerClusters().get("container"); assertNotNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluator.class.getName()))); assertNotNull(cluster.getComponentsMap().get(new ComponentId(ModelsEvaluationHandler.class.getName()))); |