From 6520467f1afb87f0f97f87048a17ac1d4c5795da Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 3 Oct 2018 22:45:09 +0200 Subject: Further reduce complicated and magic use of getDeployState callback --- .../src/main/java/com/yahoo/config/model/admin/AdminModel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/config/model/admin') diff --git a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java index 8fff69e11a6..113262d0734 100644 --- a/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/admin/AdminModel.java @@ -9,6 +9,7 @@ import com.yahoo.config.model.ApplicationConfigProducerRoot; import com.yahoo.config.model.deploy.DeployProperties; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.builder.xml.ConfigModelId; +import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.vespa.model.admin.Admin; import com.yahoo.vespa.model.builder.xml.dom.DomAdminV2Builder; @@ -44,12 +45,12 @@ public class AdminModel extends ConfigModel { private Collection getContainerModels() { return containerModels; } @Override - public void prepare(ConfigModelRepo configModelRepo) { + public void prepare(ConfigModelRepo configModelRepo, DeployState deployState) { verifyClusterControllersOnlyDefinedForContent(configModelRepo); if (admin == null) return; if (admin.getClusterControllers() != null) - admin.getClusterControllers().prepare(); - admin.getLogServerContainerCluster().ifPresent(ContainerCluster::prepare); + admin.getClusterControllers().prepare(deployState); + admin.getLogServerContainerCluster().ifPresent((ContainerCluster cc) -> cc.prepare(deployState)); } private void verifyClusterControllersOnlyDefinedForContent(ConfigModelRepo configModelRepo) { -- cgit v1.2.3