[jboss-cvs] JBoss Messaging SVN: r3427 - in branches/Branch_JBMESSAGING-544: src/main/org/jboss/messaging/core/remoting/codec and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2007-12-06 08:44:14 -0500 (Thu, 06 Dec 2007)
New Revision: 3427

Removed:
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java
Modified:
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
   branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java
   branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestPacketHandler.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-544 Replace client-server transport with NIO based transport
* tidying up

Deleted: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java	2007-12-06 13:14:26 UTC (rev 3426)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java	2007-12-06 13:44:14 UTC (rev 3427)
@@ -1,67 +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;
-
-import static java.util.UUID.randomUUID;
-
-import java.util.UUID;
-
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-
-/**
- * A PacketHandler whose ID is randomly generated using UUID.
- * 
- * @see UUID#randomUUID()
- * 
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
- * 
- * @version <tt>$Revision$</tt>
- */
-public abstract class AbstractPacketHandler implements PacketHandler
-{
-
-   // Constants -----------------------------------------------------
-
-   private final String id;
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public AbstractPacketHandler()
-   {
-      this.id = randomUUID().toString();
-   }
-
-   // Public --------------------------------------------------------
-
-   @Override
-   public String toString()
-   {
-      return "AbstractPacketHandler[id=" + id + "]";
-   }
-
-   // PacketHandler implementation ----------------------------------
-
-   public String getID()
-   {
-      return id;
-   }
-
-   public abstract void handle(AbstractPacket packet, PacketSender sender);
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-}

Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java	2007-12-06 13:14:26 UTC (rev 3426)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java	2007-12-06 13:44:14 UTC (rev 3427)
@@ -17,7 +17,6 @@
  * 
  * @see PacketDispatcher#register(PacketHandler)
  * @see PacketDispatcher#unregister(String)
- * @see AbstractPacketHandler
  * 
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
  * 

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-12-06 13:14:26 UTC (rev 3426)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/codec/AbstractPacketCodec.java	2007-12-06 13:44:14 UTC (rev 3427)
@@ -16,6 +16,7 @@
 import java.nio.charset.CharacterCodingException;
 
 import org.jboss.jms.destination.JBossDestination;
+import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.Message;
 import org.jboss.messaging.core.impl.message.MessageFactory;
 import org.jboss.messaging.core.remoting.Constants;
@@ -36,6 +37,8 @@
 
    public static final int LONG_LENGTH = 8;
 
+   private static final Logger log = Logger.getLogger(AbstractPacketCodec.class);
+
    // Attributes ----------------------------------------------------
 
    private PacketType type;
@@ -93,14 +96,16 @@
       buffer.get(); // version
       if (buffer.remaining() < INT_LENGTH)
       {
-         System.out.println("need more data to read header length");
+         if (log.isDebugEnabled())
+            log.debug("need more data to read header length");
          // can not read next int
          return DecoderStatus.NEED_DATA;
       }
       int headerLength = buffer.getInt();
       if (buffer.remaining() < headerLength)
       {
-         System.out.println("need more data to read header");
+         if (log.isDebugEnabled())
+            log.debug("need more data to read header");
          return DecoderStatus.NEED_DATA;
       }
       buffer.getLong(); // correlation ID
@@ -121,7 +126,8 @@
 
       if (buffer.remaining() < INT_LENGTH)
       {
-         System.out.println("need more data to read body length");
+         if (log.isDebugEnabled())
+            log.debug("need more data to read body length");
          // can not read next int
          return DecoderStatus.NEED_DATA;
       }
@@ -132,7 +138,8 @@
       }
       if (buffer.remaining() < bodyLength)
       {
-         System.out.println("need more data to read body");
+         if (log.isDebugEnabled())
+            log.debug("need more data to read body");
          return DecoderStatus.NEED_DATA;
       }
       return DecoderStatus.OK;

Modified: branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestPacketHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestPacketHandler.java	2007-12-06 13:14:26 UTC (rev 3426)
+++ branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestPacketHandler.java	2007-12-06 13:44:14 UTC (rev 3427)
@@ -8,23 +8,31 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 
-import org.jboss.messaging.core.remoting.AbstractPacketHandler;
+import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
 import org.jboss.messaging.core.remoting.wireformat.TextPacket;
 
-public class TestPacketHandler extends AbstractPacketHandler
+public class TestPacketHandler implements PacketHandler
 {
+   private final String id;
    private final List<TextPacket> packets;
    private CountDownLatch latch;
-
+   
    public TestPacketHandler()
    {
+      this.id = UUID.randomUUID().toString();
       packets = new ArrayList<TextPacket>();
    }
 
+   public String getID()
+   {
+      return id;
+   }
+   
    public void await() throws InterruptedException
    {
      if (latch != null)