diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-03 22:45:09 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-03 22:45:09 +0200 |
commit | 6520467f1afb87f0f97f87048a17ac1d4c5795da (patch) | |
tree | f574923eaa01a270cce4c4b046aa8ad001b3eda6 /config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java | |
parent | 488a0b5e5c69999b15fb47b14ed534cce2276d70 (diff) |
Further reduce complicated and magic use of getDeployState callback
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java index 7a5969585e9..da79e34b3ad 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java +++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java @@ -2,6 +2,7 @@ package com.yahoo.config.model; import com.yahoo.cloud.config.*; +import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Version; import com.yahoo.vespa.config.content.LoadTypeConfig; @@ -125,11 +126,11 @@ public class ApplicationConfigProducerRoot extends AbstractConfigProducer<Abstra } // TODO: Do this as another config model depending on the other models - public void setupRouting(VespaModel vespaModel, ConfigModelRepo configModels) { + public void setupRouting(DeployState deployState, VespaModel vespaModel, ConfigModelRepo configModels) { if (admin != null) { Routing routing = configModels.getRouting(); if (routing == null) { - routing = new Routing(ConfigModelContext.create(vespaModel, configModels, this, "routing")); + routing = new Routing(ConfigModelContext.create(deployState, vespaModel, configModels, this, "routing")); configModels.add(routing); } this.routing = routing; |