[jboss-cvs] JBoss Messaging SVN: r4156 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/codec and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 7 02:59:23 EDT 2008
Author: timfox
Date: 2008-05-07 02:59:22 -0400 (Wed, 07 May 2008)
New Revision: 4156
Added:
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java
Removed:
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ConsumerDeliverMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/SessionBrowserNextMessageResponseMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java
trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
Log:
Combined ReceiveMessage
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -30,8 +30,8 @@
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -117,8 +117,8 @@
{
checkClosed();
- SessionBrowserNextMessageResponseMessage response =
- (SessionBrowserNextMessageResponseMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(SESS_BROWSER_NEXTMESSAGE));
+ ReceiveMessage response =
+ (ReceiveMessage)remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), new PacketImpl(SESS_BROWSER_NEXTMESSAGE));
return response.getMessage();
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerPacketHandler.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -1,12 +1,12 @@
package org.jboss.messaging.core.client.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
/**
@@ -41,9 +41,9 @@
{
PacketType type = packet.getType();
- if (type == CONS_DELIVER)
+ if (type == RECEIVE_MSG)
{
- ConsumerDeliverMessage message = (ConsumerDeliverMessage) packet;
+ ReceiveMessage message = (ReceiveMessage) packet;
clientConsumer.handleMessage(message.getMessage());
}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ConsumerDeliverMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ConsumerDeliverMessageCodec.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ConsumerDeliverMessageCodec.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.codec;
-
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
-import static org.jboss.messaging.util.DataConstants.SIZE_INT;
-import static org.jboss.messaging.util.DataConstants.SIZE_LONG;
-
-import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
-import org.jboss.messaging.util.DataConstants;
-import org.jboss.messaging.util.StreamUtils;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- */
-public class ConsumerDeliverMessageCodec extends AbstractPacketCodec<ConsumerDeliverMessage>
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public ConsumerDeliverMessageCodec()
- {
- super(CONS_DELIVER);
- }
-
- // Public --------------------------------------------------------
-
- // AbstractPacketCodec overrides ---------------------------------
-
- public int getBodyLength(final ConsumerDeliverMessage packet) throws Exception
- {
- byte[] encodedMsg = StreamUtils.toBytes(packet.getMessage());
-
- return SIZE_INT + encodedMsg.length;
- }
-
- @Override
- protected void encodeBody(final ConsumerDeliverMessage message, final RemotingBuffer out) throws Exception
- {
- byte[] encodedMsg = StreamUtils.toBytes(message.getMessage());
- out.putInt(encodedMsg.length);
- out.put(encodedMsg);
- encodedMsg = null;
- }
-
- @Override
- protected ConsumerDeliverMessage decodeBody(final RemotingBuffer in)
- throws Exception
- {
- int msgLength = in.getInt();
- byte[] encodedMsg = new byte[msgLength];
- in.get(encodedMsg);
- Message message = new MessageImpl();
- StreamUtils.fromBytes(message, encodedMsg);
-
- return new ConsumerDeliverMessage(message);
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private ----------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java (from rev 4155, trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ConsumerDeliverMessageCodec.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/ReceiveMessageCodec.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.codec;
+
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
+import static org.jboss.messaging.util.DataConstants.SIZE_INT;
+
+import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.core.message.impl.MessageImpl;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
+import org.jboss.messaging.util.StreamUtils;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ */
+public class ReceiveMessageCodec extends AbstractPacketCodec<ReceiveMessage>
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ public ReceiveMessageCodec()
+ {
+ super(RECEIVE_MSG);
+ }
+
+ // Public --------------------------------------------------------
+
+ // AbstractPacketCodec overrides ---------------------------------
+
+ public int getBodyLength(final ReceiveMessage packet) throws Exception
+ {
+ byte[] encodedMsg = StreamUtils.toBytes(packet.getMessage());
+
+ return SIZE_INT + encodedMsg.length;
+ }
+
+ @Override
+ protected void encodeBody(final ReceiveMessage message, final RemotingBuffer out) throws Exception
+ {
+ byte[] encodedMsg = StreamUtils.toBytes(message.getMessage());
+ out.putInt(encodedMsg.length);
+ out.put(encodedMsg);
+ encodedMsg = null;
+ }
+
+ @Override
+ protected ReceiveMessage decodeBody(final RemotingBuffer in)
+ throws Exception
+ {
+ int msgLength = in.getInt();
+ byte[] encodedMsg = new byte[msgLength];
+ in.get(encodedMsg);
+ Message message = new MessageImpl();
+ StreamUtils.fromBytes(message, encodedMsg);
+
+ return new ReceiveMessage(message);
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private ----------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/SessionBrowserNextMessageResponseMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/SessionBrowserNextMessageResponseMessageCodec.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/SessionBrowserNextMessageResponseMessageCodec.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.codec;
-
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE_RESP;
-import static org.jboss.messaging.util.DataConstants.SIZE_INT;
-
-import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
-import org.jboss.messaging.util.StreamUtils;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- */
-public class SessionBrowserNextMessageResponseMessageCodec extends AbstractPacketCodec<SessionBrowserNextMessageResponseMessage>
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public SessionBrowserNextMessageResponseMessageCodec()
- {
- super(SESS_BROWSER_NEXTMESSAGE_RESP);
- }
-
- // Public --------------------------------------------------------
-
- // AbstractPacketCodec overrides ---------------------------------
-
- //TODO remove this in next refactoring
- private byte[] encodedMsg;
-
- public int getBodyLength(final SessionBrowserNextMessageResponseMessage packet) throws Exception
- {
- encodedMsg = StreamUtils.toBytes(packet.getMessage());
-
- int bodyLength = SIZE_INT + encodedMsg.length;
-
- return bodyLength;
- }
-
- @Override
- protected void encodeBody(final SessionBrowserNextMessageResponseMessage response, final RemotingBuffer out) throws Exception
- {
- out.putInt(encodedMsg.length);
- out.put(encodedMsg);
- encodedMsg = null;
- }
-
- @Override
- protected SessionBrowserNextMessageResponseMessage decodeBody(final RemotingBuffer in)
- throws Exception
- {
- int msgLength = in.getInt();
- byte[] encodedMsg = new byte[msgLength];
- in.get(encodedMsg);
- Message message = new MessageImpl();
- StreamUtils.fromBytes(message, encodedMsg);
-
- return new SessionBrowserNextMessageResponseMessage(message);
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private ----------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -12,7 +12,6 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_CREATESESSION_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_FLOWTOKEN;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CREATECONNECTION;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CREATECONNECTION_RESP;
@@ -22,6 +21,7 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PONG;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_RECEIVETOKENS;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ACKNOWLEDGE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ADD_DESTINATION;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BINDINGQUERY;
@@ -29,7 +29,6 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CANCEL;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_COMMIT;
@@ -74,7 +73,6 @@
import org.jboss.messaging.core.remoting.impl.codec.BytesPacketCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConnectionCreateSessionMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConnectionCreateSessionResponseMessageCodec;
-import org.jboss.messaging.core.remoting.impl.codec.ConsumerDeliverMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConsumerFlowTokenMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.CreateConnectionMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.CreateConnectionResponseMessageCodec;
@@ -84,12 +82,12 @@
import org.jboss.messaging.core.remoting.impl.codec.PongCodec;
import org.jboss.messaging.core.remoting.impl.codec.ProducerReceiveTokensMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ProducerSendMessageCodec;
+import org.jboss.messaging.core.remoting.impl.codec.ReceiveMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionAcknowledgeMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionAddDestinationMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBindingQueryMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBindingQueryResponseMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBrowserHasNextMessageResponseMessageCodec;
-import org.jboss.messaging.core.remoting.impl.codec.SessionBrowserNextMessageResponseMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCancelMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCreateBrowserMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCreateBrowserResponseMessageCodec;
@@ -145,7 +143,7 @@
addCodec(PROD_SEND, new ProducerSendMessageCodec());
- addCodec(CONS_DELIVER, new ConsumerDeliverMessageCodec());
+ addCodec(RECEIVE_MSG, new ReceiveMessageCodec());
// TextPacket are for testing purpose only!
addCodec(TEXT, new TextPacketCodec());
@@ -202,8 +200,6 @@
addCodecForEmptyPacket(SESS_BROWSER_NEXTMESSAGE);
- addCodec(SESS_BROWSER_NEXTMESSAGE_RESP, new SessionBrowserNextMessageResponseMessageCodec());
-
addCodec(SESS_XA_COMMIT, new SessionXACommitMessageCodec());
addCodec(SESS_XA_END, new SessionXAEndMessageCodec());
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.wireformat;
-
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
-
-import org.jboss.messaging.core.message.Message;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- */
-public class ConsumerDeliverMessage extends PacketImpl
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private final Message message;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public ConsumerDeliverMessage(final Message message)
- {
- super(CONS_DELIVER);
-
- assert message != null;
-
- this.message = message;
- }
-
- // Public --------------------------------------------------------
-
- public Message getMessage()
- {
- return message;
- }
-
- @Override
- public String toString()
- {
- StringBuffer buf = new StringBuffer(getParentString());
- buf.append(", message=" + message);
- buf.append("]");
- return buf.toString();
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketType.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -82,13 +82,14 @@
SESS_XA_GET_TIMEOUT_RESP ((byte)81),
// Consumer
- CONS_FLOWTOKEN ((byte)90),
- CONS_DELIVER ((byte)91),
+ CONS_FLOWTOKEN ((byte)90),
//Producer
PROD_SEND ((byte)100),
- PROD_RECEIVETOKENS ((byte)101);
+ PROD_RECEIVETOKENS ((byte)101),
+ RECEIVE_MSG ((byte)111);
+
// the ALL_TYPES map is used to find the PacketType corresponding to a given byte
// by using the static method from(byte)
private static final Map<Byte, PacketType> ALL_TYPES = new HashMap<Byte, PacketType>();
Copied: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java (from rev 4155, trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ConsumerDeliverMessage.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/ReceiveMessage.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.impl.wireformat;
+
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
+
+import org.jboss.messaging.core.message.Message;
+
+/**
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ */
+public class ReceiveMessage extends PacketImpl
+{
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private final Message message;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ public ReceiveMessage(final Message message)
+ {
+ super(RECEIVE_MSG);
+
+ assert message != null;
+
+ this.message = message;
+ }
+
+ // Public --------------------------------------------------------
+
+ public Message getMessage()
+ {
+ return message;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuffer buf = new StringBuffer(getParentString());
+ buf.append(", message=" + message);
+ buf.append("]");
+ return buf.toString();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Deleted: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionBrowserNextMessageResponseMessage.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.impl.wireformat;
-
-import org.jboss.messaging.core.message.Message;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- */
-public class SessionBrowserNextMessageResponseMessage extends PacketImpl
-{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private final Message message;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public SessionBrowserNextMessageResponseMessage(final Message message)
- {
- super(PacketType.SESS_BROWSER_NEXTMESSAGE_RESP);
-
- assert message != null;
-
- this.message = message;
- }
-
- // Public --------------------------------------------------------
-
- public Message getMessage()
- {
- return message;
- }
-
- @Override
- public String toString()
- {
- return getParentString() + ", message=" + message + "]";
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/DeliveryImpl.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -25,7 +25,7 @@
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.MessageReference;
import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.server.Delivery;
/**
@@ -85,7 +85,7 @@
copy.setDeliveryID(deliveryID);
- ConsumerDeliverMessage message = new ConsumerDeliverMessage(copy);
+ ReceiveMessage message = new ReceiveMessage(copy);
message.setTargetID(consumerID);
message.setExecutorID(sessionID);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -38,8 +38,8 @@
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerSession;
import org.jboss.messaging.util.SimpleString;
@@ -216,7 +216,7 @@
break;
case SESS_BROWSER_NEXTMESSAGE:
Message message = nextMessage();
- response = new SessionBrowserNextMessageResponseMessage(message);
+ response = new ReceiveMessage(message);
break;
case SESS_BROWSER_RESET:
reset();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/DummyInterceptor.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -13,7 +13,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.Packet;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
public class DummyInterceptor implements Interceptor
{
@@ -43,9 +43,9 @@
}
if (changeMessage)
{
- if (packet instanceof ConsumerDeliverMessage)
+ if (packet instanceof ReceiveMessage)
{
- ConsumerDeliverMessage deliver = (ConsumerDeliverMessage)packet;
+ ReceiveMessage deliver = (ReceiveMessage)packet;
log.info("msg = " + deliver.getMessage().getClass().getName());
deliver.getMessage().getHeaders().put("DummyInterceptor", "was here");
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-05-07 06:39:39 UTC (rev 4155)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-05-07 06:59:22 UTC (rev 4156)
@@ -13,13 +13,13 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_DELIVER;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_FLOWTOKEN;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CREATECONNECTION;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.NULL;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PING;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PONG;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_RECEIVETOKENS;
+import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.RECEIVE_MSG;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ACKNOWLEDGE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ADD_DESTINATION;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BINDINGQUERY;
@@ -27,7 +27,6 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_HASNEXTMESSAGE_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE_RESP;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CANCEL;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_COMMIT;
@@ -89,7 +88,6 @@
import org.jboss.messaging.core.remoting.impl.codec.BytesPacketCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConnectionCreateSessionMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConnectionCreateSessionResponseMessageCodec;
-import org.jboss.messaging.core.remoting.impl.codec.ConsumerDeliverMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ConsumerFlowTokenMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.CreateConnectionMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.CreateConnectionResponseMessageCodec;
@@ -97,13 +95,13 @@
import org.jboss.messaging.core.remoting.impl.codec.PongCodec;
import org.jboss.messaging.core.remoting.impl.codec.ProducerReceiveTokensMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.ProducerSendMessageCodec;
+import org.jboss.messaging.core.remoting.impl.codec.ReceiveMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.RemotingBuffer;
import org.jboss.messaging.core.remoting.impl.codec.SessionAcknowledgeMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionAddDestinationMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBindingQueryMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBindingQueryResponseMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionBrowserHasNextMessageResponseMessageCodec;
-import org.jboss.messaging.core.remoting.impl.codec.SessionBrowserNextMessageResponseMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCancelMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCreateBrowserMessageCodec;
import org.jboss.messaging.core.remoting.impl.codec.SessionCreateBrowserResponseMessageCodec;
@@ -135,7 +133,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
@@ -145,12 +142,12 @@
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerReceiveTokensMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
+import org.jboss.messaging.core.remoting.impl.wireformat.ReceiveMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionAcknowledgeMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionAddDestinationMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionCancelMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionCreateBrowserResponseMessage;
@@ -676,18 +673,18 @@
assertEquals(message.getTokens(), decodedMessage.getTokens());
}
- public void testConsumerDeliverMessage() throws Exception
+ public void testReceiveMessage() throws Exception
{
Message msg = new MessageImpl();
- ConsumerDeliverMessage message = new ConsumerDeliverMessage(msg);
- AbstractPacketCodec codec = new ConsumerDeliverMessageCodec();
+ ReceiveMessage message = new ReceiveMessage(msg);
+ AbstractPacketCodec codec = new ReceiveMessageCodec();
Packet decodedPacket = encodeAndCheckBytesAndDecode(message, codec,
StreamUtils.toBytes(msg));
- assertTrue(decodedPacket instanceof ConsumerDeliverMessage);
- ConsumerDeliverMessage decodedMessage = (ConsumerDeliverMessage) decodedPacket;
- assertEquals(CONS_DELIVER, decodedMessage.getType());
+ assertTrue(decodedPacket instanceof ReceiveMessage);
+ ReceiveMessage decodedMessage = (ReceiveMessage) decodedPacket;
+ assertEquals(RECEIVE_MSG, decodedMessage.getType());
assertEquals(message.getMessage().getMessageID(), decodedMessage
.getMessage().getMessageID());
}
@@ -850,22 +847,6 @@
assertEquals(SESS_BROWSER_NEXTMESSAGE, decodedPacket.getType());
}
- public void testSessionBrowserNextMessageResponseMessage() throws Exception
- {
- SessionBrowserNextMessageResponseMessage response = new SessionBrowserNextMessageResponseMessage(
- new MessageImpl());
- AbstractPacketCodec codec = new SessionBrowserNextMessageResponseMessageCodec();
-
- Packet decodedPacket = encodeAndCheckBytesAndDecode(response, codec,
- StreamUtils.toBytes(response.getMessage()));
-
- assertTrue(decodedPacket instanceof SessionBrowserNextMessageResponseMessage);
- SessionBrowserNextMessageResponseMessage decodedResponse = (SessionBrowserNextMessageResponseMessage) decodedPacket;
- assertEquals(SESS_BROWSER_NEXTMESSAGE_RESP, decodedResponse.getType());
- assertEquals(response.getMessage().getMessageID(), decodedResponse
- .getMessage().getMessageID());
- }
-
public void testSessionXACommitMessage() throws Exception
{
SessionXACommitMessage message = new SessionXACommitMessage(randomXid(),
More information about the jboss-cvs-commits
mailing list