[jboss-cvs] JBoss Messaging SVN: r3707 - in trunk: tests/src/org/jboss/messaging/core/impl/test/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 12 10:04:46 EST 2008
Author: jmesnil
Date: 2008-02-12 10:04:46 -0500 (Tue, 12 Feb 2008)
New Revision: 3707
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/codec/DeliverMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionBrowserNextMessageResponseMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionSendMessageCodec.java
trunk/tests/src/org/jboss/messaging/core/impl/test/unit/MessageTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
Log:
* removed AbstractPacketCode.{encode|decode}Message() and used everywhere StreamUtils.{to|from}Bytes() instead
Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -11,16 +11,10 @@
import static org.jboss.messaging.core.remoting.codec.DecoderStatus.OK;
import static org.jboss.messaging.core.remoting.wireformat.AbstractPacket.NO_ID_SET;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.nio.charset.CharacterCodingException;
import javax.transaction.xa.Xid;
-import org.jboss.messaging.core.Message;
-import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.impl.XidImpl;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.PacketType;
@@ -53,16 +47,8 @@
// Static --------------------------------------------------------
- public static byte[] encodeMessage(Message message) throws Exception
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- message.write(new DataOutputStream(baos));
- baos.flush();
- return baos.toByteArray();
- }
-
// Constructors --------------------------------------------------
-
+
protected AbstractPacketCodec(PacketType type)
{
assert type != null;
@@ -219,14 +205,6 @@
protected abstract P decodeBody(RemotingBuffer buffer) throws Exception;
- protected static Message decodeMessage(byte[] b) throws Exception
- {
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
- Message msg = new MessageImpl();
- msg.read(new DataInputStream(bais));
- return msg;
- }
-
protected static void encodeXid(Xid xid, RemotingBuffer out)
{
out.putInt(xid.getFormatId());
Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/DeliverMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/DeliverMessageCodec.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/DeliverMessageCodec.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -9,7 +9,9 @@
import static org.jboss.messaging.core.remoting.wireformat.PacketType.SESS_DELIVER;
import org.jboss.messaging.core.Message;
+import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.remoting.wireformat.DeliverMessage;
+import org.jboss.messaging.util.StreamUtils;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -36,7 +38,7 @@
@Override
protected void encodeBody(DeliverMessage message, RemotingBuffer out) throws Exception
{
- byte[] encodedMsg = encodeMessage(message.getMessage());
+ byte[] encodedMsg = StreamUtils.toBytes(message.getMessage());
long deliveryID = message.getDeliveryID();
int bodyLength = encodedMsg.length
@@ -61,10 +63,11 @@
int msgLength = in.getInt();
byte[] encodedMsg = new byte[msgLength];
in.get(encodedMsg);
- Message msg = decodeMessage(encodedMsg);
+ Message message = new MessageImpl();
+ StreamUtils.fromBytes(message, encodedMsg);
long deliveryID = in.getLong();
- return new DeliverMessage(msg, deliveryID);
+ return new DeliverMessage(message, deliveryID);
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionBrowserNextMessageResponseMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionBrowserNextMessageResponseMessageCodec.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionBrowserNextMessageResponseMessageCodec.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -9,7 +9,9 @@
import static org.jboss.messaging.core.remoting.wireformat.PacketType.SESS_BROWSER_NEXTMESSAGE_RESP;
import org.jboss.messaging.core.Message;
+import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.remoting.wireformat.SessionBrowserNextMessageResponseMessage;
+import org.jboss.messaging.util.StreamUtils;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -36,7 +38,7 @@
@Override
protected void encodeBody(SessionBrowserNextMessageResponseMessage response, RemotingBuffer out) throws Exception
{
- byte[] encodedMsg = encodeMessage(response.getMessage());
+ byte[] encodedMsg = StreamUtils.toBytes(response.getMessage());
int bodyLength = INT_LENGTH + encodedMsg.length;
@@ -58,7 +60,8 @@
int msgLength = in.getInt();
byte[] encodedMsg = new byte[msgLength];
in.get(encodedMsg);
- Message message = decodeMessage(encodedMsg);
+ Message message = new MessageImpl();
+ StreamUtils.fromBytes(message, encodedMsg);
return new SessionBrowserNextMessageResponseMessage(message);
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionSendMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionSendMessageCodec.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/SessionSendMessageCodec.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -9,7 +9,9 @@
import static org.jboss.messaging.core.remoting.wireformat.PacketType.SESS_SEND;
import org.jboss.messaging.core.Message;
+import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.remoting.wireformat.SessionSendMessage;
+import org.jboss.messaging.util.StreamUtils;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -37,7 +39,7 @@
protected void encodeBody(SessionSendMessage message, RemotingBuffer out) throws Exception
{
String address = message.getAddress();
- byte[] encodedMsg = encodeMessage(message.getMessage());
+ byte[] encodedMsg = StreamUtils.toBytes(message.getMessage());
int bodyLength = sizeof(address) + INT_LENGTH + encodedMsg.length;
@@ -61,9 +63,10 @@
int msgLength = in.getInt();
byte[] encodedMsg = new byte[msgLength];
in.get(encodedMsg);
- Message msg = decodeMessage(encodedMsg);
+ Message message = new MessageImpl();
+ StreamUtils.fromBytes(message, encodedMsg);
- return new SessionSendMessage(address, msg);
+ return new SessionSendMessage(address, message);
}
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/core/impl/test/unit/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/impl/test/unit/MessageTest.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/tests/src/org/jboss/messaging/core/impl/test/unit/MessageTest.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -22,14 +22,9 @@
package org.jboss.messaging.core.impl.test.unit;
import static org.jboss.messaging.test.unit.RandomUtil.randomByte;
-import static org.jboss.messaging.test.unit.RandomUtil.randomBytes;
import static org.jboss.messaging.test.unit.RandomUtil.randomInt;
import static org.jboss.messaging.test.unit.RandomUtil.randomLong;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +34,7 @@
import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.impl.QueueImpl;
import org.jboss.messaging.test.unit.UnitTestCase;
+import org.jboss.messaging.util.StreamUtils;
/**
*
@@ -408,14 +404,9 @@
Message msg = new MessageImpl(randomLong(), randomInt(), true, randomLong(), randomLong(), randomByte(),null, null);
msg.setDeliveryCount(randomInt());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- msg.write(new DataOutputStream(baos));
- baos.flush();
- byte[] b = baos.toByteArray();
-
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
+ byte[] bytes = StreamUtils.toBytes(msg);
Message unmarshalledMsg = new MessageImpl();
- unmarshalledMsg.read(new DataInputStream(bais));
+ StreamUtils.fromBytes(unmarshalledMsg, bytes);
assertEquals(msg, unmarshalledMsg);
assertEquals("messageID", msg.getMessageID(), unmarshalledMsg.getMessageID());
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java 2008-02-12 14:54:33 UTC (rev 3706)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java 2008-02-12 15:04:46 UTC (rev 3707)
@@ -11,7 +11,6 @@
import static org.jboss.messaging.core.remoting.codec.AbstractPacketCodec.INT_LENGTH;
import static org.jboss.messaging.core.remoting.codec.AbstractPacketCodec.LONG_LENGTH;
import static org.jboss.messaging.core.remoting.codec.AbstractPacketCodec.TRUE;
-import static org.jboss.messaging.core.remoting.codec.AbstractPacketCodec.encodeMessage;
import static org.jboss.messaging.core.remoting.codec.AbstractPacketCodec.sizeof;
import static org.jboss.messaging.core.remoting.impl.mina.MinaPacketCodec.NOT_NULL_STRING;
import static org.jboss.messaging.core.remoting.impl.mina.MinaPacketCodec.NULL_BYTE;
@@ -197,6 +196,7 @@
import org.jboss.messaging.test.unit.RandomUtil;
import org.jboss.messaging.test.unit.UnitTestCase;
import org.jboss.messaging.util.Logger;
+import org.jboss.messaging.util.StreamUtils;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
@@ -548,7 +548,7 @@
AbstractPacketCodec codec = new SessionSendMessageCodec();
SimpleRemotingBuffer buffer = encode(packet, codec);
checkHeader(buffer, packet);
- checkBody(buffer, packet.getAddress(), encodeMessage(packet.getMessage()));
+ checkBody(buffer, packet.getAddress(), StreamUtils.toBytes(packet.getMessage()));
buffer.rewind();
AbstractPacket p = codec.decode(buffer);
@@ -664,7 +664,7 @@
AbstractPacketCodec codec = new DeliverMessageCodec();
SimpleRemotingBuffer buffer = encode(message, codec);
checkHeader(buffer, message);
- checkBody(buffer, encodeMessage(msg), message.getDeliveryID());
+ checkBody(buffer, StreamUtils.toBytes(msg), message.getDeliveryID());
buffer.rewind();
AbstractPacket decodedPacket = codec.decode(buffer);
@@ -906,7 +906,7 @@
AbstractPacketCodec codec = new SessionBrowserNextMessageResponseMessageCodec();
SimpleRemotingBuffer buffer = encode(response, codec);
checkHeader(buffer, response);
- checkBody(buffer, encodeMessage(msg));
+ checkBody(buffer, StreamUtils.toBytes(msg));
buffer.rewind();
AbstractPacket decodedPacket = codec.decode(buffer);
More information about the jboss-cvs-commits
mailing list