vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 03:52:06 +01:00
Code Issues Releases Wiki Activity

Remove protected getConnectionListeners()

Browse source 
Also remove reconnectionFailed() from XMPPBOSHConnection, only
ReconnectionManager should call it.

Add and fix javadoc of ConnectionListener.
This commit is contained in:
Florian Schmaus 2015-01-10 01:23:20 +01:00
parent 8f8e0c7138
commit 6a43bab4f5
4 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
View file

@ -34,7 +34,6 @@ import org.jivesoftware.smack.SmackException.ConnectionException;
import org.jivesoftware.smack.XMPPException.StreamErrorException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.ConnectionCreationListener;
import org.jivesoftware.smack.ConnectionListener;
import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Element;
@ -475,17 +474,15 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
}
}
else {
try {
if (wasAuthenticated) {
try {
login();
}
notifyReconnection();
}
catch (Exception e) {
for (ConnectionListener listener : getConnectionListeners()) {
listener.reconnectionFailed(e);
throw new RuntimeException(e);
}
}
notifyReconnection();
}
}
else {

19
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -679,15 +679,6 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
connectionListeners.remove(connectionListener);
}
/**
* Get the collection of listeners that are interested in connection events.
*
* @return a collection of listeners interested on connection events.
*/
protected Collection<ConnectionListener> getConnectionListeners() {
return connectionListeners;
}
@Override
public PacketCollector createPacketCollectorAndSend(IQ packet) throws NotConnectedException {
PacketFilter packetFilter = new IQReplyFilter(packet, this);
@ -1116,13 +1107,13 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
}
protected void callConnectionConnectedListener() {
for (ConnectionListener listener : getConnectionListeners()) {
for (ConnectionListener listener : connectionListeners) {
listener.connected(this);
}
}
protected void callConnectionAuthenticatedListener(boolean resumed) {
for (ConnectionListener listener : getConnectionListeners()) {
for (ConnectionListener listener : connectionListeners) {
try {
listener.authenticated(this, resumed);
} catch (Exception e) {
@ -1134,7 +1125,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
}
void callConnectionClosedListener() {
for (ConnectionListener listener : getConnectionListeners()) {
for (ConnectionListener listener : connectionListeners) {
try {
listener.connectionClosed();
}
@ -1148,7 +1139,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
protected void callConnectionClosedOnErrorListener(Exception e) {
LOGGER.log(Level.WARNING, "Connection closed with error", e);
for (ConnectionListener listener : getConnectionListeners()) {
for (ConnectionListener listener : connectionListeners) {
try {
listener.connectionClosedOnError(e);
}
@ -1165,7 +1156,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
*/
protected void notifyReconnection() {
// Notify connection listeners of the reconnection.
for (ConnectionListener listener : getConnectionListeners()) {
for (ConnectionListener listener : connectionListeners) {
try {
listener.reconnectionSuccessful();
}

44
smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
View file

@ -29,20 +29,26 @@ package org.jivesoftware.smack;
public interface ConnectionListener {
/**
* TODO
* @param connection
* Notification that the connection has been successfully connected to the remote endpoint (e.g. the XMPP server).
* <p>
* Note that the connection is likely not yet authenticated and therefore only limited operations like registering
* an account may be possible.
* </p>
*
* @param connection the XMPPConnection which successfully connected to its endpoint.
*/
public void connected(XMPPConnection connection);
/**
* TODO
* @param connection
* Notification that the connection has been authenticated.
*
* @param connection the XMPPConnection which successfully authenticated.
* @param resumed true if a previous XMPP session's stream was resumed.
*/
public void authenticated(XMPPConnection connection, boolean resumed);
/**
* Notification that the connection was closed normally or that the reconnection
* process has been aborted.
* Notification that the connection was closed normally.
*/
public void connectionClosed();
@ -55,22 +61,32 @@ public interface ConnectionListener {
*/
public 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.
*/
public 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.
*/
public void reconnectingIn(int seconds);
/**
* The connection has reconnected successfully to the server. Connections will
* reconnect to the server when the previous socket connection was abruptly closed.
*/
public void reconnectionSuccessful();
/**
* An attempt to connect to the server has failed. The connection will keep trying
* reconnecting to the server in a moment.
* 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.
*/

4
smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
View file

@ -92,9 +92,7 @@ public class DummyConnection extends AbstractXMPPConnection {
roster = null;
authenticated = false;
for (ConnectionListener listener : getConnectionListeners()) {
listener.connectionClosed();
}
callConnectionClosedListener();
reconnect = true;
}