Remove group ID from most messages

git-svn-id: https://svn.terracotta.org/repo/tc/tc-messaging/branches/private/voltron@26040 7fc7bbf3-cf45-46d4-be06-341739edd864

Author: timeck

src/main/java/com/tc/object/msg/ClientHandshakeAckMessage.java

@@ -4,31 +4,21 @@
 package com.tc.object.msg;
 
 import com.tc.net.ClientID;
-import com.tc.net.GroupID;
 import com.tc.net.NodeID;
-import com.tc.net.StripeID;
 import com.tc.net.protocol.tcm.TCMessage;
 
-import java.util.Map;
 import java.util.Set;
 
 public interface ClientHandshakeAckMessage extends TCMessage {
 
   public boolean getPersistentServer();
 
-  public void initialize(boolean persistent, Set<? extends NodeID> allNodes, ClientID thisNodeID, String serverVersion,
-                         GroupID thisGroup, StripeID stripeID, Map<GroupID, StripeID> stripeIDMap);
+  public void initialize(boolean persistent, Set<? extends NodeID> allNodes, ClientID thisNodeID, String serverVersion);
 
   public ClientID[] getAllNodes();
 
   public ClientID getThisNodeId();
 
   public String getServerVersion();
 
-  public GroupID getGroupID();
-
-  public StripeID getStripeID();
-  
-  public Map<GroupID, StripeID> getStripeIDMap();
-
 }

src/main/java/com/tc/object/msg/ClientHandshakeAckMessageImpl.java

@@ -6,20 +6,15 @@
 import com.tc.bytes.TCByteBuffer;
 import com.tc.io.TCByteBufferOutputStream;
 import com.tc.net.ClientID;
-import com.tc.net.GroupID;
 import com.tc.net.NodeID;
-import com.tc.net.StripeID;
-import com.tc.net.groups.GroupToStripeMapSerializer;
 import com.tc.net.protocol.tcm.MessageChannel;
 import com.tc.net.protocol.tcm.MessageMonitor;
 import com.tc.net.protocol.tcm.TCMessageHeader;
 import com.tc.net.protocol.tcm.TCMessageType;
 import com.tc.object.session.SessionID;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 public class ClientHandshakeAckMessageImpl extends DSOMessageBase implements ClientHandshakeAckMessage {
@@ -28,17 +23,11 @@ public class ClientHandshakeAckMessageImpl extends DSOMessageBase implements Cli
   private static final byte      ALL_NODES         = 2;
   private static final byte      THIS_NODE_ID      = 3;
   private static final byte      SERVER_VERSION    = 4;
-  private static final byte      GROUP_ID          = 5;
-  private static final byte      STRIPE_ID         = 6;
-  private static final byte      STRIPE_ID_MAP     = 7;
 
   private final Set<NodeID>      allNodes          = new HashSet<NodeID>();
   private boolean                persistentServer;
   private ClientID               thisNodeId;
   private String                 serverVersion;
-  private GroupID                groupID;
-  private StripeID               stripeID;
-  private Map<GroupID, StripeID> stripeIDMap       = new HashMap<GroupID, StripeID>(0);
 
   public ClientHandshakeAckMessageImpl(final SessionID sessionID, final MessageMonitor monitor,
                                        final TCByteBufferOutputStream out, final MessageChannel channel,
@@ -62,9 +51,6 @@ protected void dehydrateValues() {
 
     putNVPair(THIS_NODE_ID, thisNodeId);
     putNVPair(SERVER_VERSION, serverVersion);
-    putNVPair(GROUP_ID, groupID);
-    putNVPair(STRIPE_ID, stripeID);
-    putNVPair(STRIPE_ID_MAP, new GroupToStripeMapSerializer(stripeIDMap));
   }
 
   @Override
@@ -82,31 +68,19 @@ protected boolean hydrateValue(final byte name) throws IOException {
       case SERVER_VERSION:
         serverVersion = getStringValue();
         return true;
-      case GROUP_ID:
-        groupID = (GroupID) getNodeIDValue();
-        return true;
-      case STRIPE_ID:
-        stripeID = (StripeID) getNodeIDValue();
-        return true;
-      case STRIPE_ID_MAP:
-        stripeIDMap = getObject(new GroupToStripeMapSerializer()).getMap();
-        return true;
       default:
         return false;
     }
   }
 
   @Override
   public void initialize(final boolean persistent, final Set<? extends NodeID> allNodeIDs, final ClientID thisNodeID,
-                         final String sv, final GroupID l2GroupID, StripeID l2StripeID, Map<GroupID, StripeID> sidMap) {
+                         final String sv) {
     this.persistentServer = persistent;
     this.allNodes.addAll(allNodeIDs);
 
     this.thisNodeId = thisNodeID;
     this.serverVersion = sv;
-    this.groupID = l2GroupID;
-    this.stripeID = l2StripeID;
-    this.stripeIDMap = sidMap;
   }
 
   @Override
@@ -128,19 +102,4 @@ public ClientID getThisNodeId() {
   public String getServerVersion() {
     return serverVersion;
   }
-
-  @Override
-  public GroupID getGroupID() {
-    return groupID;
-  }
-
-  @Override
-  public StripeID getStripeID() {
-    return this.stripeID;
-  }
-
-  @Override
-  public Map<GroupID, StripeID> getStripeIDMap() {
-    return this.stripeIDMap;
-  }
 }

src/main/java/com/tc/object/msg/ClientHandshakeMessageFactory.java

@@ -3,11 +3,8 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface ClientHandshakeMessageFactory {
 
-  public ClientHandshakeMessage newClientHandshakeMessage(NodeID remoteNode, String clientVersion,
-                                                          boolean isEnterpriseClient);
+  public ClientHandshakeMessage newClientHandshakeMessage(String clientVersion, boolean isEnterpriseClient);
 
 }

src/main/java/com/tc/object/msg/CommitTransactionMessageFactory.java

@@ -3,10 +3,8 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface CommitTransactionMessageFactory {
 
-  public CommitTransactionMessage newCommitTransactionMessage(NodeID remoteNode);
+  public CommitTransactionMessage newCommitTransactionMessage();
 
 }

src/main/java/com/tc/object/msg/CompletedTransactionLowWaterMarkMessageFactory.java

@@ -3,10 +3,8 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface CompletedTransactionLowWaterMarkMessageFactory {
 
-  public CompletedTransactionLowWaterMarkMessage newCompletedTransactionLowWaterMarkMessage(NodeID remoteID);
+  public CompletedTransactionLowWaterMarkMessage newCompletedTransactionLowWaterMarkMessage();
 
 }

src/main/java/com/tc/object/msg/LockRequestMessageFactory.java

@@ -3,8 +3,6 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface LockRequestMessageFactory {
-  public LockRequestMessage newLockRequestMessage(NodeID nodeID);
+  public LockRequestMessage newLockRequestMessage();
 }

src/main/java/com/tc/object/msg/RequestManagedObjectMessageFactory.java

@@ -3,10 +3,8 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface RequestManagedObjectMessageFactory {
 
-  public RequestManagedObjectMessage newRequestManagedObjectMessage(NodeID nodeID);
+  public RequestManagedObjectMessage newRequestManagedObjectMessage();
 
 }

src/main/java/com/tc/object/msg/RequestRootMessageFactory.java

@@ -3,10 +3,8 @@
  */
 package com.tc.object.msg;
 
-import com.tc.net.NodeID;
-
 public interface RequestRootMessageFactory {
 
-  public RequestRootMessage newRequestRootMessage(NodeID nodeID);
+  public RequestRootMessage newRequestRootMessage();
 
 }

src/main/java/com/tc/object/tx/ClientTransactionBatchWriter.java

@@ -8,7 +8,6 @@
 import com.tc.io.TCByteBufferOutputStream;
 import com.tc.io.TCByteBufferOutputStream.Mark;
 import com.tc.lang.Recyclable;
-import com.tc.net.GroupID;
 import com.tc.object.ObjectID;
 import com.tc.object.TCObject;
 import com.tc.object.change.TCChangeBuffer;
@@ -36,7 +35,6 @@
 
 public class ClientTransactionBatchWriter implements ClientTransactionBatch {
 
-  private final GroupID                         groupID;
   private final CommitTransactionMessageFactory commitTransactionMessageFactory;
   private final TxnBatchID                      batchID;
   private final LinkedHashMap<TransactionID, TransactionBuffer> transactionData = new LinkedHashMap<TransactionID, TransactionBuffer>();
@@ -50,10 +48,9 @@ public class ClientTransactionBatchWriter implements ClientTransactionBatch {
   private boolean                               committed              = false;
   private int                                   holders                = 0;
 
-  public ClientTransactionBatchWriter(final GroupID groupID, final TxnBatchID batchID,
+  public ClientTransactionBatchWriter(final TxnBatchID batchID,
                                       final ObjectStringSerializer serializer, final DNAEncodingInternal encoding,
-                                      final CommitTransactionMessageFactory commitTransactionMessageFactory) {
-    this.groupID = groupID;
+                                      final CommitTransactionMessageFactory commitTransactionMessageFactory) {   
     this.batchID = batchID;
     this.encoding = encoding;
     this.commitTransactionMessageFactory = commitTransactionMessageFactory;
@@ -190,7 +187,7 @@ private TCByteBufferOutputStream newOutputStream() {
   public void send() {
     final CommitTransactionMessage msg;
     synchronized (this) {
-      msg = this.commitTransactionMessageFactory.newCommitTransactionMessage(this.groupID);
+      msg = this.commitTransactionMessageFactory.newCommitTransactionMessage();
       msg.setBatch(this, this.serializer);
     }
     msg.send();