summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-02-07 14:25:41 +0100
committerHarald Musum <musum@verizonmedia.com>2020-02-07 14:25:41 +0100
commitaa4903810f04696deba494bc11798e465cccbde2 (patch)
treebc3174355d9d6fabe3e38fa4ba831c2ab7854314 /config
parentad08f1b293cdda3c0863feb2700302d9c664b44e (diff)
Remove unused method
Diffstat (limited to 'config')
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java8
-rw-r--r--config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java11
-rw-r--r--config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java1
3 files changed, 3 insertions, 17 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java
index 25fecba425c..ab47fec0641 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequest.java
@@ -64,14 +64,6 @@ public interface JRTClientConfigRequest extends JRTConfigRequest {
String getNewConfigMd5();
/**
- * Test whether or not the payload is contained in this response or not.
- * Should return false for error responses as well.
- *
- * @return true if empty, false if not.
- */
- boolean containsPayload();
-
- /**
* Test whether or not the response contains an updated config or not.
* False if no response has been returned.
*
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java
index d1ef9b02d75..b3ca7355023 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTClientConfigRequestV3.java
@@ -55,17 +55,17 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest {
compressionType,
vespaVersion);
Request jrtReq = new Request(getJRTMethodName());
- jrtReq.parameters().add(new StringValue(encodeAsUtf8String(data, true)));
+ jrtReq.parameters().add(new StringValue(encodeAsUtf8String(data)));
this.requestData = new SlimeRequestData(jrtReq, data);
this.responseData = new SlimeResponseData(jrtReq);
this.request = jrtReq;
}
- protected static String encodeAsUtf8String(Slime data, boolean compact) {
+ protected static String encodeAsUtf8String(Slime data) {
ByteArrayOutputStream baos = new NoCopyByteArrayOutputStream();
try {
- new JsonFormat(compact).encode(baos, data);
+ new JsonFormat(true /* compact format */).encode(baos, data);
} catch (IOException e) {
throw new RuntimeException("Unable to encode config request", e);
}
@@ -249,11 +249,6 @@ public class JRTClientConfigRequestV3 implements JRTClientConfigRequest {
}
@Override
- public boolean containsPayload() {
- return false;
- }
-
- @Override
public boolean hasUpdatedConfig() {
String respMd5 = getNewConfigMd5();
return !respMd5.equals("") && !getRequestConfigMd5().equals(respMd5);
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java
index db594cb8c5b..5fcbd76b822 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java
@@ -207,7 +207,6 @@ public abstract class JRTConfigRequestBase {
@Test
public void request_interface_is_implemented() {
JRTClientConfigRequest request = clientReq;
- assertFalse(request.containsPayload());
assertFalse(request.isError());
assertThat(request.errorCode(), is(clientReq.getRequest().errorCode()));
assertThat(request.errorMessage(), is(clientReq.getRequest().errorMessage()));