fixes igniterealtime#139: Refactor: centralize logic to determine 'direction'

The concept of 'direction' of an ArchivedMessage is, to some, counter-intuitive. The mechanism that determines the direction of a particular stanza should be centralized to reduce confusion.

Author: guusdk

src/java/com/reucon/openfire/plugin/archive/impl/JdbcPersistenceManager.java

@@ -626,17 +626,9 @@ static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, St
         final JID from = new JID(fromJID + ( fromJIDResource == null || fromJIDResource.isEmpty() ? "" : "/" + fromJIDResource ));
         final JID to = new JID(toJID + ( toJIDResource == null || toJIDResource.isEmpty() ? "" : "/" + toJIDResource ));
 
-        final ArchivedMessage.Direction direction;
-        final JID with;
-        if (owner.asBareJID().equals(to.asBareJID())) {
-            direction = Direction.from;
-            with = from;
-        } else {
-            direction = Direction.to;
-            with = to;
-        }
-        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, direction, with, sid, body, stanza);
-        return archivedMessage;
+        final ArchivedMessage.Direction direction = ArchivedMessage.Direction.getDirection(owner, to);
+        final JID with = direction == Direction.from ? from : to;
+        return new ArchivedMessage(id, sentDate, direction, with, sid, body, stanza);
     }
 
     private static Long dateToMillis(Date date) {

src/java/com/reucon/openfire/plugin/archive/model/ArchivedMessage.java

@@ -32,7 +32,23 @@ public enum Direction {
         /**
          * A message received by the owner.
          */
-        from
+        from;
+
+        /**
+         * Returns a direction instance for a particular stanza, based on the owner of the archive that the stanza is
+         * in, and the addressee ('to') of the stanza.
+         *
+         * @param owner The owner of the archive that a message is in.
+         * @param addressee The addressee of the stanza.
+         * @return The direction of the stanza.
+         */
+        public static Direction getDirection(@Nonnull final JID owner, @Nonnull final JID addressee) {
+            if (owner.asBareJID().equals(addressee.asBareJID())) {
+                return Direction.from;
+            } else {
+                return Direction.to;
+            }
+        }
     }
 
     @Nullable