[jboss-cvs] JBoss Messaging SVN: r3370 - in branches/Branch_JBMESSAGING-544: src/main/org/jboss/jms/server/endpoint and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 27 08:19:26 EST 2007
Author: jmesnil
Date: 2007-11-27 08:19:26 -0500 (Tue, 27 Nov 2007)
New Revision: 3370
Modified:
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/wireformat/AbstractPacket.java
branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/wireformat/PacketTypeTest.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-544: Replace client-server transport with NIO based transport
* added a mandatory version byte to all AbstractPackets
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -330,7 +330,9 @@
// throw handleThrowable(e);
// }
- GetTopologyResponse response = (GetTopologyResponse) sendBlocking(remoting.getNewRemotingClient(), currentDelegate.getID(), new GetTopologyRequest());
+ byte version = Version.instance().getProviderIncrementingVersion();
+
+ GetTopologyResponse response = (GetTopologyResponse) sendBlocking(remoting.getNewRemotingClient(), currentDelegate.getID(), version, new GetTopologyRequest());
TopologyResult topology = response.getTopology();
updateFailoverInfo(topology.getDelegates(), topology.getFailoverMap());
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -238,20 +238,12 @@
public void start() throws JMSException
{
- assert newClient != null;
-
- StartConnectionMessage message = new StartConnectionMessage();
- message.setTargetID(id);
- newClient.sendOneWay(message);
+ sendOneWay(new StartConnectionMessage());
}
public void startAfterFailover() throws JMSException
{
- assert newClient != null;
-
- StartConnectionMessage message = new StartConnectionMessage();
- message.setTargetID(id);
- newClient.sendOneWay(message);
+ sendOneWay(new StartConnectionMessage());
}
public void stop() throws JMSException
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -268,7 +268,7 @@
org.jboss.messaging.core.remoting.Client client = createNewClient();
- GetClientAOPStackResponse response = (GetClientAOPStackResponse) sendBlocking(client, id, new GetClientAOPStackRequest());
+ GetClientAOPStackResponse response = (GetClientAOPStackResponse) sendBlocking(client, id, v, new GetClientAOPStackRequest());
try
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -138,12 +138,7 @@
public void changeRate(float newRate) throws JMSException
{
- assert newClient != null;
-
-
- ChangeRateMessage message = new ChangeRateMessage(newRate);
- message.setTargetID(id);
- newClient.sendOneWay(message);
+ sendOneWay(new ChangeRateMessage(newRate));
}
/**
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -456,8 +456,6 @@
public void send(JBossMessage m, boolean checkForDuplicates) throws JMSException
{
- assert newClient != null;
-
long seq;
if (m.isReliable() || strictTck)
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -170,17 +170,29 @@
return doInvoke(client, req, true);
}
+ protected void sendOneWay(AbstractPacket packet) throws JMSException
+ {
+ assert client != null;
+ assert packet != null;
+
+ packet.setVersion(version);
+ packet.setTargetID(id);
+
+ newClient.sendOneWay(packet);
+ }
+
protected AbstractPacket sendBlocking(AbstractPacket request) throws JMSException
{
- return sendBlocking(newClient, id, request);
+ return sendBlocking(newClient, id, version, request);
}
- protected static AbstractPacket sendBlocking(org.jboss.messaging.core.remoting.Client client, String targetID, AbstractPacket request) throws JMSException
+ protected static AbstractPacket sendBlocking(org.jboss.messaging.core.remoting.Client client, String targetID, byte version, AbstractPacket request) throws JMSException
{
assert client != null;
assertValidID(targetID);
assert request != null;
+ request.setVersion(version);
request.setTargetID(targetID);
try
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -21,21 +21,6 @@
*/
package org.jboss.jms.server.endpoint;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ACKDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ADDTEMPORARYDESTINATION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERY;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_DELETETEMPORARYDESTINATION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_RECOVERDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SENDMESSAGE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_UNSUBSCRIBE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_ACKDELIVERY;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CLOSING;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEBROWSER;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONSUMER;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEDESTINATION;
-
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collection;
@@ -52,7 +37,6 @@
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
-import org.apache.mina.common.IoSession;
import org.jboss.aop.AspectManager;
import org.jboss.jms.client.delegate.ClientBrowserDelegate;
import org.jboss.jms.client.delegate.ClientConsumerDelegate;
@@ -60,7 +44,6 @@
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.delegate.Cancel;
import org.jboss.jms.delegate.ConsumerDelegate;
-import org.jboss.jms.delegate.DefaultAck;
import org.jboss.jms.delegate.DeliveryInfo;
import org.jboss.jms.delegate.DeliveryRecovery;
import org.jboss.jms.delegate.SessionEndpoint;
@@ -100,29 +83,7 @@
import org.jboss.messaging.core.impl.tx.TransactionRepository;
import org.jboss.messaging.core.impl.tx.TxCallback;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryRequest;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryResponse;
-import org.jboss.messaging.core.remoting.wireformat.AddTemporaryDestinationMessage;
-import org.jboss.messaging.core.remoting.wireformat.CancelDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.CancelDeliveryMessage;
-import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateBrowserRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateBrowserResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateConsumerRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateConsumerResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateDestinationRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateDestinationResponse;
-import org.jboss.messaging.core.remoting.wireformat.DeleteTemporaryDestinationMessage;
import org.jboss.messaging.core.remoting.wireformat.DeliverMessage;
-import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
-import org.jboss.messaging.core.remoting.wireformat.NullPacket;
-import org.jboss.messaging.core.remoting.wireformat.PacketType;
-import org.jboss.messaging.core.remoting.wireformat.RecoverDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.SendMessage;
-import org.jboss.messaging.core.remoting.wireformat.UnsubscribeMessage;
import org.jboss.messaging.util.ExceptionUtil;
import org.jboss.messaging.util.GUIDGenerator;
import org.jboss.messaging.util.MessageQueueNameHelper;
@@ -1491,7 +1452,8 @@
// transport and then the thread returns immediately without waiting for a response.
DeliverMessage m = new DeliverMessage(ref.getMessage(), consumer.getID(), deliveryID, ref.getDeliveryCount());
- consumer.deliver(m);
+ m.setVersion(getConnectionEndpoint().getUsingVersion());
+ consumer.deliver(m);
// ClientDelivery del = new ClientDelivery(ref.getMessage(), consumer.getID(), deliveryID, ref.getDeliveryCount());
//
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -17,6 +17,8 @@
public static final int CONNECTION_TIMEOUT = 20 * 1000;
+ public static final byte NO_VERSION_SET = (byte)-1;
+
public static final long NO_CORRELATION_ID = -1L;
public static final String NO_ID_SET = "NO_ID_SET";
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -28,6 +28,7 @@
import org.jboss.jms.destination.JBossDestination;
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.impl.message.MessageFactory;
+import org.jboss.messaging.core.remoting.Constants;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.PacketType;
@@ -84,6 +85,12 @@
public void encode(IoSession session, P packet, ProtocolEncoderOutput out)
throws Exception
{
+ byte version = packet.getVersion();
+ if (version == Constants.NO_VERSION_SET)
+ {
+ throw new IllegalStateException("packet must be versioned: " + packet);
+ }
+
long correlationID = packet.getCorrelationID();
String targetID = packet.getTargetID();
String callbackID = packet.getCallbackID();
@@ -96,6 +103,7 @@
buf.setAutoExpand(true);
buf.put(packet.getType().byteValue());
+ buf.put(version);
buf.putInt(headerLength);
buf.putLong(correlationID);
putString(buf, targetID);
@@ -116,6 +124,7 @@
{
return NOT_OK;
}
+ in.get(); // version
if (in.remaining() < INT_LENGTH)
{
System.out.println("need more data to read header length");
@@ -165,8 +174,9 @@
public MessageDecoderResult decode(IoSession session, IoBuffer in,
ProtocolDecoderOutput out) throws Exception
- {
+ {
in.get(); // skip message type
+ byte version = in.get();
in.getInt(); // skip header length
long correlationID = in.getLong();
String targetID = getString(in);
@@ -178,13 +188,14 @@
{
return NEED_DATA;
}
+ packet.setVersion(version);
packet.setTargetID(targetID);
packet.setCorrelationID(correlationID);
packet.setCallbackID(callbackID);
out.write(packet);
return OK;
- }
+ }
public void finishDecode(IoSession session, ProtocolDecoderOutput out)
throws Exception
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/wireformat/AbstractPacket.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/wireformat/AbstractPacket.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/wireformat/AbstractPacket.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -9,6 +9,7 @@
import static org.jboss.messaging.core.remoting.Assert.assertValidID;
import static org.jboss.messaging.core.remoting.Constants.NO_CORRELATION_ID;
import static org.jboss.messaging.core.remoting.Constants.NO_ID_SET;
+import static org.jboss.messaging.core.remoting.Constants.NO_VERSION_SET;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -21,6 +22,8 @@
// Attributes ----------------------------------------------------
+ private byte version = NO_VERSION_SET;
+
private long correlationID = NO_CORRELATION_ID;
private String targetID = NO_ID_SET;
@@ -47,6 +50,18 @@
return type;
}
+ public void setVersion(byte version)
+ {
+ assert version != NO_VERSION_SET;
+
+ this.version = version;
+ }
+
+ public byte getVersion()
+ {
+ return version;
+ }
+
public void setCorrelationID(long correlationID)
{
this.correlationID = correlationID;
@@ -85,6 +100,7 @@
{
assert other != null;
+ setVersion(other.getVersion());
setCorrelationID(other.getCorrelationID());
setTargetID(other.getCallbackID());
}
@@ -99,8 +115,9 @@
protected String getParentString()
{
- return "PACKET[type=" + type + ", correlationID=" + correlationID
- + ", targetID=" + targetID + ", callbackID=" + callbackID;
+ return "PACKET[type=" + type + ", version=" + version
+ + ", correlationID=" + correlationID + ", targetID=" + targetID
+ + ", callbackID=" + callbackID;
}
// Protected -----------------------------------------------------
Modified: branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/wireformat/PacketTypeTest.java
===================================================================
--- branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/wireformat/PacketTypeTest.java 2007-11-27 00:09:19 UTC (rev 3369)
+++ branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/wireformat/PacketTypeTest.java 2007-11-27 13:19:26 UTC (rev 3370)
@@ -6,6 +6,7 @@
*/
package org.jboss.test.messaging.core.remoting.wireformat;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ACKDELIVERIES;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ADDTEMPORARYDESTINATION;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_BROWSER_RESET;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERIES;
@@ -46,6 +47,7 @@
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_CREATEBROWSER;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_CREATECONNECTION;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_CREATECONSUMER;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_CREATEDESTINATION;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_CREATESESSION;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_GETCLIENTAOPSTACK;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.RESP_GETCLIENTID;
@@ -57,6 +59,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Random;
import java.util.UUID;
import javax.jms.InvalidDestinationException;
@@ -126,7 +129,6 @@
import org.jboss.messaging.core.remoting.wireformat.IDBlockResponse;
import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
import org.jboss.messaging.core.remoting.wireformat.NullPacket;
-import org.jboss.messaging.core.remoting.wireformat.PacketType;
import org.jboss.messaging.core.remoting.wireformat.RecoverDeliveriesMessage;
import org.jboss.messaging.core.remoting.wireformat.SendMessage;
import org.jboss.messaging.core.remoting.wireformat.SendTransactionMessage;
@@ -147,10 +149,17 @@
// Constants -----------------------------------------------------
+ private static final Random random = new Random(System.currentTimeMillis());
+
// Attributes ----------------------------------------------------
// Static --------------------------------------------------------
+ private static void addVersion(AbstractPacket packet)
+ {
+ packet.setVersion(randomByte());
+ }
+
private static String randomString()
{
return UUID.randomUUID().toString();
@@ -158,9 +167,19 @@
private static long randomLong()
{
- return System.currentTimeMillis();
+ return random.nextLong();
}
+ private static byte randomByte()
+ {
+ return Integer.valueOf(random.nextInt()).byteValue();
+ }
+
+ private static byte[] randomBytes()
+ {
+ return randomString().getBytes();
+ }
+
private static void assertEqualsAcks(List<Ack> expected, List<Ack> actual)
{
assertEquals(expected.size(), actual.size());
@@ -260,6 +279,7 @@
public void testNullPacket() throws Exception
{
NullPacket packet = new NullPacket();
+ packet.setVersion(randomByte());
packet.setCallbackID(randomString());
packet.setCorrelationID(randomLong());
packet.setTargetID(randomString());
@@ -270,6 +290,7 @@
NullPacket p = (NullPacket) decodedPacket;
assertEquals(NULL, p.getType());
+ assertEquals(packet.getVersion(), p.getVersion());
assertEquals(packet.getCallbackID(), p.getCallbackID());
assertEquals(packet.getCorrelationID(), p.getCorrelationID());
assertEquals(packet.getTargetID(), p.getTargetID());
@@ -280,6 +301,7 @@
JMSException e = new InvalidDestinationException(
"testJMSExceptionMessage");
JMSExceptionMessage message = new JMSExceptionMessage(e);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -294,6 +316,7 @@
public void testTextPacket() throws Exception
{
TextPacket packet = new TextPacket("testTextPacket");
+ addVersion(packet);
AbstractPacket decodedPacket = encodeAndDecode(packet);
@@ -306,7 +329,7 @@
public void testCreateConnectionRequest() throws Exception
{
- byte version = (byte) 4;
+ byte version = randomByte();
String remotingSessionID = randomString();
String clientVMID = randomString();
int failedNodeID = 0;
@@ -315,6 +338,7 @@
CreateConnectionRequest request = new CreateConnectionRequest(version,
remotingSessionID, clientVMID, failedNodeID, username, password);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -323,7 +347,8 @@
assertEquals(REQ_CREATECONNECTION, decodedPacket.getType());
assertEquals(request.getVersion(), decodedRequest.getVersion());
- assertEquals(request.getRemotingSessionID(), decodedRequest.getRemotingSessionID());
+ assertEquals(request.getRemotingSessionID(), decodedRequest
+ .getRemotingSessionID());
assertEquals(request.getClientVMID(), decodedRequest.getClientVMID());
assertEquals(request.getFailedNodeID(), decodedRequest.getFailedNodeID());
assertEquals(request.getUsername(), decodedRequest.getUsername());
@@ -334,6 +359,7 @@
{
CreateConnectionResponse response = new CreateConnectionResponse(
randomString(), 1234);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -349,6 +375,7 @@
public void testGetClientAOPStackRequest() throws Exception
{
GetClientAOPStackRequest request = new GetClientAOPStackRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -358,9 +385,10 @@
public void testGetClientAOPStackResponse() throws Exception
{
- byte[] stack = randomString().getBytes();
+ byte[] stack = randomBytes();
GetClientAOPStackResponse response = new GetClientAOPStackResponse(stack);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -373,6 +401,7 @@
public void testGetTopologyRequest() throws Exception
{
GetTopologyRequest request = new GetTopologyRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -392,6 +421,7 @@
TopologyResult topology = new TopologyResult(randomString(), delegates,
new HashMap());
GetTopologyResponse response = new GetTopologyResponse(topology);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -404,6 +434,7 @@
public void testCreateSessionRequest() throws Exception
{
CreateSessionRequest request = new CreateSessionRequest(true, 0, false);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -421,6 +452,7 @@
{
CreateSessionResponse response = new CreateSessionResponse(
randomString(), 23, false);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -437,6 +469,7 @@
public void testIDBlockRequest() throws Exception
{
IDBlockRequest request = new IDBlockRequest(23);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -451,6 +484,7 @@
{
IDBlockResponse response = new IDBlockResponse(randomLong(),
randomLong() * 2);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -466,6 +500,7 @@
{
SendMessage packet = new SendMessage(new JBossMessage(System
.currentTimeMillis()), true, randomLong());
+ addVersion(packet);
AbstractPacket p = encodeAndDecode(packet);
@@ -486,6 +521,7 @@
"testCreateConsumerRequest", true);
CreateConsumerRequest request = new CreateConsumerRequest(destination,
"color = 'red'", false, null, false, false);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -508,6 +544,7 @@
{
CreateDestinationRequest request = new CreateDestinationRequest(
"testCreateDestinationRequest", false);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -525,13 +562,14 @@
true);
CreateDestinationResponse response = new CreateDestinationResponse(
destination);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
assertTrue(decodedPacket instanceof CreateDestinationResponse);
CreateDestinationResponse decodedResponse = (CreateDestinationResponse) decodedPacket;
- assertEquals(PacketType.RESP_CREATEDESTINATION, decodedResponse.getType());
+ assertEquals(RESP_CREATEDESTINATION, decodedResponse.getType());
assertTrue(decodedResponse.getDestination() instanceof JBossQueue);
assertEquals(response.getDestination(), decodedResponse.getDestination());
}
@@ -542,13 +580,14 @@
"testCreateDestinationResponseForTopic");
CreateDestinationResponse response = new CreateDestinationResponse(
destination);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
assertTrue(decodedPacket instanceof CreateDestinationResponse);
CreateDestinationResponse decodedResponse = (CreateDestinationResponse) decodedPacket;
- assertEquals(PacketType.RESP_CREATEDESTINATION, decodedResponse.getType());
+ assertEquals(RESP_CREATEDESTINATION, decodedResponse.getType());
assertTrue(decodedResponse.getDestination() instanceof JBossTopic);
assertEquals(response.getDestination(), decodedResponse.getDestination());
}
@@ -558,6 +597,7 @@
CreateConsumerResponse response = new CreateConsumerResponse(
randomString(), 23, 42, randomLong());
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -575,6 +615,7 @@
public void testStartConnectionMessage() throws Exception
{
StartConnectionMessage packet = new StartConnectionMessage();
+ addVersion(packet);
AbstractPacket decodedPacket = encodeAndDecode(packet);
@@ -585,6 +626,7 @@
public void testStopConnectionMessage() throws Exception
{
StopConnectionMessage packet = new StopConnectionMessage();
+ addVersion(packet);
AbstractPacket decodedPacket = encodeAndDecode(packet);
@@ -595,6 +637,7 @@
public void testChangeRateMessage() throws Exception
{
ChangeRateMessage message = new ChangeRateMessage(0.63f);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -609,6 +652,7 @@
Message msg = new JBossMessage(randomLong());
DeliverMessage message = new DeliverMessage(msg, randomString(),
randomLong(), 23);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -627,6 +671,7 @@
{
AcknowledgeDeliveryRequest request = new AcknowledgeDeliveryRequest(
randomLong());
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -639,18 +684,19 @@
public void testAcknowledgeDeliveriesRequest() throws Exception
{
List<Ack> acks = new ArrayList<Ack>();
- acks.add(new DefaultAck(System.nanoTime()));
- acks.add(new DefaultAck(System.nanoTime()));
- acks.add(new DefaultAck(System.nanoTime()));
+ acks.add(new DefaultAck(randomLong()));
+ acks.add(new DefaultAck(randomLong()));
+ acks.add(new DefaultAck(randomLong()));
AcknowledgeDeliveriesMessage request = new AcknowledgeDeliveriesMessage(
acks);
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
assertTrue(decodedPacket instanceof AcknowledgeDeliveriesMessage);
AcknowledgeDeliveriesMessage decodedRequest = (AcknowledgeDeliveriesMessage) decodedPacket;
- assertEquals(PacketType.MSG_ACKDELIVERIES, decodedRequest.getType());
+ assertEquals(MSG_ACKDELIVERIES, decodedRequest.getType());
assertEqualsAcks(request.getAcks(), decodedRequest.getAcks());
}
@@ -658,6 +704,7 @@
{
AcknowledgeDeliveryResponse response = new AcknowledgeDeliveryResponse(
true);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -671,6 +718,7 @@
public void testClosingRequest() throws Exception
{
ClosingRequest request = new ClosingRequest(randomLong());
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -683,6 +731,7 @@
public void testClosingResponse() throws Exception
{
ClosingResponse response = new ClosingResponse(System.currentTimeMillis());
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -695,6 +744,7 @@
public void testCloseMessage() throws Exception
{
CloseMessage message = new CloseMessage();
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -706,12 +756,12 @@
public void testSendTransactionMessage() throws Exception
{
ClientTransaction tx = new ClientTransaction();
- MessagingXid xid = new MessagingXid(randomString().getBytes(), 23,
- randomString().getBytes());
+ MessagingXid xid = new MessagingXid(randomBytes(), 23, randomBytes());
TransactionRequest tr = new TransactionRequest(
TransactionRequest.ONE_PHASE_COMMIT_REQUEST, xid, tx);
SendTransactionMessage message = new SendTransactionMessage(tr, true);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -731,6 +781,7 @@
public void testGetPreparedTransactionsRequest() throws Exception
{
GetPreparedTransactionsRequest request = new GetPreparedTransactionsRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -741,14 +792,12 @@
public void testGetPreparedTransactionsResponse() throws Exception
{
MessagingXid[] xids = new MessagingXid[] {
- new MessagingXid(randomString().getBytes(), 23, randomString()
- .getBytes()),
- new MessagingXid(randomString().getBytes(), 33, randomString()
- .getBytes()),
- new MessagingXid(randomString().getBytes(), 91, randomString()
- .getBytes()) };
+ new MessagingXid(randomBytes(), 23, randomBytes()),
+ new MessagingXid(randomBytes(), 33, randomBytes()),
+ new MessagingXid(randomBytes(), 91, randomBytes()) };
GetPreparedTransactionsResponse response = new GetPreparedTransactionsResponse(
xids);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -761,6 +810,7 @@
public void testGetClientIDRequest() throws Exception
{
GetClientIDRequest request = new GetClientIDRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -771,6 +821,7 @@
public void testGetClientIDResponse() throws Exception
{
GetClientIDResponse response = new GetClientIDResponse(randomString());
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -783,6 +834,7 @@
public void testSetClientIDMessage() throws Exception
{
SetClientIDMessage message = new SetClientIDMessage(randomString());
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -804,6 +856,7 @@
RecoverDeliveriesMessage message = new RecoverDeliveriesMessage(
deliveries, randomString());
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -819,6 +872,7 @@
{
Cancel cancel = new DefaultCancel(randomLong(), 23, true, false);
CancelDeliveryMessage message = new CancelDeliveryMessage(cancel);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -841,6 +895,7 @@
cancels.add(new DefaultCancel(randomLong(), 33, false, true));
CancelDeliveriesMessage message = new CancelDeliveriesMessage(cancels);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -856,6 +911,7 @@
true);
CreateBrowserRequest request = new CreateBrowserRequest(destination,
"color = 'red'");
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -870,6 +926,7 @@
public void testCreateBrowserResponse() throws Exception
{
CreateBrowserResponse response = new CreateBrowserResponse(randomString());
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -883,6 +940,7 @@
public void testBrowserResetMessage() throws Exception
{
BrowserResetMessage message = new BrowserResetMessage();
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -893,6 +951,7 @@
public void testBrowserHasNextMessageRequest() throws Exception
{
BrowserHasNextMessageRequest request = new BrowserHasNextMessageRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -904,6 +963,7 @@
{
BrowserHasNextMessageResponse response = new BrowserHasNextMessageResponse(
false);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -917,6 +977,7 @@
public void testBrowserNextMessageRequest() throws Exception
{
BrowserNextMessageRequest request = new BrowserNextMessageRequest();
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -928,6 +989,7 @@
{
JBossMessage msg = new JBossMessage(randomLong());
BrowserNextMessageResponse response = new BrowserNextMessageResponse(msg);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -942,6 +1004,7 @@
{
BrowserNextMessageBlockRequest request = new BrowserNextMessageBlockRequest(
randomLong());
+ addVersion(request);
AbstractPacket decodedPacket = encodeAndDecode(request);
@@ -958,6 +1021,7 @@
BrowserNextMessageBlockResponse response = new BrowserNextMessageBlockResponse(
messages);
+ addVersion(response);
AbstractPacket decodedPacket = encodeAndDecode(response);
@@ -974,6 +1038,7 @@
{
UnsubscribeMessage message = new UnsubscribeMessage(
"testUnsubscribeMessage");
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -990,6 +1055,7 @@
"testAddTemporaryDestinationMessage", true);
AddTemporaryDestinationMessage message = new AddTemporaryDestinationMessage(
destination);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
@@ -1006,6 +1072,7 @@
"testDeleteTemporaryDestinationMessage", true);
DeleteTemporaryDestinationMessage message = new DeleteTemporaryDestinationMessage(
destination);
+ addVersion(message);
AbstractPacket decodedPacket = encodeAndDecode(message);
More information about the jboss-cvs-commits
mailing list