diff options
author | Håkon Hallingstad <hakon@oath.com> | 2019-01-25 11:28:11 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2019-01-25 11:28:11 +0100 |
commit | 38449fd3d36f8a207fcae3c12f29068a799d2413 (patch) | |
tree | 7ac13d8e6f7ce24e45613340d4aa99ea2fff36d9 /standalone-container | |
parent | 8dbc9098a8f27c0987bee404a4fe24da8bf1bac1 (diff) |
Make ModelContext.Properties more accessible in config model
This commit makes it easier to get the ModelContext.Properties instance in the
config model. Before, one would typically have to change a bunch of code to
wire through a new property (builder methods and fields, DeployProperties
constructor, fields, and getters, mock classes, ...).
It is made accessible through:
- ModelContext.properties(),
- DeployState.getProperties(), and
- ConfigModelContext.properties()
The Properties implementation is in the configserver module, making it easy to
back properties with flags.
Diffstat (limited to 'standalone-container')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java index f9fe4a02aab..a2e1e36e48f 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerApplication.java @@ -242,7 +242,7 @@ public class StandaloneContainerApplication implements Application { VespaModel root = VespaModel.createIncomplete(deployState); ApplicationConfigProducerRoot vespaRoot = new ApplicationConfigProducerRoot(root, "vespa", deployState.getDocumentModel(), - deployState.getProperties().vespaVersion(), deployState.getProperties().applicationId()); + deployState.getVespaVersion(), deployState.getProperties().applicationId()); Element spec = containerRootElement(applicationPackage); ContainerModel containerModel = newContainerModelBuilder(networkingOption).build(deployState, root, configModelRepo, vespaRoot, spec); |