[jboss-cvs] JBoss Messaging SVN: r3834 - in trunk/src/main/org/jboss/messaging/core: server/impl and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 3 11:37:03 EST 2008
Author: jmesnil
Date: 2008-03-03 11:37:03 -0500 (Mon, 03 Mar 2008)
New Revision: 3834
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
Log:
* used switch statements to handle packets (instead of if..else statements)
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaDecoder.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -18,6 +18,7 @@
import org.jboss.messaging.core.remoting.impl.codec.DecoderStatus;
import org.jboss.messaging.core.remoting.impl.codec.RemotingBuffer;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -44,9 +45,9 @@
// Public --------------------------------------------------------
- public void put(byte type, AbstractPacketCodec codec)
+ public void put(PacketType type, AbstractPacketCodec codec)
{
- codecs.put(type, codec);
+ codecs.put(type.byteValue(), codec);
}
// MessageDecoder implementation ---------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaEncoder.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -16,6 +16,7 @@
import org.jboss.messaging.core.remoting.impl.codec.AbstractPacketCodec;
import org.jboss.messaging.core.remoting.impl.codec.RemotingBuffer;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
+import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -29,7 +30,7 @@
// Attributes ----------------------------------------------------
- private final Map<Byte, AbstractPacketCodec> codecs;
+ private final Map<PacketType, AbstractPacketCodec> codecs;
// Static --------------------------------------------------------
@@ -37,11 +38,11 @@
MinaEncoder()
{
- codecs = new HashMap<Byte, AbstractPacketCodec>();
+ codecs = new HashMap<PacketType, AbstractPacketCodec>();
}
// Public --------------------------------------------------------
- public void put(byte type, AbstractPacketCodec codec)
+ public void put(PacketType type, AbstractPacketCodec codec)
{
codecs.put(type, codec);
}
@@ -51,13 +52,13 @@
public void encode(IoSession session, Packet packet,
ProtocolEncoderOutput out) throws Exception
{
- final IoBuffer buffer = IoBuffer.allocate(256);
+ final IoBuffer buffer = IoBuffer.allocate(1024);
// Enable auto-expand for easier encoding
buffer.setAutoExpand(true);
RemotingBuffer wrapper = new BufferWrapper(buffer);
- AbstractPacketCodec codec = codecs.get(packet.getType().byteValue());
+ AbstractPacketCodec codec = codecs.get(packet.getType());
if (codec == null)
{
throw new IllegalStateException("no encoder has been registered for " + packet);
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-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/PacketCodecFactory.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -359,8 +359,8 @@
{
try
{
- decoder.put(type.byteValue(), codec);
- encoder.put(type.byteValue(), codec);
+ decoder.put(type, codec);
+ encoder.put(type, codec);
} catch (Exception e)
{
log.error("Unable to add codec for packet " + type, e);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -21,11 +21,6 @@
*/
package org.jboss.messaging.core.server.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-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_NEXTMESSAGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BROWSER_RESET;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -213,29 +208,24 @@
Packet response = null;
PacketType type = packet.getType();
-
- if (type == SESS_BROWSER_HASNEXTMESSAGE)
+ switch (type)
{
- response = new SessionBrowserHasNextMessageResponseMessage(hasNextMessage());
- }
- else if (type == SESS_BROWSER_NEXTMESSAGE)
- {
- Message message = nextMessage();
-
+ case SESS_BROWSER_HASNEXTMESSAGE:
+ response = new SessionBrowserHasNextMessageResponseMessage(hasNextMessage());
+ break;
+ case SESS_BROWSER_NEXTMESSAGE:
+ Message message = nextMessage();
response = new SessionBrowserNextMessageResponseMessage(message);
- }
- else if (type == SESS_BROWSER_RESET)
- {
+ break;
+ case SESS_BROWSER_RESET:
reset();
- }
- else if (type == CLOSE)
- {
+ break;
+ case CLOSE:
close();
- }
- else
- {
+ break;
+ default:
throw new MessagingException(MessagingException.UNSUPPORTED_PACKET,
- "Unsupported packet " + type);
+ "Unsupported packet " + type);
}
// reply if necessary
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -21,11 +21,6 @@
*/
package org.jboss.messaging.core.server.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_CREATESESSION;
-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 org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
@@ -62,28 +57,24 @@
PacketType type = packet.getType();
- if (type == CONN_CREATESESSION)
+ switch (type)
{
- ConnectionCreateSessionMessage request = (ConnectionCreateSessionMessage) packet;
-
+ case CONN_CREATESESSION:
+ ConnectionCreateSessionMessage request = (ConnectionCreateSessionMessage) packet;
response = connection.createSession(request.isXA(), request.isAutoCommitSends(), request.isAutoCommitAcks(), sender);
- }
- else if (type == CONN_START)
- {
+ break;
+ case CONN_START:
connection.start();
- }
- else if (type == CONN_STOP)
- {
+ break;
+ case CONN_STOP:
connection.stop();
- }
- else if (type == CLOSE)
- {
+ break;
+ case CLOSE:
connection.close();
- }
- else
- {
+ break;
+ default:
throw new MessagingException(MessagingException.UNSUPPORTED_PACKET,
- "Unsupported packet " + type);
+ "Unsupported packet " + type);
}
// reply if necessary
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -21,9 +21,6 @@
*/
package org.jboss.messaging.core.server.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_FLOWTOKEN;
-
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
@@ -59,19 +56,16 @@
Packet response = null;
PacketType type = packet.getType();
-
- if (type == CONS_FLOWTOKEN)
+ switch (type)
{
+ case CONS_FLOWTOKEN:
ConsumerFlowTokenMessage message = (ConsumerFlowTokenMessage) packet;
-
consumer.receiveTokens(message.getTokens());
- }
- else if (type == CLOSE)
- {
+ break;
+ case CLOSE:
consumer.close();
- }
- else
- {
+ break;
+ default:
throw new MessagingException(MessagingException.UNSUPPORTED_PACKET,
"Unsupported packet " + type);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -21,9 +21,6 @@
*/
package org.jboss.messaging.core.server.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
-
import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
@@ -58,19 +55,16 @@
Packet response = null;
PacketType type = packet.getType();
-
- if (type == PROD_SEND)
+ switch (type)
{
+ case PROD_SEND:
ProducerSendMessage message = (ProducerSendMessage) packet;
-
producer.send(message.getAddress(), message.getMessage());
- }
- else if (type == CLOSE)
- {
+ break;
+ case CLOSE:
producer.close();
- }
- else
- {
+ break;
+ default:
throw new MessagingException(MessagingException.UNSUPPORTED_PACKET,
"Unsupported packet " + type);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-02-29 16:18:08 UTC (rev 3833)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-03-03 16:37:03 UTC (rev 3834)
@@ -21,31 +21,6 @@
*/
package org.jboss.messaging.core.server.impl;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ACKNOWLEDGE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_BINDINGQUERY;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CANCEL;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_COMMIT;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEBROWSER;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATECONSUMER;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEPRODUCER;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_CREATEQUEUE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_DELETE_QUEUE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_QUEUEQUERY;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_ROLLBACK;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_COMMIT;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_END;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_FORGET;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_GET_TIMEOUT;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_INDOUBT_XIDS;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_JOIN;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_PREPARE;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_RESUME;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_ROLLBACK;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_SET_TIMEOUT;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_START;
-import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.SESS_XA_SUSPEND;
-
import java.util.List;
import javax.transaction.xa.Xid;
@@ -111,164 +86,156 @@
Packet response = null;
PacketType type = packet.getType();
-
- // TODO use a switch for this
- if (type == SESS_CREATECONSUMER)
+ switch (type)
{
+ case SESS_CREATECONSUMER:
+ {
SessionCreateConsumerMessage request = (SessionCreateConsumerMessage) packet;
-
response = session.createConsumer(request.getQueueName(), request
.getFilterString(), request.isNoLocal(), request.isAutoDeleteQueue(), prefetchSize);
+ break;
}
- else if (type == SESS_CREATEQUEUE)
+ case SESS_CREATEQUEUE:
{
SessionCreateQueueMessage request = (SessionCreateQueueMessage) packet;
-
session.createQueue(request.getAddress(), request.getQueueName(), request
.getFilterString(), request.isDurable(), request
.isTemporary());
+ break;
}
- else if (type == SESS_DELETE_QUEUE)
+ case SESS_DELETE_QUEUE:
{
SessionDeleteQueueMessage request = (SessionDeleteQueueMessage) packet;
-
session.deleteQueue(request.getQueueName());
+ break;
}
- else if (type == SESS_QUEUEQUERY)
+ case SESS_QUEUEQUERY:
{
SessionQueueQueryMessage request = (SessionQueueQueryMessage) packet;
-
response = session.executeQueueQuery(request);
+ break;
}
- else if (type == SESS_BINDINGQUERY)
+ case SESS_BINDINGQUERY:
{
SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet;
-
response = session.executeBindingQuery(request);
+ break;
}
- else if (type == SESS_CREATEBROWSER)
+ case SESS_CREATEBROWSER:
{
SessionCreateBrowserMessage request = (SessionCreateBrowserMessage) packet;
-
response = session.createBrowser(request.getQueueName(), request
.getFilterString());
+ break;
}
- else if (type == SESS_CREATEPRODUCER)
+ case SESS_CREATEPRODUCER:
{
SessionCreateProducerMessage request = (SessionCreateProducerMessage) packet;
-
response = session.createProducer(request.getAddress());
+ break;
}
- else if (type == CLOSE)
+ case CLOSE:
+ session.close();
+ break;
+ case SESS_ACKNOWLEDGE:
{
- session.close();
- }
- else if (type == SESS_ACKNOWLEDGE)
- {
SessionAcknowledgeMessage message = (SessionAcknowledgeMessage) packet;
-
session.acknowledge(message.getDeliveryID(), message.isAllUpTo());
+ break;
}
- else if (type == SESS_COMMIT)
+ case SESS_COMMIT:
+ session.commit();
+ break;
+ case SESS_ROLLBACK:
+ session.rollback();
+ break;
+ case SESS_CANCEL:
{
- session.commit();
- }
- else if (type == SESS_ROLLBACK)
- {
- session.rollback();
- }
- else if (type == SESS_CANCEL)
- {
SessionCancelMessage message = (SessionCancelMessage) packet;
-
session.cancel(message.getDeliveryID(), message.isExpired());
+ break;
}
- else if (type == SESS_XA_COMMIT)
+ case SESS_XA_COMMIT:
{
SessionXACommitMessage message = (SessionXACommitMessage) packet;
-
response = session.XACommit(message.isOnePhase(), message.getXid());
+ break;
}
- else if (type == SESS_XA_END)
+ case SESS_XA_END:
{
SessionXAEndMessage message = (SessionXAEndMessage) packet;
-
response = session.XAEnd(message.getXid(), message.isFailed());
+ break;
}
- else if (type == SESS_XA_FORGET)
+ case SESS_XA_FORGET:
{
SessionXAForgetMessage message = (SessionXAForgetMessage) packet;
-
response = session.XAForget(message.getXid());
+ break;
}
- else if (type == SESS_XA_JOIN)
+ case SESS_XA_JOIN:
{
SessionXAJoinMessage message = (SessionXAJoinMessage) packet;
-
response = session.XAJoin(message.getXid());
+ break;
}
- else if (type == SESS_XA_RESUME)
+ case SESS_XA_RESUME:
{
SessionXAResumeMessage message = (SessionXAResumeMessage) packet;
-
response = session.XAResume(message.getXid());
+ break;
}
- else if (type == SESS_XA_ROLLBACK)
+ case SESS_XA_ROLLBACK:
{
SessionXARollbackMessage message = (SessionXARollbackMessage) packet;
-
response = session.XARollback(message.getXid());
+ break;
}
- else if (type == SESS_XA_START)
+ case SESS_XA_START:
{
SessionXAStartMessage message = (SessionXAStartMessage) packet;
-
response = session.XAStart(message.getXid());
+ break;
}
- else if (type == SESS_XA_SUSPEND)
- {
+ case SESS_XA_SUSPEND:
response = session.XASuspend();
- }
- else if (type == SESS_XA_PREPARE)
+ break;
+ case SESS_XA_PREPARE:
{
SessionXAPrepareMessage message = (SessionXAPrepareMessage) packet;
-
response = session.XAPrepare(message.getXid());
+ break;
}
- else if (type == SESS_XA_INDOUBT_XIDS)
- {
+ case SESS_XA_INDOUBT_XIDS:
List<Xid> xids = session.getInDoubtXids();
-
response = new SessionXAGetInDoubtXidsResponseMessage(xids);
- }
- else if (type == SESS_XA_GET_TIMEOUT)
- {
+ break;
+ case SESS_XA_GET_TIMEOUT:
response = new SessionXAGetTimeoutResponseMessage(session.getXATimeout());
- }
- else if (type == SESS_XA_SET_TIMEOUT)
+ break;
+ case SESS_XA_SET_TIMEOUT:
{
SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage) packet;
-
response = new SessionXASetTimeoutResponseMessage(session.setXATimeout(message
.getTimeoutSeconds()));
+ break;
}
- else if (type == PacketType.SESS_ADD_ADDRESS)
+ case SESS_ADD_ADDRESS:
{
SessionAddAddressMessage message = (SessionAddAddressMessage) packet;
-
session.addAddress(message.getAddress());
+ break;
}
- else if (type == PacketType.SESS_REMOVE_ADDRESS)
+ case SESS_REMOVE_ADDRESS:
{
SessionRemoveAddressMessage message = (SessionRemoveAddressMessage) packet;
-
session.removeAddress(message.getAddress());
+ break;
}
- else
- {
+ default:
throw new MessagingException(MessagingException.UNSUPPORTED_PACKET, "Unsupported packet " + type);
}
-
+
// reply if necessary
if (response == null && packet.isOneWay() == false)
{
More information about the jboss-cvs-commits
mailing list