Merge pull request #12103 from vespa-engine/hmusum/remove-legacy-payload-method

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

2 files changed, 2 insertions, 27 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;
     }