Adding new CompositePacket

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@653 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/PacketRouter.java

@@ -11,7 +11,7 @@
 
 package org.jivesoftware.messenger;
 
-import org.xmpp.packet.Packet;
+import org.jivesoftware.messenger.net.CompositePacket;
 
 /**
  * <p>An uber router that can handle any packet type.</p>
@@ -32,5 +32,5 @@ public interface PacketRouter extends IQRouter, MessageRouter, PresenceRouter {
      * @throws NullPointerException     If the packet is null
      * @throws IllegalArgumentException If the packet is not one of the three XMPP packet types
      */
-    public void route(Packet packet) throws IllegalArgumentException, NullPointerException;
+    public void route(CompositePacket packet) throws IllegalArgumentException, NullPointerException;
 }

src/java/org/jivesoftware/messenger/net/SocketReadThread.java

@@ -33,6 +33,7 @@ import org.xmpp.packet.IQ;
 import org.xmpp.packet.Message;
 import org.xmpp.packet.Presence;
 import org.xmpp.packet.Roster;
+import org.xmpp.packet.Packet;
 
 /**
  * @author Derek DeMoro
@@ -127,7 +128,7 @@ public class SocketReadThread extends Thread {
                         packet.setType(Presence.Type.unavailable);
                         packet.setFrom(session.getAddress());
 
-                        CompositePacket<Presence> compPacket = new CompositePacket<Presence>(packet, session);
+                        CompositePacket compPacket = new CompositePacket(packet, session);
                         router.route(compPacket);
                         clearSignout = true;
                     }
@@ -179,32 +180,34 @@ public class SocketReadThread extends Thread {
 
             if (document != null) {
                 Element doc = document.getRootElement();
-                CompositePacket packet = null;
+
+                Packet packet = null;
                 String tag = doc.getName();
                 if ("message".equals(tag)) {
-                    Message message = new Message(doc);
-                    packet = new CompositePacket<Message>(message, session);
+                    packet = new Message(doc);
                 }
                 else if ("presence".equals(tag)) {
-                    Presence presence = new Presence(doc);
-                    packet = new CompositePacket<Presence>(presence, session);
+                    packet = new Presence(doc);
 
+                    Presence.Type type = ((Presence)packet).getType();
                     // Update the flag that indicates if the user made a clean sign out
-                    clearSignout = (Presence.Type.unavailable == presence.getType() ? true : false);
+                    clearSignout = (Presence.Type.unavailable == type ? true : false);
                 }
                 else if ("iq".equals(tag)) {
-                    IQ iq = getIQ(doc);
-                    packet = new CompositePacket<IQ>(iq, session);
+                    packet = getIQ(doc);
                 }
                 else {
                     throw new XmlPullParserException(LocaleUtils.getLocalizedString("admin.error.packet.tag") + tag);
                 }
 
+                // Create the composite packet
+                CompositePacket compositePacket = new CompositePacket(packet, session);
+
                 // Route to the Packet Auditor
-                auditor.audit(packet);
+                auditor.audit(compositePacket);
 
                 // Route to PacketRouter
-                router.route(packet);
+                router.route(compositePacket);
 
                 // Increment number of sessions.
                 session.incrementClientPacketCount();