Merge pull request #1864 from yahoo/hmusum/stop-using-3-args-getConfig

Stop using 3-arg getConfig method (will be removed)

2 files changed, 6 insertions, 7 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 e71fd3f31fc..ff143daca21 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
@@ -24,7 +24,6 @@ import com.yahoo.vespa.config.server.modelfactory.ModelResult;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.util.ConfigUtils;
 
-import java.io.IOException;
 import java.util.Objects;
 import java.util.Set;
 
@@ -126,7 +125,7 @@ public class Application implements ModelResult {
         if (logDebug()) {
             debug("Resolving " + configKey + " with targetDef=" + def);
         }
-        ConfigPayload payload = model.getConfig(configKey,def,null); // TODO Remove last argument when possible
+        ConfigPayload payload = model.getConfig(configKey, def);
         if (payload == null) {
             metricUpdater.incrementFailedRequests();
             throw new ConfigurationRuntimeException("Unable to resolve config " + configKey);
@@ -179,7 +178,7 @@ public class Application implements ModelResult {
 
     public <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> configClass, String configId) {
         ConfigKey<CONFIGTYPE> key = new ConfigKey<>(configClass, configId);
-        ConfigPayload payload = model.getConfig(key, (ConfigDefinition)null, null);
+        ConfigPayload payload = model.getConfig(key, null);
         return payload.toInstance(configClass, configId);
     }
 
@@ -188,6 +187,7 @@ public class Application implements ModelResult {
      * we may end up changing the config definition key (fallback mechanism when using
      * legacy config namespace (or not using config namespace))
      */
+    // TODO: Remove, no legacy config namespace anymore and namespace is required
     private static class ConfigDefinitionWrapper {
 
         private final ConfigDefinitionKey defKey;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
index 51e574aef5d..b30d1bce27e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java
@@ -5,7 +5,6 @@ import com.yahoo.cloud.config.LbServicesConfig;
 import com.yahoo.cloud.config.RoutingConfig;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
@@ -13,7 +12,6 @@ import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.server.application.Application;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
@@ -63,7 +61,8 @@ public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Prod
     }
     
     public <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> configClass, 
-                                                                    ApplicationId applicationId, String configId) throws IOException {
+                                                                    ApplicationId applicationId,
+                                                                    String configId) {
         TenantName tenant = applicationId.tenant();
         if (!models.containsKey(tenant)) {
             throw new IllegalArgumentException("Tenant " + tenant + " not found");
@@ -74,7 +73,7 @@ public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Prod
         }
         Application application = applications.get(applicationId);
         ConfigKey<CONFIGTYPE> key = new ConfigKey<>(configClass, configId);
-        ConfigPayload payload = application.getModel().getConfig(key, (ConfigDefinition)null, null);
+        ConfigPayload payload = application.getModel().getConfig(key, null);
         return payload.toInstance(configClass, configId);
     }