diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2018-01-17 13:51:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-17 13:51:14 +0100 |
commit | fd26b36e3607df463b35e856b37d24b5e3514fb7 (patch) | |
tree | 403836969d050736403f6512a455198a2c63edad /config-model/src/main/java/com/yahoo/config/model | |
parent | ceec6d572c06ff812715c97d2c35383c48402f24 (diff) | |
parent | c84b8f952ef5857aa44fad479551eda1f3a4e106 (diff) |
Merge pull request #4692 from vespa-engine/bratseth/store-converted-expressions-in-zk
Bratseth/store converted expressions in zk
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model')
3 files changed, 10 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java index 5daf5ca70a5..385cd883da4 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModel.java @@ -8,7 +8,7 @@ package com.yahoo.config.model; * * @author gjoranv * @author bratseth - * @author lulf + * @author Ulf Lilleengen */ public abstract class ConfigModel { 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 5eb4afcc241..5912b476783 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 @@ -21,8 +21,7 @@ import java.util.*; /** * Config model adaptor of the Admin class. * - * @author lulf - * @since 5.1 + * @author Ulf Lilleengen */ public class AdminModel extends ConfigModel { @@ -46,8 +45,9 @@ public class AdminModel extends ConfigModel { @Override public void prepare(ConfigModelRepo configModelRepo) { verifyClusterControllersOnlyDefinedForContent(configModelRepo); - if (admin == null || admin.getClusterControllers() == null) return; - admin.getClusterControllers().prepare(); + if (admin == null) return; + if (admin.getClusterControllers() != null) + admin.getClusterControllers().prepare(); } private void verifyClusterControllersOnlyDefinedForContent(ConfigModelRepo configModelRepo) { @@ -61,9 +61,9 @@ public class AdminModel extends ConfigModel { public static class BuilderV2 extends ConfigModelBuilder<AdminModel> { public static final List<ConfigModelId> configModelIds = - ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "2.0"), + ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "2.0"), ConfigModelId.fromNameAndVersion("admin", "1.0")); - + public BuilderV2() { super(AdminModel.class); } @@ -91,7 +91,7 @@ public class AdminModel extends ConfigModel { public static class BuilderV4 extends ConfigModelBuilder<AdminModel> { public static final List<ConfigModelId> configModelIds = - ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "3.0"), + ImmutableList.of(ConfigModelId.fromNameAndVersion("admin", "3.0"), ConfigModelId.fromNameAndVersion("admin", "4.0")); public BuilderV4() { diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java index ddee0be6e9c..271ec6958ec 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java @@ -37,8 +37,8 @@ public class MockApplicationPackage implements ApplicationPackage { private final Optional<String> validationOverrides; private final boolean failOnValidateXml; - private MockApplicationPackage(String hosts, String services, List<String> searchDefinitions, String searchDefinitionDir, - String deploymentSpec, String validationOverrides, boolean failOnValidateXml) { + protected MockApplicationPackage(String hosts, String services, List<String> searchDefinitions, String searchDefinitionDir, + String deploymentSpec, String validationOverrides, boolean failOnValidateXml) { this.hostsS = hosts; this.servicesS = services; this.searchDefinitions = searchDefinitions; |