OF-3161: Remove deprecated code

This removes most code that has been marked for removal in version 5.1.0 of Openfire.

Author: guusdk

xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionCloseListener.java

@@ -28,15 +28,6 @@
  */
 public interface ConnectionCloseListener
 {
-    /**
-     * Called when a connection is being closed.
-     *
-     * @param handback The handback object associated with the connection listener during Connection.registerCloseListener()
-     * @deprecated replaced by {@link #onConnectionClosing(Object)}
-     */
-    @Deprecated(forRemoval = true) // Remove in or after Openfire 5.1.0
-    default void onConnectionClose( Object handback ) {};
-
     /**
      * Called when a connection is being closed.
      *
@@ -46,17 +37,5 @@ public interface ConnectionCloseListener
      * @param handback The handback object associated with the connection listener during Connection.registerCloseListener()
      * @return a Future representing pending completion of the event listener invocation.
      */
-    default CompletableFuture<Void> onConnectionClosing(@Nullable final Object handback)
-    {
-        // The default implementation is a blocking invocation of the method that is being replaced: onConnectionClose()
-        // This is designed to facilitate a graceful migration, where pre-existing implementations of this interface
-        // will continue to work without change. When the deprecated method is deleted, this default implementation
-        // should also be removed.
-        try {
-            onConnectionClose(handback);
-        } catch (Throwable t) {
-            return CompletableFuture.failedFuture(t);
-        }
-        return CompletableFuture.completedFuture(null);
-    }
+    CompletableFuture<Void> onConnectionClosing(@Nullable final Object handback);
 }

xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java

@@ -162,18 +162,6 @@ public interface RoutingTable {
      */
     boolean hasClientRoute(JID jid);
 
-    /**
-     * Returns true if an anonymous user with the specified full JID is currently logged.
-     * When running inside of a cluster a true value will be returned as long as the
-     * user is connected to any cluster node.
-     *
-     * @param jid the full JID of the anonymous user.
-     * @return true if an anonymous user with the specified full JID is currently logged.
-     * @deprecated Replaced by {@link SessionManager#isAnonymousClientSession(JID)}
-     */
-    @Deprecated(forRemoval = true, since = "5.0.0") // Remove in or after Openfire 5.1.0
-    boolean isAnonymousRoute(JID jid);
-
     /**
      * Returns true if the specified address belongs to a route that is hosted by this JVM.
      * When running inside of a cluster each cluster node will host routes to local resources.

xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java

@@ -868,22 +868,6 @@ public boolean isAnonymousClientSession(@Nonnull final JID address) {
         return session != null && session.isAnonymousUser();
     }
 
-    /**
-     * @deprecated Replaced by {@link #isAnonymousClientSession(String)}
-     */
-    @Deprecated(forRemoval = true, since = "5.0.0") // Remove in or after Openfire 5.1.0
-    public boolean isAnonymousRoute(String username) {
-        return isAnonymousClientSession(username);
-    }
-
-    /**
-     * @deprecated Replaced by {@link #isAnonymousClientSession(JID)}
-     */
-    @Deprecated(forRemoval = true, since = "5.0.0") // Remove in or after Openfire 5.1.0
-    public boolean isAnonymousRoute(JID address) {
-        return isAnonymousClientSession(address);
-    }
-
     public boolean isActiveRoute(String username, String resource) {
         boolean hasRoute = false;
         Session session = routingTable.getClientRoute(new JID(username, serverName, resource));

xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java

@@ -32,7 +32,6 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
-import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -369,121 +368,4 @@ public static boolean isNameCoveredByPattern( String name, String pattern )
         }
         return false;
     }
-
-    /**
-     * Encapsulates a hostname and port.
-     *
-     * @deprecated Replaced by {@link SrvRecord}
-     */
-    @Deprecated(since = "5.0.0", forRemoval = true) // Remove in or after Openfire 5.1.0
-    public static class HostAddress implements Serializable {
-
-        private final SrvRecord delegate;
-
-        public HostAddress(String host, int port, boolean directTLS) {
-            delegate = new SrvRecord(host, port, directTLS);
-        }
-
-        public String getHost() {
-            return delegate.getHostname();
-        }
-
-        public int getPort() {
-            return delegate.getPort();
-        }
-
-        public boolean isDirectTLS() {
-            return delegate.isDirectTLS();
-        }
-
-        @Override
-        public String toString() {
-            return delegate.getHostname() + ":" + delegate.getHostname();
-        }
-    }
-
-    /**
-     * @deprecated Replaced by {@link SrvRecord#prioritize(SrvRecord[])}
-     */
-    @Deprecated(since = "5.0.0", forRemoval = true) // Remove in or after Openfire 5.1.0
-    public static List<WeightedHostAddress> prioritize(WeightedHostAddress[] records) {
-        final List<WeightedHostAddress> result = new LinkedList<>();
-
-        // sort by priority (ascending)
-        final Set<SrvRecord> delegates = Arrays.stream(records).map(WeightedHostAddress::getDelegate).collect(Collectors.toSet());
-        final List<Set<SrvRecord>> prioritized = SrvRecord.prioritize(delegates);
-        for (Set<SrvRecord> set : prioritized) {
-            final LinkedHashSet<WeightedHostAddress> orderedSet = new LinkedHashSet<>(); // Retain the order in the set!
-            for (final SrvRecord e : set) {
-                orderedSet.add(new WeightedHostAddress(e));
-            }
-            result.addAll(orderedSet);
-        }
-        return result;
-    }
-
-    @Deprecated(since = "5.0.0", forRemoval = true) // Remove in or after Openfire 5.1.0
-    public static class WeightedHostAddress extends HostAddress
-    {
-        private final SrvRecord delegate;
-
-        static WeightedHostAddress from(HostAddress address) {
-            if (address instanceof WeightedHostAddress) {
-                return (WeightedHostAddress) address;
-            }
-
-            return new WeightedHostAddress(address.getHost(), address.getPort(), address.isDirectTLS(), 0, 0);
-        }
-
-        private WeightedHostAddress(@Nonnull final SrvRecord delegate) {
-            this(delegate.getHostname(), delegate.getPort(), delegate.isDirectTLS(), delegate.getPriority(), delegate.getWeight());
-        }
-
-        private WeightedHostAddress(String[] srvRecordEntries, boolean directTLS) {
-            // Host entries in DNS should end with a ".".
-            super(
-                srvRecordEntries[srvRecordEntries.length-1].endsWith(".") ? srvRecordEntries[srvRecordEntries.length-1].substring(0, srvRecordEntries[srvRecordEntries.length-1].length()-1) : srvRecordEntries[srvRecordEntries.length-1],
-                Integer.parseInt(srvRecordEntries[srvRecordEntries.length-2]),
-                directTLS
-            );
-            delegate = new SrvRecord(super.getHost(), super.getPort(), super.isDirectTLS(), Integer.parseInt(srvRecordEntries[srvRecordEntries.length-3]), Integer.parseInt(srvRecordEntries[srvRecordEntries.length-4]));
-        }
-
-        WeightedHostAddress(String host, int port, boolean directTLS, int priority, int weight) {
-            super(host, port, directTLS);
-            delegate = new SrvRecord(host, port, directTLS, priority, weight);
-        }
-
-        public int getPriority() {
-            return delegate.getPriority();
-        }
-
-        public int getWeight() {
-            return delegate.getWeight();
-        }
-
-        SrvRecord getDelegate() {
-            return delegate;
-        }
-
-        @Override
-        public boolean equals(Object o)
-        {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            WeightedHostAddress that = (WeightedHostAddress) o;
-            return Objects.equals(delegate, that.delegate);
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hashCode(delegate);
-        }
-
-        @Override
-        public String toString() {
-            return "prio: " + delegate.getPriority() + ", weight: " + delegate.getWeight() + ", port: " + getPort() + ", host: " + getHost()  + ", isDirectTLS: " + isDirectTLS();
-        }
-    }
 }

xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java

@@ -421,43 +421,19 @@ public void process(Packet packet) {
         }
     }
 
-    /**
-     * Returns true if the specified packet can be delivered to the entity. Subclasses will use different
-     * criterias to determine of processing is allowed or not. For instance, client sessions will use
-     * privacy lists while outgoing server sessions will always allow this action.
-     *
-     * @param packet the packet to analyze if it must be blocked.
-     * @return false if the specified packet must be blocked.
-     */
-    @Deprecated(forRemoval = true) // Remove in or after Openfire 5.1.0.
-    boolean canProcess(Packet packet) {
-        return true;
-    }
-
     /**
      * Returns true if the specified stanza can be delivered to the entity.
      *
      * Subclasses will use different criteria to determine of processing is allowed or not. For instance, client
      * sessions will use privacy lists while component sessions will always allow this action.
      *
-     * When a stanza is cannot be delivered, an implementation must take responsibility for error handling. If, for
+     * When a stanza cannot be delivered, an implementation must take responsibility for error handling. If, for
      * example, an error stanza is to be sent back to the sender, this is to be performed by the implementation.
      *
      * @param stanza the stanza to analyze if it must be blocked.
      * @return false if the specified stanza must be blocked.
      */
-    boolean canDeliver(@Nonnull final Packet stanza) {
-        // This implementation exists only for backwards compatibility purposes. When #canProcess() is removed, this
-        // implementation will also be removed (every subclass is then expected to provide its own implementation of
-        // the #canDeliver interface method).
-        final boolean canProcess = canProcess(stanza);
-
-        if (!canProcess) {
-            LocalClientSession.returnPrivacyListErrorToSender(stanza);
-        }
-
-        return canProcess;
-    }
+    abstract boolean canDeliver(@Nonnull final Packet stanza);
 
     abstract void deliver(Packet packet) throws UnauthorizedException;
 

xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java

@@ -895,15 +895,6 @@ public boolean hasClientRoute(JID jid) {
         }
     }
 
-    @Deprecated(forRemoval = true, since = "5.0.0") // Remove in or after Openfire 5.1.0    @Override
-    public boolean isAnonymousRoute(JID jid) {
-        if (jid.getNode() == null || jid.getResource() == null) {
-            Log.trace("isAnonymousRoute() invoked with a JID that's not a full JID: {}", jid);
-            return false;
-        }
-        return server.getSessionManager().isAnonymousClientSession(jid);
-    }
-
     @Override
     public boolean isLocalRoute(JID jid) {
         return localClientRoutingTable.isLocalRoute(jid) || localServerRoutingTable.isLocalRoute(jid) || localComponentRoutingTable.isLocalRoute(jid);

xmppserver/src/main/java/org/jivesoftware/openfire/update/Update.java

@@ -50,14 +50,6 @@ public class Update {
      */
     private boolean downloaded;
 
-    @Deprecated(forRemoval = true) // Remove in or after Openfire 5.1.0
-    public Update(String componentName, String latestVersion, String changelog, String url) {
-        this.componentName = componentName;
-        this.latestVersion = new Version(latestVersion);
-        this.changelog = changelog;
-        this.url = url;
-    }
-
     public Update(String componentName, Version latestVersion, String changelog, String url) {
         this.componentName = componentName;
         this.latestVersion = latestVersion;

xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyMultiProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Ignite Realtime Foundation. All rights reserved
+ * Copyright (C) 2024-2025 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 package org.jivesoftware.openfire.user.property;
 
 import org.jivesoftware.openfire.user.UserNotFoundException;
-import org.jivesoftware.util.ClassUtils;
-import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.SystemProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,41 +35,6 @@ public abstract class UserPropertyMultiProvider implements UserPropertyProvider
 {
     private final static Logger Log = LoggerFactory.getLogger(UserPropertyMultiProvider.class);
 
-    /**
-     * Instantiates a UserPropertyProvider based on a property value (that is expected to be a class name). When the
-     * property is not set, this method returns null. When the property is set, but an exception occurs while
-     * instantiating the class, this method logs the error and returns null.
-     *
-     * UserPropertyProvider classes are required to have a public, no-argument constructor.
-     *
-     * @param propertyName A property name (cannot be null).
-     * @return A user provider (can be null).
-     * @deprecated Use {@link #instantiate(SystemProperty)} or {@link #instantiate(SystemProperty, SystemProperty)} instead.
-     */
-    @Deprecated(forRemoval = true, since = "5.0.0") // TODO Remove in or after Openfire 5.1.0
-    public static UserPropertyProvider instantiate( String propertyName )
-    {
-        final String className = JiveGlobals.getProperty( propertyName );
-        if ( className == null )
-        {
-            Log.debug( "Property '{}' is undefined. Skipping.", propertyName );
-            return null;
-        }
-        Log.debug( "About to to instantiate an UserPropertyProvider '{}' based on the value of property '{}'.", className, propertyName );
-        try
-        {
-            final Class c = ClassUtils.forName( className );
-            final UserPropertyProvider provider = (UserPropertyProvider) c.newInstance();
-            Log.debug( "Instantiated UserPropertyProvider '{}'", className );
-            return provider;
-        }
-        catch ( Exception e )
-        {
-            Log.error( "Unable to load UserPropertyProvider '{}'. Users in this provider will be disabled.", className, e );
-            return null;
-        }
-    }
-
     /**
      * Instantiates a UserPropertyProvider based on Class-based system property. When the property is not set, this
      * method returns null. When the property is set, but an exception occurs while instantiating the class, this method