diff options
4 files changed, 8 insertions, 8 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 998ca6cb53c..e45f0003a62 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 @@ -28,6 +28,7 @@ public interface Model { * @param targetDef The config definition to use for applying defaults. * @return override The global override to apply to the generated config. */ + // TODO: Remove 'throws IOException' when 6.67 is deployed everywhere ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) throws IOException; /** 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 bdba3549033..5bb5a70103e 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 @@ -314,7 +314,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } /** TODO: Remove once configserver has switched to using {@link VespaModel#getConfig(ConfigKey, ConfigDefinition, ConfigPayload)} instead. **/ - public ConfigPayload getConfig(ConfigKey configKey, InnerCNode targetDef, ConfigPayload userOverride) throws IOException { + public ConfigPayload getConfig(ConfigKey configKey, InnerCNode targetDef, ConfigPayload userOverride) { return getConfig(configKey, targetDef == null ? null : new ConfigDefinition(targetDef), userOverride); } @@ -327,7 +327,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri * @return The payload as a list of strings */ @Override - public ConfigPayload getConfig(ConfigKey configKey, com.yahoo.vespa.config.buildergen.ConfigDefinition targetDef, ConfigPayload userOverride) throws IOException { + public ConfigPayload getConfig(ConfigKey configKey, com.yahoo.vespa.config.buildergen.ConfigDefinition targetDef, ConfigPayload userOverride) { ConfigBuilder builder = InstanceResolver.resolveToBuilder(configKey, this, targetDef); if (builder != null) { log.log(LogLevel.DEBUG, () -> "Found builder for " + configKey); @@ -360,7 +360,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } } - private ConfigPayload getConfigFromGenericBuilder(ConfigBuilder builder) throws IOException { + private ConfigPayload getConfigFromGenericBuilder(ConfigBuilder builder) { return ((GenericConfig.GenericConfigBuilder) builder).getPayload(); } 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 2615622fce0..ed9ced7b49b 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 @@ -10,7 +10,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.buildergen.ConfigDefinition; -import java.io.IOException; import java.util.Collection; import java.util.Optional; import java.util.Set; @@ -21,12 +20,12 @@ import java.util.Set; public class ModelStub implements Model { @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) throws IOException { + public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) { return null; } @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, InnerCNode targetDef, ConfigPayload override) throws IOException { + public ConfigPayload getConfig(ConfigKey<?> configKey, InnerCNode targetDef, ConfigPayload override) { return null; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java index 2144767be40..3a634a57985 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java @@ -118,7 +118,7 @@ public class ApplicationConvergenceCheckerTest { } @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) throws IOException { + public ConfigPayload getConfig(ConfigKey<?> configKey, ConfigDefinition targetDef, ConfigPayload override) { if (configKey.equals(new ConfigKey<>(ModelConfig.class, ""))) { return createModelConfig(); } @@ -126,7 +126,7 @@ public class ApplicationConvergenceCheckerTest { } @Override - public ConfigPayload getConfig(ConfigKey<?> configKey, InnerCNode targetDef, ConfigPayload override) throws IOException { + public ConfigPayload getConfig(ConfigKey<?> configKey, InnerCNode targetDef, ConfigPayload override) { return getConfig(configKey, (ConfigDefinition)null, override); } |