From 93df178469bca2e37d26faed4bdb802d05f75a47 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 9 Feb 2015 11:04:30 +0100
Subject: [PATCH] Remove unneeded bwc code

---
 .../zen/membership/MembershipAction.java      | 61 +------------------
 1 file changed, 1 insertion(+), 60 deletions(-)

diff --git a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
index e0360e2bc31..36fcde3ddcc 100644
--- a/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
+++ b/src/main/java/org/elasticsearch/discovery/zen/membership/MembershipAction.java
@@ -112,9 +112,6 @@ public class MembershipAction extends AbstractComponent {
 
         DiscoveryNode node;
 
-        // here for backward compatibility. nodes with a version lower than 1.4.0 send this flag
-        boolean withClusterState = false;
-
         private JoinRequest() {
         }
 
@@ -126,50 +123,16 @@ public class MembershipAction extends AbstractComponent {
         public void readFrom(StreamInput in) throws IOException {
             super.readFrom(in);
             node = DiscoveryNode.readNode(in);
-            if (in.getVersion().before(Version.V_1_4_0_Beta1)) {
-                withClusterState = in.readBoolean();
-            }
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             node.writeTo(out);
-            if (out.getVersion().before(Version.V_1_4_0_Beta1)) {
-                // old with cluster state flag
-                out.writeBoolean(false);
-            }
         }
     }
 
 
-    // used to reply to nodes from a version older than 1.4.0 which may expect this
-    @Deprecated
-    class JoinResponse extends TransportResponse {
-
-        ClusterState clusterState;
-
-        JoinResponse() {
-        }
-
-        JoinResponse(ClusterState clusterState) {
-            this.clusterState = clusterState;
-        }
-
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            // we don't care about cluster name. This cluster state is never used.
-            clusterState = ClusterState.Builder.readFrom(in, nodesProvider.nodes().localNode(), null);
-        }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            ClusterState.Builder.writeTo(clusterState, out);
-        }
-    }
-
     private class JoinRequestRequestHandler extends BaseTransportRequestHandler<JoinRequest> {
 
         @Override
@@ -183,12 +146,7 @@ public class MembershipAction extends AbstractComponent {
                 @Override
                 public void onSuccess() {
                     try {
-                        // nodes from a version older than 1.4.0 may ask for this
-                        if (request.withClusterState) {
-                            channel.sendResponse(new JoinResponse(clusterService.state()));
-                        } else {
-                            channel.sendResponse(TransportResponse.Empty.INSTANCE);
-                        }
+                        channel.sendResponse(TransportResponse.Empty.INSTANCE);
                     } catch (Throwable t) {
                         onFailure(t);
                     }
@@ -215,23 +173,6 @@ public class MembershipAction extends AbstractComponent {
 
         ValidateJoinRequest() {
         }
-
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            if (in.getVersion().before(Version.V_1_4_0_Beta1)) {
-                // cluster name doesn't matter...
-                ClusterState.Builder.readFrom(in, nodesProvider.nodes().localNode(), null);
-            }
-        }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            if (out.getVersion().before(Version.V_1_4_0_Beta1)) {
-                ClusterState.Builder.writeTo(clusterService.state(), out);
-            }
-        }
     }
 
     private class ValidateJoinRequestRequestHandler extends BaseTransportRequestHandler<ValidateJoinRequest> {