Remove method for getting legacy payload (only used in tests)

4 files changed, 16 insertions, 49 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
index c07be8337fe..bb0ee2bb935 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/ConfigResponse.java
@@ -5,7 +5,6 @@ import com.yahoo.text.Utf8Array;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.List;
 
 /**
  * A config response encapsulates the payload and some meta information. This makes it possible to
@@ -19,8 +18,6 @@ public interface ConfigResponse {
 
     Utf8Array getPayload();
 
-    List<String> getLegacyPayload();
-
     long getGeneration();
 
     boolean isInternalRedeploy();
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeConfigResponse.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeConfigResponse.java
index 327acab53d3..ff0b7f964bf 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeConfigResponse.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeConfigResponse.java
@@ -1,17 +1,11 @@
 // 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.protocol;
 
-import com.yahoo.config.codegen.InnerCNode;
 import com.yahoo.text.Utf8Array;
-import com.yahoo.vespa.config.ConfigFileFormat;
 import com.yahoo.vespa.config.ConfigPayload;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * Class for serializing config responses based on {@link com.yahoo.slime.Slime} implementing the {@link ConfigResponse} interface.
@@ -22,27 +16,24 @@ public class SlimeConfigResponse implements ConfigResponse {
 
     private final Utf8Array payload;
     private final CompressionInfo compressionInfo;
-    private final InnerCNode targetDef;
     private final long generation;
     private final boolean internalRedeploy;
     private final String configMd5;
 
-    public static SlimeConfigResponse fromConfigPayload(ConfigPayload payload, InnerCNode targetDef, long generation,
+    public static SlimeConfigResponse fromConfigPayload(ConfigPayload payload, long generation,
                                                         boolean internalRedeploy, String configMd5) {
         Utf8Array data = payload.toUtf8Array(true);
-        return new SlimeConfigResponse(data, targetDef, generation, internalRedeploy,
+        return new SlimeConfigResponse(data, generation, internalRedeploy,
                                        configMd5,
                                        CompressionInfo.create(CompressionType.UNCOMPRESSED, data.getByteLength()));
     }
 
     public SlimeConfigResponse(Utf8Array payload,
-                               InnerCNode targetDef,
                                long generation,
                                boolean internalRedeploy,
                                String configMd5,
                                CompressionInfo compressionInfo) {
         this.payload = payload;
-        this.targetDef = targetDef;
         this.generation = generation;
         this.internalRedeploy = internalRedeploy;
         this.configMd5 = configMd5;
@@ -55,19 +46,6 @@ public class SlimeConfigResponse implements ConfigResponse {
     }
 
     @Override
-    public List<String> getLegacyPayload() {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ConfigFileFormat format = new ConfigFileFormat(targetDef);
-        Payload v1payload = Payload.from(payload, compressionInfo).withCompression(CompressionType.UNCOMPRESSED);
-        try {
-            ConfigPayload.fromUtf8Array(v1payload.getData()).serialize(baos, format);
-            return Arrays.asList(baos.toString(StandardCharsets.UTF_8).split("\\n"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
     public long getGeneration() {
         return generation;
     }
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
index 91adc544d88..a56c7ef2daa 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
@@ -2,9 +2,6 @@
 package com.yahoo.vespa.config.protocol;
 
 import com.yahoo.foo.SimpletypesConfig;
-import com.yahoo.config.codegen.DefParser;
-import com.yahoo.config.codegen.InnerCNode;
-import com.yahoo.text.StringUtilities;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.LZ4PayloadCompressor;
@@ -12,10 +9,10 @@ import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.StringReader;
-import java.util.List;
+import java.nio.charset.StandardCharsets;
 
 import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
@@ -27,17 +24,16 @@ public class ConfigResponseTest {
     @Test
     public void require_that_slime_response_is_initialized() throws IOException {
         ConfigPayload configPayload = ConfigPayload.fromInstance(new SimpletypesConfig(new SimpletypesConfig.Builder()));
-        DefParser dParser = new DefParser(SimpletypesConfig.getDefName(), new StringReader(StringUtilities.implode(SimpletypesConfig.CONFIG_DEF_SCHEMA, "\n")));
-        InnerCNode targetDef = dParser.getTree();
-        ConfigResponse response = SlimeConfigResponse.fromConfigPayload(configPayload, targetDef, 3, false, "mymd5");
-        List<String> payload = response.getLegacyPayload();
+        ConfigResponse response = SlimeConfigResponse.fromConfigPayload(configPayload, 3, false, "mymd5");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        response.serialize(baos, CompressionType.UNCOMPRESSED);
+        String payload = baos.toString(StandardCharsets.UTF_8);
         assertNotNull(payload);
-        assertThat(payload.size(), is(6));
-        assertThat(payload.get(0), is("boolval false"));
+        assertEquals("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}", payload);
         assertThat(response.getGeneration(), is(3L));
         assertThat(response.getConfigMd5(), is("mymd5"));
 
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        baos = new ByteArrayOutputStream();
         response.serialize(baos, CompressionType.UNCOMPRESSED);
         assertThat(baos.toString(), is("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}"));
     }
@@ -45,19 +41,15 @@ public class ConfigResponseTest {
     @Test
     public void require_that_slime_response_decompresses_on_serialize() throws IOException {
         ConfigPayload configPayload = ConfigPayload.fromInstance(new SimpletypesConfig(new SimpletypesConfig.Builder()));
-        DefParser dParser = new DefParser(SimpletypesConfig.getDefName(), new StringReader(StringUtilities.implode(SimpletypesConfig.CONFIG_DEF_SCHEMA, "\n")));
-        InnerCNode targetDef = dParser.getTree();
         Utf8Array data = configPayload.toUtf8Array(true);
         Utf8Array bytes = new Utf8Array(new LZ4PayloadCompressor().compress(data.getBytes()));
-        ConfigResponse response = new SlimeConfigResponse(bytes, targetDef, 3, false, "mymd5", CompressionInfo.create(CompressionType.LZ4, data.getByteLength()));
-        List<String> payload = response.getLegacyPayload();
+        ConfigResponse response = new SlimeConfigResponse(bytes, 3, false, "mymd5", CompressionInfo.create(CompressionType.LZ4, data.getByteLength()));
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        response.serialize(baos, CompressionType.UNCOMPRESSED);
+        String payload = baos.toString(StandardCharsets.UTF_8);
         assertNotNull(payload);
-        assertThat(payload.size(), is(6));
-        assertThat(payload.get(0), is("boolval false"));
-        assertThat(response.getGeneration(), is(3L));
-        assertThat(response.getConfigMd5(), is("mymd5"));
 
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        baos = new ByteArrayOutputStream();
         response.serialize(baos, CompressionType.UNCOMPRESSED);
         assertThat(baos.toString(), is("{\"boolval\":false,\"doubleval\":0.0,\"enumval\":\"VAL1\",\"intval\":0,\"longval\":0,\"stringval\":\"s\"}"));
     }
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
index e176ce6e8cd..6d688af2814 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
@@ -70,7 +70,7 @@ public class JRTConfigRequestV3Test extends JRTConfigRequestBase {
     @Test
     public void emptypayload() {
         ConfigPayload payload = ConfigPayload.empty();
-        SlimeConfigResponse response = SlimeConfigResponse.fromConfigPayload(payload, null, 0, false, ConfigUtils.getMd5(payload));
+        SlimeConfigResponse response = SlimeConfigResponse.fromConfigPayload(payload, 0, false, ConfigUtils.getMd5(payload));
         serverReq.addOkResponse(serverReq.payloadFromResponse(response), response.getGeneration(), false, response.getConfigMd5());
         assertTrue(clientReq.validateResponse());
         assertTrue(clientReq.hasUpdatedGeneration());