Remove unused functionality

2 files changed, 2 insertions, 32 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
index 8858d368edf..59cb7b63114 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server;
 
 import com.yahoo.vespa.config.ConfigCacheKey;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
-import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import com.yahoo.vespa.config.protocol.ConfigResponse;
 
@@ -19,8 +18,6 @@ import java.util.concurrent.ConcurrentHashMap;
 public class ServerCache {
 
     private final Map<ConfigDefinitionKey, ConfigDefinition> defs = new ConcurrentHashMap<>();
-    /* Legacy user configs from configs/ dir in application package (NB! Only name, not key) */
-    private final Map<String, ConfigPayload> legacyUserCfgs = new ConcurrentHashMap<>();
 
     // NOTE: The reason we do a double mapping here is to dedup configs that have the same md5.
     private final Map<ConfigCacheKey, String> md5Sums = new ConcurrentHashMap<>();
@@ -30,14 +27,6 @@ public class ServerCache {
         defs.put(key, def);
     }
 
-    public void addLegacyUserConfig(String name, ConfigPayload config) {
-        legacyUserCfgs.put(name, config);
-    }
-
-    public ConfigPayload getLegacyUserConfig(String name) {
-        return legacyUserCfgs.get(name);
-    }
-
     public void put(ConfigCacheKey key, ConfigResponse config, String configMd5) {
         md5Sums.put(key, configMd5);
         md5ToConfig.put(configMd5, config);
@@ -54,7 +43,6 @@ public class ServerCache {
         StringBuilder sb = new StringBuilder();
         sb.append("Cache\n");
         sb.append("defs:        ").append(defs.size()).append("\n");
-        sb.append("user cfgs:   ").append(legacyUserCfgs.size()).append("\n");
         sb.append("md5sums:     ").append(md5Sums.size()).append("\n");
         sb.append("md5ToConfig: ").append(md5ToConfig.size()).append("\n");
 
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 ba96deca187..11952328e8f 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
@@ -92,23 +92,6 @@ public class Application implements ModelResult {
     }
 
     /**
-     * The old style (deprecated) configs/ user overrides for this key
-     *
-     * @param key the key for the config to get user config for
-     * @return the user config value or null
-     */
-    private ConfigPayload getLegacyUserConfigs(ConfigCacheKey key) {
-        try {
-            if (logDebug()) {
-                debug("Looking up legacy user config for " + key);
-            }
-            return cache.getLegacyUserConfig(key.getKey().getName());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
      * Gets a config from ZK. Returns null if not found.
      */
     public ConfigResponse resolveConfig(GetConfigRequest req, ConfigResponseFactory responseFactory) {
@@ -143,17 +126,16 @@ public class Application implements ModelResult {
             throw new UnknownConfigDefinitionException("Unable to find config definition for '" + configKey.getNamespace() + "." + configKey.getName());
         }
         configKey = new ConfigKey<>(configDefinitionWrapper.getDefKey().getName(), configKey.getConfigId(), configDefinitionWrapper.getDefKey().getNamespace());
-        ConfigPayload override = getLegacyUserConfigs(cacheKey);
         ConfigPayload payload;
         try {
             if (logDebug()) {
-                debug("Resolving " + configKey + " with targetDef=" + def + ", override=" + override);
+                debug("Resolving " + configKey + " with targetDef=" + def);
             }
 
             payload = model.getConfig(
                     configKey,
                     def,
-                    override);
+                    null); // TODO Remove this argument when possible
         } catch (IOException e) {
             metricUpdater.incrementFailedRequests();
             throw new ConfigurationRuntimeException("Unable to resolve config", e);