[jboss-cvs] JBoss Messaging SVN: r3355 - branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 21 10:52:35 EST 2007


Author: jmesnil
Date: 2007-11-21 10:52:35 -0500 (Wed, 21 Nov 2007)
New Revision: 3355

Modified:
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/CloseMessageCodec.java
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/GetClientIDRequestCodec.java
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/NullPacketCodec.java
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StartConnectionMessageCodec.java
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StopConnectionMessageCodec.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-544: Replace client-server transport with NIO based transport
* factorized codec for packet with empty content using EmptyBodyPacketCodec

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/CloseMessageCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/CloseMessageCodec.java	2007-11-21 15:43:36 UTC (rev 3354)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/CloseMessageCodec.java	2007-11-21 15:52:35 UTC (rev 3355)
@@ -8,15 +8,13 @@
 
 import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.remoting.wireformat.CloseMessage;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  */
 public class CloseMessageCodec extends
-      AbstractPacketCodec<CloseMessage>
+      EmptyBodyPacketCodec<CloseMessage>
 {
    // Constants -----------------------------------------------------
 
@@ -33,21 +31,11 @@
 
    // Public --------------------------------------------------------
 
-   // AbstractPacketCodec overrides ---------------------------------
+   // EmptyBodyPacketCodec overrides ---------------------------------
 
    @Override
-   protected void encodeBody(IoSession session, CloseMessage message,
-         IoBuffer out) throws Exception
+   protected CloseMessage newPacket()
    {
-      out.putInt(0);
-   }
-
-   @Override
-   protected CloseMessage decodeBody(IoSession session, IoBuffer in)
-         throws Exception
-   {
-      in.getInt(); // skip body length
-
       return new CloseMessage();
    }
 

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/GetClientIDRequestCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/GetClientIDRequestCodec.java	2007-11-21 15:43:36 UTC (rev 3354)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/GetClientIDRequestCodec.java	2007-11-21 15:52:35 UTC (rev 3355)
@@ -8,15 +8,13 @@
 
 import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETCLIENTID;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.remoting.wireformat.GetClientIDRequest;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  */
 public class GetClientIDRequestCodec extends
-      AbstractPacketCodec<GetClientIDRequest>
+      EmptyBodyPacketCodec<GetClientIDRequest>
 {
    // Constants -----------------------------------------------------
 
@@ -33,22 +31,11 @@
 
    // Public --------------------------------------------------------
 
-   // AbstractPacketCodec overrides ---------------------------------
+   // EmptyBodyPacketCodec overrides ---------------------------------
 
    @Override
-   protected void encodeBody(IoSession session, GetClientIDRequest request,
-         IoBuffer out) throws Exception
+   protected GetClientIDRequest newPacket()
    {
-      // no body
-      out.putInt(0);
-   }
-
-   @Override
-   protected GetClientIDRequest decodeBody(IoSession session, IoBuffer in)
-         throws Exception
-   {
-      in.getInt(); // skip body length
-
       return new GetClientIDRequest();
    }
 

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/NullPacketCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/NullPacketCodec.java	2007-11-21 15:43:36 UTC (rev 3354)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/NullPacketCodec.java	2007-11-21 15:52:35 UTC (rev 3355)
@@ -8,14 +8,12 @@
 
 import static org.jboss.messaging.core.remoting.wireformat.PacketType.NULL;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.remoting.wireformat.NullPacket;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  */
-public class NullPacketCodec extends AbstractPacketCodec<NullPacket>
+public class NullPacketCodec extends EmptyBodyPacketCodec<NullPacket>
 {
 
    // Constants -----------------------------------------------------
@@ -33,24 +31,15 @@
       super(NULL);
    }
 
-   // AbstractPackedCodec overrides----------------------------------
-   
    @Override
-   protected void encodeBody(IoSession session, NullPacket packet,
-         IoBuffer out) throws Exception
+   protected NullPacket newPacket()
    {
-      // no body
-      out.putInt(0);
-   }
-
-   @Override
-   protected NullPacket decodeBody(IoSession session, IoBuffer in)
-         throws Exception
-   {
-      in.getInt(); // skip body length
       return new NullPacket();
    }
+
+   // EmptyBodyPacketCodec overrides----------------------------------
    
+   
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StartConnectionMessageCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StartConnectionMessageCodec.java	2007-11-21 15:43:36 UTC (rev 3354)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StartConnectionMessageCodec.java	2007-11-21 15:52:35 UTC (rev 3355)
@@ -8,15 +8,13 @@
 
 import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STARTCONNECTION;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.remoting.wireformat.StartConnectionMessage;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  */
 public class StartConnectionMessageCodec extends
-      AbstractPacketCodec<StartConnectionMessage>
+      EmptyBodyPacketCodec<StartConnectionMessage>
 {
    // Constants -----------------------------------------------------
 
@@ -33,22 +31,11 @@
 
    // Public --------------------------------------------------------
 
-   // AbstractPacketCodec overrides ---------------------------------
+   // EmptyBodyPacketCodec overrides --------------------------------
 
    @Override
-   protected void encodeBody(IoSession session, StartConnectionMessage message,
-         IoBuffer out) throws Exception
+   protected StartConnectionMessage newPacket()
    {
-      // no body
-      out.putInt(0);
-   }
-
-   @Override
-   protected StartConnectionMessage decodeBody(IoSession session, IoBuffer in)
-         throws Exception
-   {
-      in.getInt(); // skip body length
-
       return new StartConnectionMessage();
    }
 

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StopConnectionMessageCodec.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StopConnectionMessageCodec.java	2007-11-21 15:43:36 UTC (rev 3354)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/StopConnectionMessageCodec.java	2007-11-21 15:52:35 UTC (rev 3355)
@@ -8,8 +8,6 @@
 
 import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STOPCONNECTION;
 
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
 import org.jboss.messaging.core.remoting.wireformat.StopConnectionMessage;
 
 /**
@@ -18,7 +16,7 @@
  * @version <tt>$Revision$</tt>
  */
 public class StopConnectionMessageCodec extends
-      AbstractPacketCodec<StopConnectionMessage>
+      EmptyBodyPacketCodec<StopConnectionMessage>
 {
    // Constants -----------------------------------------------------
 
@@ -35,22 +33,11 @@
 
    // Public --------------------------------------------------------
 
-   // AbstractPacketCodec overrides ---------------------------------
+   // EmptyBodyPacketCodec overrides --------------------------------
 
    @Override
-   protected void encodeBody(IoSession session, StopConnectionMessage message,
-         IoBuffer out) throws Exception
+   protected StopConnectionMessage newPacket()
    {
-      // no body
-      out.putInt(0);
-   }
-
-   @Override
-   protected StopConnectionMessage decodeBody(IoSession session, IoBuffer in)
-         throws Exception
-   {
-      in.getInt(); // skip body length
-
       return new StopConnectionMessage();
    }
 




More information about the jboss-cvs-commits mailing list