Remove traces of PCODE_MLD_MONITORRESULT and PCODE_MONITORRESULT

3 files changed, 4 insertions, 42 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java
index 0f6f58ba7b7..2eb61d13fd6 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PacketDecoder.java
@@ -56,9 +56,6 @@ public class PacketDecoder {
              case 221:
                  return PongPacket.create().decode(buffer);
 
-             case 207:
-                 return SearchNodePongPacket.create().decode(buffer);
-
              default:
                  throw new IllegalArgumentException("No support for packet " + packetCode);
          }
@@ -106,7 +103,7 @@ public class PacketDecoder {
             return false;
          int packetCode = buffer.getInt(buffer.position()+4);
          packetCode &= BasicPacket.CODE_MASK;
-         if (packetCode == 210 || packetCode == 221)
+         if (packetCode == 221)
              return true;
          else
              return false;
diff --git a/container-search/src/main/java/com/yahoo/fs4/PongPacket.java b/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
index 58391952370..c521fde5c9b 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
@@ -5,8 +5,8 @@ import java.nio.ByteBuffer;
 import java.util.Optional;
 
 /**
- * A pong packet for FS4. It maps to PCODE_MLD_MONITORRESULT
- * and PCODE_MONITORRESULTX in the C++ implementation of the protocol.
+ * A pong packet for FS4. It maps to PCODE_MONITORRESULTX
+ * in the C++ implementation of the protocol.
  *
  * @author Steinar Knutsen
  */
@@ -40,9 +40,7 @@ public class PongPacket extends BasicPacket {
 
     public void decodeBody(ByteBuffer buffer) {
         int features = MRF_MLD;
-        if (code == PCODE_MONITORRESULTX) {
-            features = buffer.getInt();
-        }
+        features = buffer.getInt();
         lowPartitionId = buffer.getInt();
         dispatchTimestamp = buffer.getInt();
         if ((features & MRF_MLD) != 0) {
@@ -93,7 +91,6 @@ public class PongPacket extends BasicPacket {
     static final int MRF_ACTIVEDOCS = 0x00000010;
 
     /** packet codes, taken from searchlib/common/transport.h */
-    static final int PCODE_MLD_MONITORRESULT = 210;
     static final int PCODE_MONITORRESULTX    = 221;
 
 }
diff --git a/container-search/src/main/java/com/yahoo/fs4/SearchNodePongPacket.java b/container-search/src/main/java/com/yahoo/fs4/SearchNodePongPacket.java
deleted file mode 100644
index dce0e84de95..00000000000
--- a/container-search/src/main/java/com/yahoo/fs4/SearchNodePongPacket.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.fs4;
-
-import java.nio.ByteBuffer;
-
-/**
- * Responsible for decoding pong packets from a search node.
- * @author tonytv
- */
-public class SearchNodePongPacket extends PongPacket {
-    private int timeStamp;
-
-    public static SearchNodePongPacket create() {
-        return new SearchNodePongPacket();
-    }
-
-    @Override
-    public int getCode() { return 207; }
-
-    @Override
-    public void decodeBody(ByteBuffer buffer) {
-        @SuppressWarnings("unused")
-        int partitionId = buffer.getInt();
-
-        timeStamp = buffer.getInt();
-    }
-
-    @Override
-    public int getDocstamp() {
-        return timeStamp;
-    }
-}