Remove unused argument

6 files changed, 12 insertions, 21 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
index 23baac3d02e..73ee23e5c03 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.codegen.DefParser;
-import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
@@ -47,22 +46,21 @@ public class SuperModelController {
      */
     public ConfigResponse resolveConfig(GetConfigRequest request) {
         ConfigKey<?> configKey = request.getConfigKey();
-        InnerCNode targetDef = getConfigDefinition(request.getConfigKey(), request.getDefContent());
+        validateConfigDefinition(request.getConfigKey(), request.getDefContent());
         ConfigPayload payload = model.getConfig(configKey);
-        return responseFactory.createResponse(payload, targetDef, generation, false);
+        return responseFactory.createResponse(payload, generation, false);
     }
 
-    private InnerCNode getConfigDefinition(ConfigKey<?> configKey, DefContent defContent) {
+    private void validateConfigDefinition(ConfigKey<?> configKey, DefContent defContent) {
         if (defContent.isEmpty()) {
             ConfigDefinitionKey configDefinitionKey = new ConfigDefinitionKey(configKey.getName(), configKey.getNamespace());
             ConfigDefinition configDefinition = configDefinitionRepo.getConfigDefinitions().get(configDefinitionKey);
             if (configDefinition == null) {
                 throw new UnknownConfigDefinitionException("Unable to find config definition for '" + configKey.getNamespace() + "." + configKey.getName());
             }
-            return configDefinition.getCNode();
         } else {
             DefParser dParser = new DefParser(configKey.getName(), new StringReader(defContent.asString()));
-            return dParser.getTree();
+            dParser.getTree();
         }
     }
 
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 2560badbf43..51213b173dd 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
@@ -134,7 +134,7 @@ public class Application implements ModelResult {
             throw new ConfigurationRuntimeException("Unable to resolve config " + configKey);
         }
 
-        ConfigResponse configResponse = responseFactory.createResponse(payload, def.getCNode(), appGeneration, internalRedeploy);
+        ConfigResponse configResponse = responseFactory.createResponse(payload, appGeneration, internalRedeploy);
         metricUpdater.incrementProcTime(System.currentTimeMillis() - start);
         if (useCache(req)) {
             cache.put(cacheKey, configResponse, configResponse.getConfigMd5());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
index 54825167d15..88aa41ca735 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactory.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.config.server.rpc;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
-import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.protocol.ConfigResponse;
 
@@ -26,14 +25,12 @@ public interface ConfigResponseFactory {
     }
 
     /**
-     * Create a {@link ConfigResponse} for a given payload and generation.
-     *
-     * @param payload The {@link com.yahoo.vespa.config.ConfigPayload} to put in the response.
-     * @param defFile The {@link com.yahoo.config.codegen.InnerCNode} def file for this config.
-     * @param generation The payload generation.  @return A {@link ConfigResponse} that can be sent to the client.
+     * Creates a {@link ConfigResponse} for a given payload and generation.
+     * @param payload          the {@link ConfigPayload} to put in the response.
+     * @param generation       the payload generation.  @return A {@link ConfigResponse} that can be sent to the client.
      * @param internalRedeploy whether this config generation was produced by an internal redeployment,
      *                         not a change to the application package
      */
-    ConfigResponse createResponse(ConfigPayload payload, InnerCNode defFile, long generation, boolean internalRedeploy);
+    ConfigResponse createResponse(ConfigPayload payload, long generation, boolean internalRedeploy);
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/LZ4ConfigResponseFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/LZ4ConfigResponseFactory.java
index 5235a2bcadd..cba1316a131 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/LZ4ConfigResponseFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/LZ4ConfigResponseFactory.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.rpc;
 
-import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.LZ4PayloadCompressor;
@@ -18,11 +17,10 @@ import com.yahoo.vespa.config.util.ConfigUtils;
  */
 public class LZ4ConfigResponseFactory implements ConfigResponseFactory {
 
-    private static LZ4PayloadCompressor compressor = new LZ4PayloadCompressor();
+    private static final LZ4PayloadCompressor compressor = new LZ4PayloadCompressor();
 
     @Override
     public ConfigResponse createResponse(ConfigPayload payload,
-                                         InnerCNode defFile,
                                          long generation,
                                          boolean internalRedeploy) {
         Utf8Array rawPayload = payload.toUtf8Array(true);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/UncompressedConfigResponseFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/UncompressedConfigResponseFactory.java
index bd0b117c3db..2de88ab44cc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/UncompressedConfigResponseFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/UncompressedConfigResponseFactory.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.rpc;
 
-import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.protocol.CompressionInfo;
@@ -19,7 +18,6 @@ public class UncompressedConfigResponseFactory implements ConfigResponseFactory
 
     @Override
     public ConfigResponse createResponse(ConfigPayload payload,
-                                         InnerCNode defFile,
                                          long generation,
                                          boolean internalRedeploy) {
         Utf8Array rawPayload = payload.toUtf8Array(true);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
index 2eccf6b5643..6fa4a421d5a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/ConfigResponseFactoryTest.java
@@ -32,7 +32,7 @@ public class ConfigResponseFactoryTest {
     @Test
     public void testUncompressedFactory() {
         UncompressedConfigResponseFactory responseFactory = new UncompressedConfigResponseFactory();
-        ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), def, 3, false);
+        ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), 3, false);
         assertEquals(CompressionType.UNCOMPRESSED, response.getCompressionInfo().getCompressionType());
         assertEquals(3L,response.getGeneration());
         assertEquals(2, response.getPayload().getByteLength());
@@ -41,7 +41,7 @@ public class ConfigResponseFactoryTest {
     @Test
     public void testLZ4CompressedFactory() {
         LZ4ConfigResponseFactory responseFactory = new LZ4ConfigResponseFactory();
-        ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), def, 3, false);
+        ConfigResponse response = responseFactory.createResponse(ConfigPayload.empty(), 3, false);
         assertEquals(CompressionType.LZ4, response.getCompressionInfo().getCompressionType());
         assertEquals(3L, response.getGeneration());
         assertEquals(3, response.getPayload().getByteLength());