diff options
5 files changed, 2 insertions, 42 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java index 2b75343e505..56b7f6f9176 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/Model.java @@ -20,23 +20,12 @@ import java.util.Collection; public interface Model { /** - * Resolves a config using a given def file, apply overrides and returns it. - * - * @param configKey The key of the config to retrieve. - * @param targetDef The config definition to use for applying defaults. - * @return override The global override to apply to the generated config. - */ - // TODO: Remove when 6.76 is deployed everywhere - ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override); - - - /** * Resolves config for a given key and config definition * * @param configKey The key to resolve - * @param targetDef The config definition to use for the schema + * @param configDefinition The config definition to use for the schema */ - ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef); + ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition configDefinition); /** * Produces a set of the valid config keys for this model. diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 266a3524f9b..8ad609775f2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -312,18 +312,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } /** - * Resolve config for a given key and a def. Apply an override if given. - * - * @param configKey The key to resolve. - * @param targetDef The def file to use for the schema. - * @return The payload as a list of strings - */ - @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, com.yahoo.vespa.config.buildergen.ConfigDefinition targetDef, ConfigPayload override) { - throw new UnsupportedOperationException(); - } - - /** * Resolve config for a given key and config definition * * @param configKey The key to resolve. 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 ff143daca21..6d84209bc41 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 @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.application; -import com.yahoo.config.ConfigInstance; import com.yahoo.config.ConfigurationRuntimeException; import com.yahoo.config.model.api.Model; import com.yahoo.config.provision.ApplicationId; @@ -176,12 +175,6 @@ public class Application implements ModelResult { return resolveConfig(req, new UncompressedConfigResponseFactory()); } - public <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> configClass, String configId) { - ConfigKey<CONFIGTYPE> key = new ConfigKey<>(configClass, configId); - ConfigPayload payload = model.getConfig(key, null); - return payload.toInstance(configClass, configId); - } - /** * Wrapper class for holding config definition key and def, since when looking up * we may end up changing the config definition key (fallback mechanism when using 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 3347bf28af3..7a20784bea1 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 @@ -24,11 +24,6 @@ public class ModelStub implements Model { } @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) { - return null; - } - - @Override public Set<ConfigKey<?>> allConfigsProduced() { return null; } 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 f50bc95442e..92bffeaa84a 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 @@ -73,11 +73,6 @@ class MockModel implements Model { } @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) { - throw new UnsupportedOperationException(); - } - - @Override public Set<ConfigKey<?>> allConfigsProduced() { throw new UnsupportedOperationException(); } |