fixes igniterealtime#139: Removing unused code

Removing code that is not referenced / used anywhere. This reduces complexity, and improves maintainability.

Author: guusdk

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

@@ -7,8 +7,5 @@ public interface ArchiveProperties
 {
     // TODO: change the below to a separate property to allow archiving but disable/enable XEP-0136
     String ENABLED = "conversation.metadataArchiving";
-    String INDEX_DIR = "archive.indexdir";
-    // Unnecessary since Open Archive Archive Manager no longer archives messages
-    String CONVERSATION_TIMEOUT = "conversation.idleTime";
     String FORCE_RSM = "archive.FORCE_RSM";
 }

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

@@ -472,7 +472,6 @@ public Conversation getConversation(JID owner, JID with, Date start) {
                 ArchivedMessage message;
 
                 message = extractMessage(rs);
-                message.setConversation(conversation);
                 conversation.addMessage(message);
             }
         } catch (SQLException sqle) {
@@ -621,7 +620,6 @@ static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, St
             stanza = message.toString();
         }
 
-        Message.Type type;
         String sid;
         try
         {
@@ -643,12 +641,10 @@ static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, St
             }
             final Document doc = DocumentHelper.parseText( stanza );
             final Message message = new Message( doc.getRootElement() );
-            type = message.getType();
             sid = StanzaIDUtil.findFirstUniqueAndStableStanzaID( message, owner.toBareJID() );
         } catch ( Exception e ) {
             Log.warn( "An exception occurred while parsing message with ID {}", id, e );
             sid = null;
-            type = null;
         }
 
         final JID from = new JID(fromJID + ( fromJIDResource == null || fromJIDResource.isEmpty() ? "" : "/" + fromJIDResource ));
@@ -663,7 +659,7 @@ static protected ArchivedMessage asArchivedMessage(JID owner, String fromJID, St
             direction = Direction.to;
             with = to;
         }
-        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, direction, type == null ? null : type.toString(), with, sid, body, stanza);
+        final ArchivedMessage archivedMessage = new ArchivedMessage(id, sentDate, direction, with, sid, body, stanza);
         return archivedMessage;
     }
 

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

@@ -9,7 +9,6 @@
 import org.jivesoftware.openfire.index.LuceneIndexer;
 import org.jivesoftware.openfire.reporting.util.TaskEngine;
 import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.StringUtils;
 import org.xmpp.packet.JID;
 
 import java.io.File;

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

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

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

@@ -16,8 +16,6 @@
 
 import com.reucon.openfire.plugin.archive.model.ArchivedMessage;
 import org.jivesoftware.database.DbConnectionManager;
-import com.reucon.openfire.plugin.archive.util.StanzaIDUtil;
-import org.jivesoftware.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmpp.packet.JID;

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

@@ -4,7 +4,6 @@
 import org.xmpp.packet.JID;
 
 import java.util.Date;
-import java.util.UUID;
 
 /**
  * An archived message.
@@ -26,18 +25,15 @@ public enum Direction {
     private final Long id;
     private final Date time;
     private final Direction direction;
-    private final String type;
     private final String body;
-    private Conversation conversation;
     private final JID with;
     private final String stanza;
     private final String stableId;
 
-    public ArchivedMessage( Long id, Date time, Direction direction, String type, JID with, String stableId, String body, String stanza) {
+    public ArchivedMessage( Long id, Date time, Direction direction, 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;
@@ -56,10 +52,6 @@ public Direction getDirection() {
         return direction;
     }
 
-    public String getType() {
-        return type;
-    }
-
     public String getBody() {
         return body;
     }
@@ -68,24 +60,6 @@ public String getStanza() {
         return stanza;
     }
 
-    public Conversation getConversation() {
-        return conversation;
-    }
-
-    public void setConversation(Conversation conversation) {
-        this.conversation = conversation;
-    }
-
-    /**
-     * Checks if this message contains payload that should be archived.
-     *
-     * @return <code>true</code> if this message is empty, <code>false</code>
-     *         otherwise.
-     */
-    public boolean isEmpty() {
-        return body == null;
-    }
-
     public JID getWith() {
         return with;
     }

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

@@ -2,14 +2,9 @@
 
 import org.dom4j.Element;
 import org.dom4j.QName;
-import org.jivesoftware.util.JiveGlobals;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.xmpp.packet.*;
 
-import java.util.Iterator;
 import java.util.List;
-import java.util.UUID;
 
 /*
  * This is a partial copy of the implementation provided in Openfire 4.5.2 by

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

@@ -8,7 +8,6 @@
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 
-import com.reucon.openfire.plugin.archive.IndexManager;
 import com.reucon.openfire.plugin.archive.PersistenceManager;
 
 /**
@@ -31,10 +30,6 @@ protected PersistenceManager getPersistenceManager(JID jid) {
         return MonitoringPlugin.getInstance().getPersistenceManager(jid);
     }
 
-    protected IndexManager getIndexManager() {
-        return MonitoringPlugin.getInstance().getIndexManager();
-    }
-
     protected IQ error(Packet packet, PacketError.Condition condition) {
         IQ reply;
 

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

@@ -1,7 +1,6 @@
 package com.reucon.openfire.plugin.archive.xep0313;
 
 import com.reucon.openfire.plugin.archive.ArchiveProperties;
-import com.reucon.openfire.plugin.archive.impl.MucIndexer;
 import com.reucon.openfire.plugin.archive.model.ArchivedMessage;
 import com.reucon.openfire.plugin.archive.xep.AbstractIQHandler;
 import com.reucon.openfire.plugin.archive.xep0059.XmppResultSet;
@@ -30,7 +29,6 @@
 
 import java.text.ParseException;
 import java.time.*;
-import java.time.Instant;
 import java.util.*;
 import java.util.LinkedList;
 import java.util.concurrent.ExecutorService;

src/java/com/reucon/openfire/plugin/archive/util/StanzaIDUtil.java

@@ -3,8 +3,6 @@
 import org.jivesoftware.openfire.forward.Forwarded;
 import org.xmpp.packet.PacketExtension;
 
-import java.util.Date;
-
 /**
  * Created by dwd on 26/07/16.
  */

src/java/com/reucon/openfire/plugin/archive/xep/AbstractIQHandler.java

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 
 import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.handler.IQHandler;
 
 import com.reucon.openfire.plugin.archive.xep.AbstractXepSupport;
 

src/java/com/reucon/openfire/plugin/archive/xep0313/IQQueryHandler.java

@@ -2,7 +2,6 @@
 
 import com.reucon.openfire.plugin.archive.xep.AbstractXepSupport;
 import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.handler.IQHandler;
 
 import java.util.ArrayList;
 

src/java/com/reucon/openfire/plugin/archive/xep0313/Result.java

@@ -18,7 +18,6 @@
 
 import org.jivesoftware.database.JiveID;
 import org.jivesoftware.database.SequenceManager;
-import org.jivesoftware.util.JiveConstants;
 import org.xmpp.packet.JID;
 
 import java.util.Date;

src/java/com/reucon/openfire/plugin/archive/xep0313/Xep0313Support.java

@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
-import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Optional;

src/java/com/reucon/openfire/plugin/archive/xep0313/Xep0313Support1.java

@@ -26,7 +26,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Collection;

src/java/org/jivesoftware/openfire/archive/ArchivedMessage.java

@@ -6,7 +6,6 @@
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
-import org.jivesoftware.openfire.plugin.service.LogAPI;
 import org.jivesoftware.openfire.plugin.service.MonitoringAPI;
 
 import com.sun.jersey.api.core.PackagesResourceConfig;

src/java/org/jivesoftware/openfire/archive/cluster/GetConversationCountTask.java

@@ -3,7 +3,6 @@
 import com.sun.jersey.api.core.PackagesResourceConfig;
 import com.sun.jersey.spi.container.servlet.ServletContainer;
 import org.jivesoftware.openfire.plugin.service.LogAPI;
-import org.jivesoftware.openfire.plugin.service.MonitoringAPI;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;