Remove deprecated reconnection callbacks in ConnectionListener

Fixes SMACK-776.

smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java

@@ -45,21 +45,4 @@ public class AbstractConnectionListener implements ConnectionListener {
         // do nothing
     }
 
-    @Deprecated
-    @Override
-    public void reconnectingIn(int seconds) {
-        // do nothing
-    }
-
-    @Deprecated
-    @Override
-    public void reconnectionFailed(Exception e) {
-        // do nothing
-    }
-
-    @Deprecated
-    @Override
-    public void reconnectionSuccessful() {
-        // do nothing
-    }
 }

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -1279,25 +1279,6 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         }
     }
 
-    /**
-     * Sends a notification indicating that the connection was reconnected successfully.
-     */
-    // TODO: Remove in Smack 4.3
-    @Deprecated
-    protected void notifyReconnection() {
-        // Notify connection listeners of the reconnection.
-        for (ConnectionListener listener : connectionListeners) {
-            try {
-                listener.reconnectionSuccessful();
-            }
-            catch (Exception e) {
-                // Catch and print any exception so we can recover
-                // from a faulty listener
-                LOGGER.log(Level.WARNING, "notifyReconnection()", e);
-            }
-        }
-    }
-
     /**
      * A wrapper class to associate a stanza filter with a listener.
      */

smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java

@@ -61,41 +61,4 @@ public interface ConnectionListener {
      */
     void connectionClosedOnError(Exception e);
 
-    /**
-     * The connection has reconnected successfully to the server. Connections will
-     * reconnect to the server when the previous socket connection was abruptly closed.
-     * @deprecated use {@link #connected(XMPPConnection)} or {@link #authenticated(XMPPConnection, boolean)} instead.
-     */
-    // TODO: Remove in Smack 4.3
-    @Deprecated
-    void reconnectionSuccessful();
-
-    // The next two methods *must* only be invoked by ReconnectionManager
-
-    /**
-     * The connection will retry to reconnect in the specified number of seconds.
-     * <p>
-     * Note: This method is only called if {@link ReconnectionManager#isAutomaticReconnectEnabled()} returns true, i.e.
-     * only when the reconnection manager is enabled for the connection.
-     * </p>
-     * 
-     * @param seconds remaining seconds before attempting a reconnection.
-     */
-    // TODO: Remove in Smack 4.3
-    @Deprecated
-    void reconnectingIn(int seconds);
-
-    /**
-     * An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
-     * moment.
-     * <p>
-     * Note: This method is only called if {@link ReconnectionManager#isAutomaticReconnectEnabled()} returns true, i.e.
-     * only when the reconnection manager is enabled for the connection.
-     * </p>
-     *
-     * @param e the exception that caused the reconnection to fail.
-     */
-    // TODO: Remove in Smack 4.3
-    @Deprecated
-    void reconnectionFailed(Exception e);
 }

smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java

@@ -262,9 +262,6 @@ public final class ReconnectionManager {
                             for (ReconnectionListener listener : reconnectionListeners) {
                                 listener.reconnectingIn(remainingSeconds);
                             }
-                            for (ConnectionListener listener : connection.connectionListeners) {
-                                listener.reconnectingIn(remainingSeconds);
-                            }
                         }
                         catch (InterruptedException e) {
                             LOGGER.log(Level.FINE, "Reconnection Thread was interrupted, aborting reconnection mechanism", e);
@@ -276,9 +273,6 @@ public final class ReconnectionManager {
                     for (ReconnectionListener listener : reconnectionListeners) {
                         listener.reconnectingIn(0);
                     }
-                    for (ConnectionListener listener : connection.connectionListeners) {
-                        listener.reconnectingIn(0);
-                    }
 
                     if (!isReconnectionPossible(connection)) {
                         return;
@@ -304,9 +298,6 @@ public final class ReconnectionManager {
                         for (ReconnectionListener listener : reconnectionListeners) {
                             listener.reconnectionFailed(e);
                         }
-                        for (ConnectionListener listener : connection.connectionListeners) {
-                            listener.reconnectionFailed(e);
-                        }
                         // Failed to reconnect, try again.
                         continue;
                     } catch (InterruptedException e) {

smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java

@@ -53,8 +53,6 @@ import org.jxmpp.stringprep.XmppStringprepException;
  */
 public class DummyConnection extends AbstractXMPPConnection {
 
-    private boolean reconnect = false;
-
     private final BlockingQueue<TopLevelStreamElement> queue = new LinkedBlockingQueue<TopLevelStreamElement>();
 
     public static ConnectionConfiguration.Builder<?,?> getDummyConfigurationBuilder() {
@@ -88,16 +86,10 @@ public class DummyConnection extends AbstractXMPPConnection {
         user = getUserJid();
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     protected void connectInternal() {
         connected = true;
         streamId = "dummy-" + new Random(new Date().getTime()).nextInt();
-
-        // TODO: Remove in Smack 4.3, and likely the suppression of the deprecation warning.
-        if (reconnect) {
-            notifyReconnection();
-        }
     }
 
     @Override
@@ -106,7 +98,6 @@ public class DummyConnection extends AbstractXMPPConnection {
         authenticated = false;
 
         callConnectionClosedListener();
-        reconnect = true;
     }
 
     @Override