fixes #139: Reduce code duplication for Stable/Unique stanza IDs

Code duplication (and thus complexity) is reduced by centralizing where an appropriate stanza ID is obtained.

Author: guusdk

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

@@ -353,14 +353,14 @@ public Collection<ArchivedMessage> findMessages(Date startDate, Date endDate, JI
             final String first;
             final String last;
             if ( useStableID ) {
-                final String firstSid = firstMessage.getStableId();
+                final String firstSid = firstMessage.getStableId(owner);
                 if ( firstSid != null && !firstSid.isEmpty() ) {
                     first = firstSid;
                 } else {
                     // Issue #98: Fall-back to using the database-identifier. Although not a stable-id, it at least gives the client the option to paginate.
                     first = firstMessage.getId().toString();
                 }
-                final String lastSid = lastMessage.getStableId();
+                final String lastSid = lastMessage.getStableId(owner);
                 if ( lastSid != null && !lastSid.isEmpty()) {
                     last = lastSid;
                 } else {
@@ -609,26 +609,12 @@ public static ArchivedMessage getArchivedMessage( long messageId, JID owner )
     }
 
     static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, String fromJIDResource, String toJID, String toJIDResource, Date sentDate, String body, String stanza, Long id) throws DocumentException {
-        String sid;
-        if (stanza != null) {
-            try {
-                final Document doc = DocumentHelper.parseText(stanza);
-                final Message message = new Message(doc.getRootElement());
-                sid = StanzaIDUtil.findFirstUniqueAndStableStanzaID(message, owner.toBareJID());
-            } catch (Exception e) {
-                Log.warn("An exception occurred while parsing message with ID {}", id, e);
-                sid = null;
-            }
-        } else {
-            sid = null;
-        }
-
         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 = ArchivedMessage.Direction.getDirection(owner, to);
         final JID with = direction == Direction.from ? from : to;
-        return new ArchivedMessage(id, sentDate, direction, with, sid, body, stanza);
+        return new ArchivedMessage(id, sentDate, direction, with, body, stanza);
     }
 
     private static Long dateToMillis(Date date) {

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

@@ -100,14 +100,14 @@ public Collection<ArchivedMessage> findMessages(Date startDate, Date endDate, JI
             final String first;
             final String last;
             if ( useStableID ) {
-                final String firstSid = firstMessage.getStableId();
+                final String firstSid = firstMessage.getStableId(owner);
                 if ( firstSid != null && !firstSid.isEmpty() ) {
                     first = firstSid;
                 } else {
                     // Issue #98: Fall-back to using the database-identifier. Although not a stable-id, it at least gives the client the option to paginate.
                     first = firstMessage.getId().toString();
                 }
-                final String lastSid = lastMessage.getStableId();
+                final String lastSid = lastMessage.getStableId(owner);
                 if ( lastSid != null && !lastSid.isEmpty()) {
                     last = lastSid;
                 } else {
@@ -235,22 +235,7 @@ static protected ArchivedMessage asArchivedMessage(JID roomJID, String senderJID
             with = roomJID;
         }
 
-        String sid;
-        if (stanza != null) {
-            try {
-                final Document doc = DocumentHelper.parseText(stanza);
-                final Message message = new Message(doc.getRootElement());
-                sid = StanzaIDUtil.findFirstUniqueAndStableStanzaID(message, roomJID.toBareJID());
-            } catch (Exception e) {
-                Log.warn("An exception occurred while parsing message with ID {}", id, e);
-                sid = null;
-            }
-        } else {
-            sid = null;
-        }
-
-        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, ArchivedMessage.Direction.from, with, sid, body, stanza);
-        return archivedMessage;
+        return new ArchivedMessage(id, sentDate, ArchivedMessage.Direction.from, with, body, stanza);
     }
 
     static Long parseIdentifier( String value, MUCRoom room, boolean useStableID )

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

@@ -1,5 +1,6 @@
 package com.reucon.openfire.plugin.archive.model;
 
+import com.reucon.openfire.plugin.archive.util.StanzaIDUtil;
 import org.dom4j.*;
 import org.jivesoftware.database.JiveID;
 import org.jivesoftware.openfire.XMPPServer;
@@ -69,15 +70,11 @@ public static Direction getDirection(@Nonnull final JID owner, @Nonnull final JI
     @Nullable
     private final Message stanza;
 
-    @Nullable
-    private final String stableId;
-
-    public ArchivedMessage(@Nullable final Long id, @Nonnull final Date time, @Nonnull final Direction direction, @Nonnull final JID with, @Nullable final String stableId, @Nullable final String body, @Nullable final String stanza) throws DocumentException {
+    public ArchivedMessage(@Nullable final Long id, @Nonnull final Date time, @Nonnull final Direction direction, @Nonnull final JID with, @Nullable final String body, @Nullable final String stanza) throws DocumentException {
         this.id = id;
         this.time = time;
         this.direction = direction;
         this.with = with;
-        this.stableId = stableId;
         this.body = body;
 
         if ( stanza != null) {
@@ -171,16 +168,24 @@ public JID getWith() {
      * @return a stable and unique stanza-id value.
      */
     @Nullable
-    public String getStableId()
+    public String getStableId(final JID owner)
     {
-        return stableId;
+        if (this.stanza == null) {
+            return null;
+        }
+
+        try {
+            return StanzaIDUtil.findFirstUniqueAndStableStanzaID(this.stanza, owner.toBareJID());
+        } catch (Exception e) {
+            Log.warn("An exception occurred while parsing message with ID {}", id, e);
+            return null;
+        }
     }
 
     public String toString() {
         StringBuilder sb = new StringBuilder();
 
         sb.append("ArchivedMessage[id=").append(id).append(",");
-        sb.append("stableId=").append(stableId).append(",");
         sb.append("time=").append(time).append(",");
         sb.append("direction=").append(direction).append("]");