diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-01-14 10:47:33 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-01-14 10:47:33 +0100 |
commit | f0dda9a306ecb000be56512732c620f5d7c5b3f1 (patch) | |
tree | 07535a5a90c63a3faa91471ad4cb5c2b25b2a9d1 /configserver/src | |
parent | d062b10856a61208627f039e7b37f4caeabd42bc (diff) |
More cleanup
Diffstat (limited to 'configserver/src')
5 files changed, 1 insertions, 30 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java index e77592dc011..57eac2a1a7b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java @@ -135,12 +135,7 @@ public class Application implements ModelResult { boolean applyOnRestart = false; try { builder = model.getConfigInstance(configKey, def); - if (builder == null) { // TODO: Remove this condition after December 2020 - payload = model.getConfig(configKey, def); - if (def.getCNode() != null) - payload.applyDefaultsFromDef(def.getCNode()); - } - else if (builder instanceof GenericConfig.GenericConfigBuilder) { + if (builder instanceof GenericConfig.GenericConfigBuilder) { payload = ((GenericConfig.GenericConfigBuilder) builder).getPayload(); applyOnRestart = builder.getApplyOnRestart(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java index 88f7d352ad7..ed12f4dbbe1 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java @@ -21,12 +21,6 @@ import java.util.Set; public class ModelStub implements Model { @Override - @SuppressWarnings("deprecation") - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef) { - return null; - } - - @Override public ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition targetDef) { throw new UnsupportedOperationException(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java index 0288a551cd3..7e57eea74d6 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java @@ -74,12 +74,6 @@ public class MockModel implements Model { } @Override - @SuppressWarnings("deprecation") - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef) { - throw new UnsupportedOperationException(); - } - - @Override public ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition targetDef) { throw new UnsupportedOperationException(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java index b5cdfa8eda2..865d3b71b6e 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java @@ -84,12 +84,6 @@ public class DeploymentMetricsRetrieverTest { } @Override - @SuppressWarnings("deprecation") - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef) { - throw new UnsupportedOperationException(); - } - - @Override public ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition targetDef) { throw new UnsupportedOperationException(); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java index 7fab01faf3d..5aada44b573 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java @@ -77,12 +77,6 @@ public class ProtonMetricsRetrieverTest { } @Override - @SuppressWarnings("deprecation") - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef) { - throw new UnsupportedOperationException(); - } - - @Override public ConfigInstance.Builder getConfigInstance(ConfigKey<?> configKey, ConfigDefinition targetDef) { throw new UnsupportedOperationException(); } |