fixes igniterealtime#139: refactoring: reduce complexity by making ArchivedMessage (almost) immutable

No functional changes intended.

Author: guusdk

src/java/com/reucon/openfire/plugin/archive/ArchiveFactory.java

@@ -22,9 +22,10 @@ public static ArchivedMessage createArchivedMessage(Session session,
         final String sid = StanzaIDUtil.findFirstUniqueAndStableStanzaID( message, owner.toBareJID() );
         final ArchivedMessage archivedMessage;
 
-        archivedMessage = new ArchivedMessage(new Date(), direction, message.getType().toString(), with, sid);
-        archivedMessage.setSubject(message.getSubject());
-        archivedMessage.setBody(message.getBody());
+        // Use a 'null' value for the numeric database ID, as the resulting object has not yet been stored in the database.
+        final Long id = null;
+
+        archivedMessage = new ArchivedMessage(id, new Date(), direction, message.getType().toString(), with, sid, message.getBody(), message.toXML());
 
         return archivedMessage;
     }

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

@@ -880,10 +880,7 @@ static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, St
             direction = Direction.to;
             with = to;
         }
-        final ArchivedMessage archivedMessage = new ArchivedMessage(sentDate, direction, type == null ? null : type.toString(), with, sid);
-        archivedMessage.setStanza(stanza);
-        archivedMessage.setBody(body);
-        archivedMessage.setId(id);
+        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, direction, type == null ? null : type.toString(), with, sid, body, stanza);
         return archivedMessage;
     }
 

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

@@ -297,9 +297,7 @@ static protected ArchivedMessage asArchivedMessage(JID roomJID, String senderJID
             sid = null;
         }
 
-        final ArchivedMessage archivedMessage = new ArchivedMessage(sentDate, ArchivedMessage.Direction.from, null, null, sid);
-        archivedMessage.setStanza(stanza);
-        archivedMessage.setId(id);
+        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, ArchivedMessage.Direction.from, null, null, sid, body, stanza);
         return archivedMessage;
     }
 

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

@@ -23,33 +23,31 @@ public enum Direction {
         from
     }
 
-    private Long id;
+    private final Long id;
     private final Date time;
     private final Direction direction;
     private final String type;
-    private String subject;
-    private String body;
+    private final String body;
     private Conversation conversation;
-    private JID with;
-    private String stanza;
-    private String stableId;
+    private final JID with;
+    private final String stanza;
+    private final String stableId;
 
-    public ArchivedMessage( Date time, Direction direction, String type, JID with, String stableId ) {
+    public ArchivedMessage( Long id, Date time, Direction direction, String type, JID with, String stableId, String body, String stanza) {
+        this.id = id;
         this.time = time;
         this.direction = direction;
         this.type = type;
         this.with = with;
         this.stableId = stableId;
+        this.body = body;
+        this.stanza = stanza;
     }
 
     public Long getId() {
         return id;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Date getTime() {
         return time;
     }
@@ -62,30 +60,14 @@ public String getType() {
         return type;
     }
 
-    public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-
     public String getBody() {
         return body;
     }
 
-    public void setBody(String body) {
-        this.body = body;
-    }
-
     public String getStanza() {
         return stanza;
     }
 
-    public void setStanza(String stanza) {
-        this.stanza = stanza;
-    }
-
     public Conversation getConversation() {
         return conversation;
     }
@@ -101,7 +83,7 @@ public void setConversation(Conversation conversation) {
      *         otherwise.
      */
     public boolean isEmpty() {
-        return subject == null && body == null;
+        return body == null;
     }
 
     public JID getWith() {
@@ -113,16 +95,6 @@ public String getStableId()
         return stableId;
     }
 
-    public void setStableId( final UUID stableId )
-    {
-        this.stableId = stableId.toString();
-    }
-
-    public void setStableId( final String stableId )
-    {
-        this.stableId = stableId;
-    }
-
     public String toString() {
         StringBuilder sb = new StringBuilder();