diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index 134c3cafc..6b8bc55fb 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -341,7 +341,7 @@ public abstract class ConnectionConfiguration {
* An enumeration for TLS security modes that are available when making a connection
* to the XMPP server.
*/
- public static enum SecurityMode {
+ public enum SecurityMode {
/**
* Security via TLS encryption is required in order to connect. If the server
@@ -492,7 +492,7 @@ public abstract class ConnectionConfiguration {
*
* This is an abstract class that uses the builder design pattern and the "getThis() trick" to recover the type of
* the builder in a class hierarchies with a self-referential generic supertype. Otherwise chaining of build
- * instructions from the superclasses followed by build instructions of a sublcass would not be possible, because
+ * instructions from the superclasses followed by build instructions of a subclass would not be possible, because
* the superclass build instructions would return the builder of the superclass and not the one of the subclass. You
* can read more about it a Angelika Langer's Generics FAQ, especially the entry What is the
@@ -649,7 +649,7 @@ public abstract class ConnectionConfiguration {
public B setPort(int port) {
if (port < 0 || port > 65535) {
throw new IllegalArgumentException(
- "Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
+ "Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
}
this.port = port;
return getThis();
@@ -938,7 +938,7 @@ public abstract class ConnectionConfiguration {
Set blacklistedMechanisms = SASLAuthentication.getBlacklistedSASLMechanisms();
for (String mechanism : saslMechanisms) {
if (!SASLAuthentication.isSaslMechanismRegistered(mechanism)) {
- throw new IllegalArgumentException("SASL " + mechanism + " is not avaiable. Consider registering it with Smack");
+ throw new IllegalArgumentException("SASL " + mechanism + " is not available. Consider registering it with Smack");
}
if (blacklistedMechanisms.contains(mechanism)) {
throw new IllegalArgumentException("SALS " + mechanism + " is blacklisted.");
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
index 5b724078f..f798b803a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
@@ -33,6 +33,6 @@ public interface ConnectionCreationListener {
*
* @param connection the newly created connection.
*/
- public void connectionCreated(XMPPConnection connection);
+ void connectionCreated(XMPPConnection connection);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
index 5a677df31..c096e48b2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
@@ -37,7 +37,7 @@ public interface ConnectionListener {
*
* @param connection the XMPPConnection which successfully connected to its endpoint.
*/
- public void connected(XMPPConnection connection);
+ void connected(XMPPConnection connection);
/**
* Notification that the connection has been authenticated.
@@ -45,12 +45,12 @@ public interface ConnectionListener {
* @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);
+ void authenticated(XMPPConnection connection, boolean resumed);
/**
* Notification that the connection was closed normally.
*/
- public void connectionClosed();
+ void connectionClosed();
/**
* Notification that the connection was closed due to an exception. When
@@ -59,7 +59,7 @@ public interface ConnectionListener {
*
* @param e the exception.
*/
- public void connectionClosedOnError(Exception e);
+ void connectionClosedOnError(Exception e);
/**
* The connection has reconnected successfully to the server. Connections will
@@ -68,7 +68,7 @@ public interface ConnectionListener {
*/
// TODO: Remove in Smack 4.3
@Deprecated
- public void reconnectionSuccessful();
+ void reconnectionSuccessful();
// The next two methods *must* only be invoked by ReconnectionManager
@@ -83,7 +83,7 @@ public interface ConnectionListener {
*/
// TODO: Remove in Smack 4.3
@Deprecated
- public void reconnectingIn(int seconds);
+ void reconnectingIn(int seconds);
/**
* An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
@@ -97,5 +97,5 @@ public interface ConnectionListener {
*/
// TODO: Remove in Smack 4.3
@Deprecated
- public void reconnectionFailed(Exception e);
+ void reconnectionFailed(Exception e);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
index e13120c83..b71825267 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ExceptionCallback.java
@@ -24,6 +24,6 @@ package org.jivesoftware.smack;
@Deprecated
public interface ExceptionCallback {
- public void processException(Exception exception);
+ void processException(Exception exception);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Manager.java b/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
index 47f5e0ade..0b7924eb3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/Manager.java
@@ -28,7 +28,7 @@ public abstract class Manager {
public Manager(XMPPConnection connection) {
Objects.requireNonNull(connection, "XMPPConnection must not be null");
- weakConnection = new WeakReference(connection);
+ weakConnection = new WeakReference<>(connection);
}
protected final XMPPConnection connection() {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
index c404008ca..87eee0435 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionListener.java
@@ -34,7 +34,7 @@ public interface ReconnectionListener {
*
* @param seconds remaining seconds before attempting a reconnection.
*/
- public void reconnectingIn(int seconds);
+ void reconnectingIn(int seconds);
/**
* An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
@@ -46,5 +46,5 @@ public interface ReconnectionListener {
*
* @param e the exception that caused the reconnection to fail.
*/
- public void reconnectionFailed(Exception e);
+ void reconnectionFailed(Exception e);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
index 18cbcc1dc..0f7d65dec 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
@@ -189,7 +189,7 @@ public final class ReconnectionManager {
private Thread reconnectionThread;
private ReconnectionManager(AbstractXMPPConnection connection) {
- weakRefConnection = new WeakReference(connection);
+ weakRefConnection = new WeakReference<>(connection);
reconnectionRunnable = new Runnable() {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
index 8c4cfe88f..8e8418b23 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
@@ -64,9 +64,9 @@ public final class SASLAuthentication {
private static final Logger LOGGER = Logger.getLogger(SASLAuthentication.class.getName());
- private static final List REGISTERED_MECHANISMS = new ArrayList();
+ private static final List REGISTERED_MECHANISMS = new ArrayList<>();
- private static final Set BLACKLISTED_MECHANISMS = new HashSet();
+ private static final Set BLACKLISTED_MECHANISMS = new HashSet<>();
static {
// Blacklist SCRAM-SHA-1-PLUS for now.
@@ -91,7 +91,7 @@ public final class SASLAuthentication {
* @return the registered SASLMechanism sorted by the level of preference.
*/
public static Map getRegisterdSASLMechanisms() {
- Map answer = new LinkedHashMap();
+ Map answer = new LinkedHashMap<>();
synchronized (REGISTERED_MECHANISMS) {
for (SASLMechanism mechanism : REGISTERED_MECHANISMS) {
answer.put(mechanism.getClass().getName(), mechanism.toString());
@@ -132,9 +132,9 @@ public final class SASLAuthentication {
return false;
}
- public static boolean blacklistSASLMechanism(String mechansim) {
+ public static boolean blacklistSASLMechanism(String mechanism) {
synchronized (BLACKLISTED_MECHANISMS) {
- return BLACKLISTED_MECHANISMS.add(mechansim);
+ return BLACKLISTED_MECHANISMS.add(mechanism);
}
}
@@ -356,8 +356,8 @@ public final class SASLAuthentication {
throw new SmackException(
"No supported and enabled SASL Mechanism provided by server. " +
"Server announced mechanisms: " + serverMechanisms + ". " +
- "Registerd SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
- "Enabled SASL mechansisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
+ "Registered SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
+ "Enabled SASL mechanisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
"Blacklisted SASL mechanisms: " + BLACKLISTED_MECHANISMS + '.'
);
// @formatter;on
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index be5f85e09..163c2cc53 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -52,17 +52,17 @@ public final class SmackConfiguration {
private static int defaultPacketReplyTimeout = 5000;
private static int packetCollectorSize = 5000;
- private static List defaultMechs = new ArrayList();
+ private static List defaultMechs = new ArrayList<>();
- static Set disabledSmackClasses = new HashSet();
+ static Set disabledSmackClasses = new HashSet<>();
- final static List compressionHandlers = new ArrayList(2);
+ final static List compressionHandlers = new ArrayList<>(2);
static boolean smackInitialized = false;
/**
* Value that indicates whether debugging is enabled. When enabled, a debug
- * window will apear for each new connection that will contain the following
+ * window will appear for each new connection that will contain the following
* information:
* - Client Traffic -- raw XML traffic generated by Smack and sent to the server.
*
- Server Traffic -- raw XML traffic sent by the server to the client.
@@ -248,8 +248,8 @@ public final class SmackConfiguration {
compressionHandlers.add(xmppInputOutputStream);
}
- public static List getCompresionHandlers() {
- List res = new ArrayList(compressionHandlers.size());
+ public static List getCompressionHandlers() {
+ List res = new ArrayList<>(compressionHandlers.size());
for (XMPPInputOutputStream ios : compressionHandlers) {
if (ios.isSupported()) {
res.add(ios);
@@ -261,7 +261,7 @@ public final class SmackConfiguration {
/**
* Set the default HostnameVerifier that will be used by XMPP connections to verify the hostname
* of a TLS certificate. XMPP connections are able to overwrite this settings by supplying a
- * HostnameVerifier in their ConnecitonConfiguration with
+ * HostnameVerifier in their ConnectionConfiguration with
* {@link ConnectionConfiguration.Builder#setHostnameVerifier(HostnameVerifier)}.
*/
public static void setDefaultHostnameVerifier(HostnameVerifier verifier) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
index 988d2091d..9f83296bd 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
@@ -258,7 +258,7 @@ public class SmackException extends Exception {
public ConnectionException(Throwable wrappedThrowable) {
super(wrappedThrowable);
- failedAddresses = new ArrayList(0);
+ failedAddresses = new ArrayList<>(0);
}
private ConnectionException(String message, List failedAddresses) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
index 3573e9f48..3a8684cbe 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
@@ -40,7 +40,6 @@ import org.jivesoftware.smack.util.FileUtils;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -71,7 +70,7 @@ public final class SmackInitialization {
}
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
- smackVersion = "unkown";
+ smackVersion = "unknown";
}
SMACK_VERSION = smackVersion;
@@ -182,7 +181,7 @@ public final class SmackInitialization {
private static void parseClassesToLoad(XmlPullParser parser, boolean optional,
Collection exceptions, ClassLoader classLoader)
- throws XmlPullParserException, IOException, Exception {
+ throws Exception {
final String startName = parser.getName();
int eventType;
String name;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
index b5f325a09..07b897f48 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
@@ -288,7 +288,7 @@ public class StanzaCollector {
}
}
- private final void throwIfCancelled() {
+ private void throwIfCancelled() {
if (cancelled) {
throw new IllegalStateException("Packet collector already cancelled");
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
index c5e5eb1aa..0e81d7906 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
@@ -52,6 +52,6 @@ public interface StanzaListener {
* @throws InterruptedException
* @throws NotLoggedInException
*/
- public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
+ void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
index a45838c40..99264e568 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnectionRegistry.java
@@ -27,7 +27,7 @@ public class XMPPConnectionRegistry {
* A set of listeners which will be invoked if a new connection is created.
*/
private final static Set connectionEstablishedListeners =
- new CopyOnWriteArraySet();
+ new CopyOnWriteArraySet<>();
/**
* Adds a new listener that will be notified when new Connections are created. Note
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
index ff3b5d72a..3a3e8e387 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/EmptyToMatcher.java
@@ -30,10 +30,7 @@ public final class EmptyToMatcher implements StanzaFilter {
@Override
public boolean accept(Stanza packet) {
Jid packetTo = packet.getTo();
- if (packetTo == null) {
- return true;
- }
- return false;
+ return packetTo == null;
}
@Override
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
index 83a3b127a..92fe0229c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java
@@ -54,5 +54,5 @@ public interface StanzaFilter {
* @param stanza the stanza(/packet) to test.
* @return true if and only if stanza passes the filter.
*/
- public boolean accept(Stanza stanza);
+ boolean accept(Stanza stanza);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
index 6c5c1fc4d..f219563ee 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
@@ -30,5 +30,5 @@ import org.jivesoftware.smack.SmackConfiguration;
*
*/
public interface SmackInitializer {
- public List initialize();
+ List initialize();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
index 59391cf98..9e3d9729c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.IQ;
*/
public interface IQRequestHandler {
- public enum Mode {
+ enum Mode {
/**
* Process requests synchronously, i.e. in the order they arrive. Uses a single thread, which means that the other
* requests have to wait until all previous synchronous requests have been handled. Use {@link #async} if
@@ -41,13 +41,13 @@ public interface IQRequestHandler {
async,
}
- public IQ handleIQRequest(IQ iqRequest);
+ IQ handleIQRequest(IQ iqRequest);
- public Mode getMode();
+ Mode getMode();
- public IQ.Type getType();
+ IQ.Type getType();
- public String getElement();
+ String getElement();
- public String getNamespace();
+ String getNamespace();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
index 19afa01c8..9bdb6194a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java
@@ -28,5 +28,5 @@ public interface Element {
*
* @return the stanza(/packet) extension as XML.
*/
- public CharSequence toXML();
+ CharSequence toXML();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
index fcd268a19..c4b16f3ea 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/EmptyResultIQ.java
@@ -25,7 +25,7 @@ public class EmptyResultIQ extends IQ {
public EmptyResultIQ(IQ request) {
this();
- initialzeAsResultFor(request);
+ initializeAsResultFor(request);
}
@Override
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
index bfecd3f65..783eb5b7d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/ExtensionElement.java
@@ -40,6 +40,6 @@ public interface ExtensionElement extends NamedElement {
*
* @return the namespace.
*/
- public String getNamespace();
+ String getNamespace();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
index 700fef0bc..87217346d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
@@ -215,7 +215,7 @@ public abstract class IQ extends Stanza {
*/
protected abstract IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml);
- protected final void initialzeAsResultFor(IQ request) {
+ protected final void initializeAsResultFor(IQ request) {
if (!(request.getType() == Type.get || request.getType() == Type.set)) {
throw new IllegalArgumentException(
"IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML());
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
index bc22e1c25..53d735d14 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java
@@ -28,6 +28,6 @@ public interface NamedElement extends Element {
*
* @return the element name.
*/
- public String getElementName();
+ String getElementName();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
index d7126089a..bd1c93dc5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
@@ -28,15 +28,15 @@ import java.util.Set;
@Deprecated
public interface Packet extends TopLevelStreamElement {
- public static final String TEXT = "text";
- public static final String ITEM = "item";
+ String TEXT = "text";
+ String ITEM = "item";
/**
* Returns the unique ID of the stanza. The returned value could be
null
.
*
* @return the packet's unique ID or null
if the id is not available.
*/
- public String getStanzaId();
+ String getStanzaId();
/**
* Get the stanza id.
@@ -44,7 +44,7 @@ public interface Packet extends TopLevelStreamElement {
* @deprecated use {@link #getStanzaId()} instead.
*/
@Deprecated
- public String getPacketID();
+ String getPacketID();
/**
* Sets the unique ID of the packet. To indicate that a stanza(/packet) has no id
@@ -52,7 +52,7 @@ public interface Packet extends TopLevelStreamElement {
*
* @param id the unique ID for the packet.
*/
- public void setStanzaId(String id);
+ void setStanzaId(String id);
/**
* Set the stanza ID.
@@ -60,7 +60,7 @@ public interface Packet extends TopLevelStreamElement {
* @deprecated use {@link #setStanzaId(String)} instead.
*/
@Deprecated
- public void setPacketID(String packetID);
+ void setPacketID(String packetID);
/**
* Returns who the stanza(/packet) is being sent "to", or null if
@@ -70,7 +70,7 @@ public interface Packet extends TopLevelStreamElement {
* @return who the stanza(/packet) is being sent to, or null if the
* value has not been set.
*/
- public String getTo();
+ String getTo();
/**
* Sets who the stanza(/packet) is being sent "to". The XMPP protocol often makes
@@ -78,7 +78,7 @@ public interface Packet extends TopLevelStreamElement {
*
* @param to who the stanza(/packet) is being sent to.
*/
- public void setTo(String to);
+ void setTo(String to);
/**
* Returns who the stanza(/packet) is being sent "from" or null if
@@ -88,7 +88,7 @@ public interface Packet extends TopLevelStreamElement {
* @return who the stanza(/packet) is being sent from, or null if the
* value has not been set.
*/
- public String getFrom();
+ String getFrom();
/**
* Sets who the stanza(/packet) is being sent "from". The XMPP protocol often
@@ -97,7 +97,7 @@ public interface Packet extends TopLevelStreamElement {
*
* @param from who the stanza(/packet) is being sent to.
*/
- public void setFrom(String from);
+ void setFrom(String from);
/**
* Returns the error associated with this packet, or null if there are
@@ -105,34 +105,34 @@ public interface Packet extends TopLevelStreamElement {
*
* @return the error sub-packet or null if there isn't an error.
*/
- public XMPPError getError();
+ XMPPError getError();
/**
* Sets the error for this packet.
*
* @param error the error to associate with this packet.
*/
- public void setError(XMPPError error);
+ void setError(XMPPError error);
/**
* Returns the xml:lang of this Stanza, or null if one has not been set.
*
* @return the xml:lang of this Stanza, or null.
*/
- public String getLanguage();
+ String getLanguage();
/**
* Sets the xml:lang of this Stanza.
*
* @param language the xml:lang of this Stanza.
*/
- public void setLanguage(String language);
+ void setLanguage(String language);
/**
* Returns a copy of the stanza(/packet) extensions attached to the packet.
*
* @return the stanza(/packet) extensions.
*/
- public List getExtensions();
+ List getExtensions();
/**
* Return a set of all extensions with the given element name and namespace.
@@ -145,7 +145,7 @@ public interface Packet extends TopLevelStreamElement {
* @return a set of all matching extensions.
* @since 4.1
*/
- public Set getExtensions(String elementName, String namespace);
+ Set getExtensions(String elementName, String namespace);
/**
* Returns the first extension of this stanza(/packet) that has the given namespace.
@@ -156,7 +156,7 @@ public interface Packet extends TopLevelStreamElement {
* @param namespace the namespace of the extension that is desired.
* @return the stanza(/packet) extension with the given namespace.
*/
- public ExtensionElement getExtension(String namespace);
+ ExtensionElement getExtension(String namespace);
/**
* Returns the first stanza(/packet) extension that matches the specified element name and
@@ -173,20 +173,20 @@ public interface Packet extends TopLevelStreamElement {
* @param namespace the XML element namespace of the stanza(/packet) extension.
* @return the extension, or null if it doesn't exist.
*/
- public PE getExtension(String elementName, String namespace);
+ PE getExtension(String elementName, String namespace);
/**
* Adds a stanza(/packet) extension to the packet. Does nothing if extension is null.
*
* @param extension a stanza(/packet) extension.
*/
- public void addExtension(ExtensionElement extension);
+ void addExtension(ExtensionElement extension);
/**
* Adds a collection of stanza(/packet) extensions to the packet. Does nothing if extensions is null.
*
* @param extensions a collection of stanza(/packet) extensions
*/
- public void addExtensions(Collection extensions);
+ void addExtensions(Collection extensions);
/**
* Check if a stanza(/packet) extension with the given element and namespace exists.
@@ -198,7 +198,7 @@ public interface Packet extends TopLevelStreamElement {
* @param namespace
* @return true if a stanza(/packet) extension exists, false otherwise.
*/
- public boolean hasExtension(String elementName, String namespace);
+ boolean hasExtension(String elementName, String namespace);
/**
* Check if a stanza(/packet) extension with the given namespace exists.
@@ -206,7 +206,7 @@ public interface Packet extends TopLevelStreamElement {
* @param namespace
* @return true if a stanza(/packet) extension exists, false otherwise.
*/
- public boolean hasExtension(String namespace);
+ boolean hasExtension(String namespace);
/**
* Remove the stanza(/packet) extension with the given elementName and namespace.
@@ -215,7 +215,7 @@ public interface Packet extends TopLevelStreamElement {
* @param namespace
* @return the removed stanza(/packet) extension or null.
*/
- public ExtensionElement removeExtension(String elementName, String namespace);
+ ExtensionElement removeExtension(String elementName, String namespace);
/**
* Removes a stanza(/packet) extension from the packet.
@@ -223,10 +223,10 @@ public interface Packet extends TopLevelStreamElement {
* @param extension the stanza(/packet) extension to remove.
* @return the removed stanza(/packet) extension or null.
*/
- public ExtensionElement removeExtension(ExtensionElement extension);
+ ExtensionElement removeExtension(ExtensionElement extension);
@Override
// NOTE When Smack is using Java 8, then this method should be moved in Element as "Default Method".
- public String toString();
+ String toString();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
index b37fa3917..5ec0c3453 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
/**
* Represents a stream error packet. Stream errors are unrecoverable errors where the server
- * will close the unrelying TCP connection after the stream error was sent to the client.
+ * will close the underlying TCP connection after the stream error was sent to the client.
* These is the list of stream errors as defined in the XMPP spec:
*
*
@@ -174,7 +174,7 @@ public class StreamError extends AbstractError implements Nonza {
restricted_xml,
see_other_host,
system_shutdown,
- undeficed_condition,
+ undefined_condition,
unsupported_encoding,
unsupported_feature,
unsupported_stanza_type,
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
index 232a61ec6..87721a571 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
@@ -39,6 +39,6 @@ public interface ParsingExceptionCallback {
* @param stanzaData the raw stanza data that caused the exception
* @throws Exception
*/
- public void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
+ void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
index de5f2e28c..7784e4523 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
@@ -45,7 +45,7 @@ import org.jxmpp.util.XmppStringUtils;
* - jabber:iq:register
*
* Because many more IQ types are part of XMPP and its extensions, a pluggable IQ parsing
- * mechanism is provided. IQ providers are registered programatically or by creating a
+ * mechanism is provided. IQ providers are registered programmatically or by creating a
* providers file. The file is an XML
* document that contains one or more iqProvider entries, as in the following example:
*
@@ -100,7 +100,7 @@ import org.jxmpp.util.XmppStringUtils;
* is found in a packet, parsing will be passed to the correct provider. Each provider
* can either implement the PacketExtensionProvider interface or be a standard Java Bean. In
* the former case, each extension provider is responsible for parsing the raw XML stream to
- * contruct an object. In the latter case, bean introspection is used to try to automatically
+ * construct an object. In the latter case, bean introspection is used to try to automatically
* set the properties of th class using the values in the stanza(/packet) extension sub-element. When an
* extension provider is not registered for an element name and namespace combination, Smack will
* store all top-level elements of the sub-packet in DefaultPacketExtension object and then
@@ -207,7 +207,7 @@ public final class ProviderManager {
/**
* Removes an IQ provider with the specified element name and namespace. This
- * method is typically called to cleanup providers that are programatically added
+ * method is typically called to cleanup providers that are programmatically added
* using the {@link #addIQProvider(String, String, Object) addIQProvider} method.
*
* @param elementName the XML element name.
@@ -237,7 +237,7 @@ public final class ProviderManager {
*
* @param elementName element name associated with extension provider.
* @param namespace namespace associated with extension provider.
- * @return the extenion provider.
+ * @return the extension provider.
*/
public static ExtensionElementProvider getExtensionProvider(String elementName, String namespace) {
String key = getKey(elementName, namespace);
@@ -269,7 +269,7 @@ public final class ProviderManager {
/**
* Removes an extension provider with the specified element name and namespace. This
- * method is typically called to cleanup providers that are programatically added
+ * method is typically called to cleanup providers that are programmatically added
* using the {@link #addExtensionProvider(String, String, Object) addExtensionProvider} method.
*
* @param elementName the XML element name.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
index 51df1a1a3..5c222f9b2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketConnection.java
@@ -78,7 +78,7 @@ class HTTPProxySocketConnection implements ProxySocketConnection {
got.append(c);
if (got.length() > 1024)
{
- throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Recieved " +
+ throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Received " +
"header of >1024 characters from "
+ proxyhost + ", cancelling connection");
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
index c0e9c25af..7b312e2d3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java
@@ -25,7 +25,7 @@ package org.jivesoftware.smack.proxy;
public class ProxyInfo
{
- public static enum ProxyType
+ public enum ProxyType
{
HTTP,
SOCKS4,
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
index ededc4522..aad3cb5bf 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxySocketConnection.java
@@ -21,7 +21,7 @@ import java.net.Socket;
public interface ProxySocketConnection {
- public void connect(Socket socket, String host, int port, int timeout)
+ void connect(Socket socket, String host, int port, int timeout)
throws IOException;
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
index b416319d0..a1fcd1b65 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
@@ -117,7 +117,7 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
90: request granted
91: request rejected or failed
- 92: request rejected becasue SOCKS server cannot connect to
+ 92: request rejected because SOCKS server cannot connect to
identd on the client
93: request rejected because the client program and identd
report different user-ids
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
index 65f033b18..8ee5ba1ba 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
@@ -246,7 +246,7 @@ public abstract class ScramMechanism extends SASLMechanism {
return gs2Header;
}
- return ByteUtils.concact(gs2Header, cbindData);
+ return ByteUtils.concat(gs2Header, cbindData);
}
protected String getChannelBindingName() {
@@ -394,7 +394,7 @@ public abstract class ScramMechanism extends SASLMechanism {
throw new AssertionError();
}
// U1 := HMAC(str, salt + INT(1))
- byte[] u = hmac(key, ByteUtils.concact(salt, ONE));
+ byte[] u = hmac(key, ByteUtils.concat(salt, ONE));
byte[] res = u.clone();
for (int i = 1; i < iterations; i++) {
u = hmac(key, u);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
index 86b6dae09..ea80fd549 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/Async.java
@@ -73,7 +73,7 @@ public class Async {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
}
- LOGGER.log(Level.WARNING, "Catched Exception", e);
+ LOGGER.log(Level.WARNING, "Caught Exception", e);
}
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
index 1e6b0ed99..6d52b4cf2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java
@@ -17,7 +17,7 @@
package org.jivesoftware.smack.util;
public class ByteUtils {
- public static byte[] concact(byte[] arrayOne, byte[] arrayTwo) {
+ public static byte[] concat(byte[] arrayOne, byte[] arrayTwo) {
int combinedLength = arrayOne.length + arrayTwo.length;
byte[] res = new byte[combinedLength];
System.arraycopy(arrayOne, 0, res, 0, arrayOne.length);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/IpAddressUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/IpAddressUtil.java
index 26c710acf..8d1ad7b78 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/IpAddressUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/IpAddressUtil.java
@@ -29,7 +29,9 @@ public class IpAddressUtil {
return false;
}
- for (int i = 0; i < 3; i++) {
+ assert matcher.groupCount() == 4;
+
+ for (int i = 1; i <= 4; i++) {
String ipSegment = matcher.group(i);
int ipSegmentInt;
try {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
index 6baf74625..2ca66515a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java
@@ -35,7 +35,7 @@ public class LazyStringBuilder implements Appendable, CharSequence {
}
public LazyStringBuilder() {
- list = new ArrayList(20);
+ list = new ArrayList<>(20);
}
public LazyStringBuilder append(LazyStringBuilder lsb) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
index a92d00c28..b53c0f429 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java
@@ -90,19 +90,17 @@ public class ObservableWriter extends Writer {
/**
* Notify that a new string has been written.
- *
- * @param str the written String to notify
*/
private void notifyListeners() {
- WriterListener[] writerListeners = null;
+ WriterListener[] writerListeners;
synchronized (listeners) {
writerListeners = new WriterListener[listeners.size()];
listeners.toArray(writerListeners);
}
String str = stringBuilder.toString();
stringBuilder.setLength(0);
- for (int i = 0; i < writerListeners.length; i++) {
- writerListeners[i].write(str);
+ for (WriterListener writerListener : writerListeners) {
+ writerListener.write(str);
}
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 4c02ee080..5c6267381 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -229,7 +229,7 @@ public class PacketParserUtils {
String language = getLanguageAttribute(parser);
// determine message's default language
- String defaultLanguage = null;
+ String defaultLanguage;
if (language != null && !"".equals(language.trim())) {
message.setLanguage(language);
defaultLanguage = language;
@@ -746,7 +746,7 @@ public class PacketParserUtils {
public static Map parseDescriptiveTexts(XmlPullParser parser, Map descriptiveTexts)
throws XmlPullParserException, IOException {
if (descriptiveTexts == null) {
- descriptiveTexts = new HashMap();
+ descriptiveTexts = new HashMap<>();
}
String xmllang = getLanguageAttribute(parser);
if (xmllang == null) {
@@ -805,7 +805,7 @@ public class PacketParserUtils {
*/
public static StreamError parseStreamError(XmlPullParser parser) throws Exception {
final int initialDepth = parser.getDepth();
- List extensions = new ArrayList();
+ List extensions = new ArrayList<>();
Map descriptiveTexts = null;
StreamError.Condition condition = null;
String conditionText = null;
@@ -857,7 +857,7 @@ public class PacketParserUtils {
throws Exception {
final int initialDepth = parser.getDepth();
Map descriptiveTexts = null;
- List extensions = new ArrayList();
+ List extensions = new ArrayList<>();
XMPPError.Builder builder = XMPPError.getBuilder();
// Parse the error header
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
index a94369792..138f6d32a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
@@ -32,7 +32,7 @@ public class PacketUtil {
* @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead
*/
@Deprecated
- public static PE packetExtensionfromCollection(
+ public static PE packetExtensionFromCollection(
Collection collection, String element,
String namespace) {
return extensionElementFrom(collection, element, namespace);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
index 14a003a21..d42dc963a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
@@ -138,11 +138,7 @@ public class ParserUtils {
if (valueString == null)
return null;
valueString = valueString.toLowerCase(Locale.US);
- if (valueString.equals("true") || valueString.equals("0")) {
- return true;
- } else {
- return false;
- }
+ return valueString.equals("true") || valueString.equals("0");
}
public static boolean getBooleanAttribute(XmlPullParser parser, String name,
@@ -232,8 +228,7 @@ public class ParserUtils {
public static URI getUriFromNextText(XmlPullParser parser) throws XmlPullParserException, IOException, URISyntaxException {
String uriString = parser.nextText();
- URI uri = new URI(uriString);
- return uri;
+ return new URI(uriString);
}
public static String getRequiredAttribute(XmlPullParser parser, String name) throws IOException {
@@ -253,7 +248,6 @@ public class ParserUtils {
}
public static String getXmlLang(XmlPullParser parser) {
- String langString = parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
- return langString;
+ return parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
}
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
index 9fc4d081e..b6c1ee802 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java
@@ -33,6 +33,6 @@ public interface ReaderListener {
*
* @param str the read String
*/
- public abstract void read(String str);
+ void read(String str);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
index 701ee2953..313dcf29e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringTransformer.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smack.util;
public interface StringTransformer {
- public String transform(String string);
+ String transform(String string);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
index 7cd75590b..70f6494e0 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
@@ -431,10 +431,10 @@ public class StringUtils {
}
public static boolean nullSafeCharSequenceEquals(CharSequence csOne, CharSequence csTwo) {
- return nullSafeCharSequenceComperator(csOne, csTwo) == 0;
+ return nullSafeCharSequenceComparator(csOne, csTwo) == 0;
}
- public static int nullSafeCharSequenceComperator(CharSequence csOne, CharSequence csTwo) {
+ public static int nullSafeCharSequenceComparator(CharSequence csOne, CharSequence csTwo) {
if (csOne == null ^ csTwo == null) {
return (csOne == null) ? -1 : 1;
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/SuccessCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/util/SuccessCallback.java
index ba4d24162..f12617c44 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/SuccessCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/SuccessCallback.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smack.util;
public interface SuccessCallback {
- public void onSuccess(T result);
+ void onSuccess(T result);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
index 94a83c3b0..fb7a7745e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
@@ -55,7 +55,7 @@ public class TLSUtils {
* According to the Encrypted
* XMPP Manifesto, TLSv1.2 shall be deployed, providing fallback support for SSLv3 and
- * TLSv1.1. This method goes one step boyond and upgrades the handshake to use TLSv1 or better.
+ * TLSv1.1. This method goes one step beyond and upgrades the handshake to use TLSv1 or better.
* This method requires the underlying OS to support all of TLSv1.2 , 1.1 and 1.0.
*
*
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
index 226b5e3d8..0a2121845 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java
@@ -29,6 +29,6 @@ public interface TypedCloneable extends Cloneable {
*
* @return a cloned version of this instance.
*/
- public T clone();
+ T clone();
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
index 7e72acbab..1ef53d3bf 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java
@@ -33,6 +33,6 @@ public interface WriterListener {
*
* @param str the written string
*/
- public abstract void write(String str);
+ void write(String str);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
index e0b4a3847..987ea9424 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
@@ -81,7 +81,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
/**
* Add a new element to this builder, with the {@link java.util.Date} instance as its content,
- * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
+ * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
*
* @param name element name
* @param content content of element
@@ -123,7 +123,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
/**
* Add a new element to this builder, with the {@link java.util.Date} instance as its content,
- * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
+ * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
* if {@link java.util.Date} instance is not
null
.
*
* @param name element name
@@ -245,7 +245,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
/**
* Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
- * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
+ * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
*
* @param name name of attribute
* @param value value of attribute
@@ -280,7 +280,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
/**
* Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
- * which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
+ * which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
* if {@link java.util.Date} instance is not null
.
*
* @param name attribute name
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
index c2823213c..dc1b79306 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
@@ -20,6 +20,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode;
@@ -91,6 +92,22 @@ public abstract class DNSResolver {
return Arrays.asList(inetAddressArray);
}
+ protected final boolean shouldContinue(CharSequence name, CharSequence hostname, List hostAddresses) {
+ if (hostAddresses == null) {
+ return true;
+ }
+
+ // If hostAddresses is not null but empty, then the DNS resolution was successful but the domain did not
+ // have any A or AAAA resource records.
+ if (hostAddresses.isEmpty()) {
+ LOGGER.log(Level.INFO, "The DNS name " + name + ", points to a hostname (" + hostname
+ + ") which has neither A or AAAA resource records. This is an indication of a broken DNS setup.");
+ return true;
+ }
+
+ return false;
+ }
+
private final void checkIfDnssecRequestedAndSupported(DnssecMode dnssecMode) {
if (dnssecMode != DnssecMode.disabled && !supportsDnssec) {
throw new UnsupportedOperationException("This resolver does not support DNSSEC");
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
index 66a6d018a..780518128 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
@@ -43,7 +43,7 @@ public class HostAddress {
public HostAddress(String fqdn, int port, List inetAddresses) {
if (port < 0 || port > 65535)
throw new IllegalArgumentException(
- "Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
+ "Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
if (StringUtils.isNotEmpty(fqdn) && fqdn.charAt(fqdn.length() - 1) == '.') {
this.fqdn = fqdn.substring(0, fqdn.length() - 1);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
index f63c94e49..75feb7bc5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java
@@ -48,12 +48,12 @@ public class SRVRecord extends HostAddress implements Comparable {
StringUtils.requireNotNullOrEmpty(fqdn, "The FQDN must not be null");
if (weight < 0 || weight > 65535)
throw new IllegalArgumentException(
- "DNS SRV records weight must be a 16-bit unsiged integer (i.e. between 0-65535. Weight was: "
+ "DNS SRV records weight must be a 16-bit unsigned integer (i.e. between 0-65535. Weight was: "
+ weight);
if (priority < 0 || priority > 65535)
throw new IllegalArgumentException(
- "DNS SRV records priority must be a 16-bit unsiged integer (i.e. between 0-65535. Priority was: "
+ "DNS SRV records priority must be a 16-bit unsigned integer (i.e. between 0-65535. Priority was: "
+ priority);
this.priority = priority;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
index 585c84659..1ee1180a9 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -105,7 +105,7 @@ public class StanzaCollectorTest
@Override
public void run()
{
- Stanza p = null;
+ Stanza p;
do
{
@@ -134,7 +134,7 @@ public class StanzaCollectorTest
@Override
public void run()
{
- Stanza p = null;
+ Stanza p;
do
{
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
index ba7806491..39101c2dd 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
@@ -37,8 +37,8 @@ import org.jivesoftware.smack.packet.Stanza;
public class ThreadedDummyConnection extends DummyConnection {
private static final Logger LOGGER = Logger.getLogger(ThreadedDummyConnection.class.getName());
- private BlockingQueue replyQ = new ArrayBlockingQueue(1);
- private BlockingQueue messageQ = new LinkedBlockingQueue(5);
+ private final BlockingQueue replyQ = new ArrayBlockingQueue<>(1);
+ private final BlockingQueue messageQ = new LinkedBlockingQueue<>(5);
private volatile boolean timeout = false;
@Override
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
index 4c546c9c2..45d598240 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
@@ -142,7 +142,7 @@ public class MessageTest {
XmlUnitUtils.assertSimilar(control, message.toXML());
Collection languages = message.getBodyLanguages();
- List controlLanguages = new ArrayList();
+ List controlLanguages = new ArrayList<>();
controlLanguages.add(lang2);
controlLanguages.add(lang3);
controlLanguages.removeAll(languages);
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
index d59404759..1b96306a6 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smack.parsing;
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
import static org.junit.Assert.assertThat;
import org.jivesoftware.smack.SmackException;
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
index 05f3b1469..0288a55c4 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.util.StringUtils;
import org.jxmpp.jid.EntityBareJid;
@@ -40,7 +39,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
super(saslMechanism);
}
- protected void runTest(boolean useAuthzid) throws NotConnectedException, SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
+ protected void runTest(boolean useAuthzid) throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
EntityBareJid authzid = null;
if (useAuthzid) {
authzid = JidCreate.entityBareFrom("shazbat@xmpp.org");
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java
new file mode 100644
index 000000000..479ba39e7
--- /dev/null
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/CharSequenceEquals.java
@@ -0,0 +1,47 @@
+/**
+ *
+ * Copyright © 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.test.util;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+public class CharSequenceEquals extends TypeSafeMatcher {
+
+ private final String charSequenceString;
+
+ public CharSequenceEquals(CharSequence charSequence) {
+ charSequenceString = charSequence.toString();
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Does not match CharSequence ").appendValue(charSequenceString);
+ }
+
+ @Override
+ protected boolean matchesSafely(CharSequence item) {
+ String itemString = item.toString();
+ return charSequenceString.equals(itemString);
+ }
+
+ @Factory
+ public static Matcher equalsCharSequence(CharSequence charSequence) {
+ return new CharSequenceEquals(charSequence);
+ }
+}
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/IpAddressUtilTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/IpAddressUtilTest.java
new file mode 100644
index 000000000..575c71714
--- /dev/null
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/IpAddressUtilTest.java
@@ -0,0 +1,46 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class IpAddressUtilTest {
+
+ @Test
+ public void isIpV4AddressTest() {
+ String ipv4 = "122.20.221.11";
+ boolean isIpV4 = IpAddressUtil.isIPv4LiteralAddress(ipv4);
+ assertTrue(isIpV4);
+ }
+
+ @Test
+ public void isInvalidIpV4AddressTest() {
+ String ipv4 = "122.20.221.11.1";
+ boolean isIpV4 = IpAddressUtil.isIPv4LiteralAddress(ipv4);
+ assertFalse(isIpV4);
+ }
+
+ @Test
+ public void isInvalidIpV4AddressTest2() {
+ String ipv4 = "122.20.256.11";
+ boolean isIpV4 = IpAddressUtil.isIPv4LiteralAddress(ipv4);
+ assertFalse(isIpV4);
+ }
+}
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
index bdbeb4e1a..5674a1058 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
@@ -809,7 +809,7 @@ public class PacketParserUtilsTest {
IOException, TransformerException, SAXException {
// @formatter:off
final String stanza = XMLBuilder.create("outer", "outerNamespace").a("outerAttribute", "outerValue")
- .element("inner", "innerNamespace").a("innverAttribute", "innerValue")
+ .element("inner", "innerNamespace").a("innerAttribute", "innerValue")
.element("innermost")
.t("some text")
.asString();
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index 37af7e40c..ea55b2e61 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -240,7 +240,7 @@ public final class EnhancedDebuggerWindow {
JPanel iqProvidersPanel = new JPanel();
iqProvidersPanel.setLayout(new GridLayout(1, 1));
iqProvidersPanel.setBorder(BorderFactory.createTitledBorder("Installed IQ Providers"));
- Vector providers = new Vector();
+ Vector providers = new Vector<>();
for (Object provider : ProviderManager.getIQProviders()) {
if (provider.getClass() == Class.class) {
providers.add(((Class>) provider).getName());
@@ -259,7 +259,7 @@ public final class EnhancedDebuggerWindow {
JPanel extensionProvidersPanel = new JPanel();
extensionProvidersPanel.setLayout(new GridLayout(1, 1));
extensionProvidersPanel.setBorder(BorderFactory.createTitledBorder("Installed Extension Providers"));
- providers = new Vector();
+ providers = new Vector<>();
for (Object provider : ProviderManager.getExtensionProviders()) {
if (provider.getClass() == Class.class) {
providers.add(((Class>) provider).getName());
@@ -305,7 +305,7 @@ public final class EnhancedDebuggerWindow {
menuItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- ArrayList debuggersToRemove = new ArrayList();
+ ArrayList debuggersToRemove = new ArrayList<>();
// Remove all the debuggers of which their connections are no longer valid
for (int index = 0; index < tabbedPane.getComponentCount() - 1; index++) {
EnhancedDebugger debugger = debuggers.get(index);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
index f6d63952d..b0e1f9685 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
@@ -123,7 +123,7 @@ public class CarbonExtension implements ExtensionElement {
/**
* Defines the direction of a {@link CarbonExtension} message.
*/
- public static enum Direction {
+ public enum Direction {
received,
sent
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
index c98f22cd4..04e0df9c6 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java
@@ -48,7 +48,7 @@ public class ExplicitMessageEncryptionElement implements ExtensionElement {
private final String namespace;
private final String name;
- private ExplicitMessageEncryptionProtocol(String namespace, String name) {
+ ExplicitMessageEncryptionProtocol(String namespace, String name) {
this.namespace = namespace;
this.name = name;
PROTOCOL_LUT.put(namespace, this);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
index 0842b15ae..03f335e02 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java
@@ -90,7 +90,7 @@ public abstract class AbstractHttpOverXmpp extends IQ {
/**
* A builder for XMPP connection configurations.
*
- * See ConnectionConfiguration Buidler for more details.
+ * See ConnectionConfiguration Builder for more details.
*
*
* @param the builder type parameter.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
index da2e6d609..9bf90c443 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
@@ -64,7 +64,18 @@ import org.jxmpp.jid.DomainBareJid;
*/
public final class HttpFileUploadManager extends Manager {
+ /**
+ * Namespace of XEP-0363 v0.4 or higher. Constant value {@value #NAMESPACE}.
+ *
+ * @see XEP-0363 v0.4.0
+ */
public static final String NAMESPACE = "urn:xmpp:http:upload:0";
+
+ /**
+ * Namespace of XEP-0363 v0.2 or lower. Constant value {@value #NAMESPACE_0_2}.
+ *
+ * @see XEP-0363 v0.2.5
+ */
public static final String NAMESPACE_0_2 = "urn:xmpp:http:upload";
private static final Logger LOGGER = Logger.getLogger(HttpFileUploadManager.class.getName());
@@ -459,6 +470,22 @@ public final class HttpFileUploadManager extends Manager {
}
}
+ public static UploadService.Version namespaceToVersion(String namespace) {
+ UploadService.Version version;
+ switch (namespace) {
+ case NAMESPACE:
+ version = Version.v0_3;
+ break;
+ case NAMESPACE_0_2:
+ version = Version.v0_2;
+ break;
+ default:
+ version = null;
+ break;
+ }
+ return version;
+ }
+
private static boolean containsHttpFileUploadNamespace(DiscoverInfo discoverInfo) {
return discoverInfo.containsFeature(NAMESPACE) || discoverInfo.containsFeature(NAMESPACE_0_2);
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/UploadService.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/UploadService.java
index e2627629f..b903b84c3 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/UploadService.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/UploadService.java
@@ -22,8 +22,19 @@ import org.jxmpp.jid.DomainBareJid;
public class UploadService {
- enum Version {
+ public enum Version {
+ /**
+ * Upload service as specified in XEP-0363 v0.2 or lower.
+ *
+ * @see XEP-0363 v0.2.5
+ */
v0_2,
+
+ /**
+ * Upload service as specified in XEP-0363 v0.3 or higher.
+ *
+ * @see XEP-0363 v0.4.0
+ */
v0_3,
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot.java
index 943929f9f..274e59bc0 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot.java
@@ -33,8 +33,9 @@ public class Slot extends IQ {
public static final String ELEMENT = "slot";
public static final String NAMESPACE = SlotRequest.NAMESPACE;
- private final URL putUrl;
- private final URL getUrl;
+ protected final URL putUrl;
+ protected final URL getUrl;
+
private final Map headers;
public Slot(URL putUrl, URL getUrl) {
@@ -73,12 +74,21 @@ public class Slot extends IQ {
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
xml.rightAngleBracket();
- xml.element("put", putUrl.toString());
- xml.element("get", getUrl.toString());
- for (Map.Entry entry : getHeaders().entrySet()) {
- xml.openElement("header").attribute(entry.getKey(), entry.getValue());
+ xml.halfOpenElement("put").attribute("url", putUrl.toString());
+ if (headers.isEmpty()) {
+ xml.closeEmptyElement();
+ } else {
+ xml.rightAngleBracket();
+ for (Map.Entry entry : getHeaders().entrySet()) {
+ xml.halfOpenElement("header").attribute("name", entry.getKey()).rightAngleBracket();
+ xml.escape(entry.getValue());
+ xml.closeElement("header");
+ }
+ xml.closeElement("put");
}
+ xml.halfOpenElement("get").attribute("url", getUrl.toString()).closeEmptyElement();
+
return xml;
}
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot_V0_2.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot_V0_2.java
index 20645ac1a..e44fc3e42 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot_V0_2.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/Slot_V0_2.java
@@ -28,4 +28,13 @@ public class Slot_V0_2 extends Slot {
super(putUrl, getUrl, null, NAMESPACE);
}
+ @Override
+ protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
+ xml.rightAngleBracket();
+
+ xml.element("put", putUrl.toString());
+ xml.element("get", getUrl.toString());
+
+ return xml;
+ }
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
index 4647f168c..5d3b069e1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright © 2017 Grigory Fedorov
+ * Copyright © 2017 Grigory Fedorov, Florian Schmaus
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager;
+import org.jivesoftware.smackx.httpfileupload.UploadService;
import org.jivesoftware.smackx.httpfileupload.element.Slot;
import org.jivesoftware.smackx.httpfileupload.element.Slot_V0_2;
@@ -42,9 +44,13 @@ public class SlotProvider extends IQProvider {
@Override
public Slot parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException, SmackException {
final String namespace = parser.getNamespace();
+
+ final UploadService.Version version = HttpFileUploadManager.namespaceToVersion(namespace);
+ assert version != null;
+
URL putUrl = null;
URL getUrl = null;
- Map headers = null;
+ PutElement_V0_4_Content putElementV04Content = null;
outerloop: while (true) {
int event = parser.next();
@@ -53,19 +59,33 @@ public class SlotProvider extends IQProvider {
case XmlPullParser.START_TAG:
String name = parser.getName();
switch (name) {
- case "put":
- putUrl = new URL(parser.nextText());
- break;
- case "get":
- getUrl = new URL(parser.nextText());
- break;
- case "header":
- String headerName = ParserUtils.getRequiredAttribute(parser, "name");
- String headerValue = ParserUtils.getRequiredNextText(parser);
- if (headers == null) {
- headers = new HashMap<>();
+ case "put": {
+ switch (version) {
+ case v0_2:
+ String putUrlString = parser.nextText();
+ putUrl = new URL(putUrlString);
+ break;
+ case v0_3:
+ putElementV04Content = parsePutElement_V0_4(parser);
+ break;
+ default:
+ throw new AssertionError();
}
- headers.put(headerName, headerValue);
+ break;
+ }
+ case "get":
+ String getUrlString;
+ switch (version) {
+ case v0_2:
+ getUrlString = parser.nextText();
+ break;
+ case v0_3:
+ getUrlString = parser.getAttributeValue(null, "url");
+ break;
+ default:
+ throw new AssertionError();
+ }
+ getUrl = new URL(getUrlString);
break;
}
break;
@@ -77,13 +97,67 @@ public class SlotProvider extends IQProvider {
}
}
- switch (namespace) {
- case Slot.NAMESPACE:
- return new Slot(putUrl, getUrl, headers);
- case Slot_V0_2.NAMESPACE:
+ switch (version) {
+ case v0_3:
+ return new Slot(putElementV04Content.putUrl, getUrl, putElementV04Content.headers);
+ case v0_2:
return new Slot_V0_2(putUrl, getUrl);
default:
throw new AssertionError();
}
}
+
+ public static PutElement_V0_4_Content parsePutElement_V0_4(XmlPullParser parser) throws XmlPullParserException, IOException {
+ final int initialDepth = parser.getDepth();
+
+ String putUrlString = parser.getAttributeValue(null, "url");
+ URL putUrl = new URL(putUrlString);
+
+ Map headers = null;
+ outerloop: while (true) {
+ int next = parser.next();
+ switch (next) {
+ case XmlPullParser.START_TAG:
+ String name = parser.getName();
+ switch (name) {
+ case "header":
+ String headerName = ParserUtils.getRequiredAttribute(parser, "name");
+ String headerValue = ParserUtils.getRequiredNextText(parser);
+ if (headers == null) {
+ headers = new HashMap<>();
+ }
+ headers.put(headerName, headerValue);
+ break;
+ default:
+ break;
+ }
+ break;
+ case XmlPullParser.END_TAG:
+ if (parser.getDepth() == initialDepth) {
+ break outerloop;
+ }
+ break;
+ }
+ }
+
+ return new PutElement_V0_4_Content(putUrl, headers);
+ }
+
+ public static final class PutElement_V0_4_Content {
+ private final URL putUrl;
+ private final Map headers;
+
+ private PutElement_V0_4_Content(URL putUrl, Map headers) {
+ this.putUrl = putUrl;
+ this.headers = headers;
+ }
+
+ public URL getPutUrl() {
+ return putUrl;
+ }
+
+ public Map getHeaders() {
+ return headers;
+ }
+ }
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
index 3eb58e40e..cfdc245c7 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/ThingControlRequest.java
@@ -26,6 +26,6 @@ import org.jxmpp.jid.Jid;
public interface ThingControlRequest {
- public void processRequest(Jid from, Collection setData) throws XMPPErrorException;
+ void processRequest(Jid from, Collection setData) throws XMPPErrorException;
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
index a742355af..68fce1441 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/IoTSetResponse.java
@@ -29,7 +29,7 @@ public class IoTSetResponse extends IQ {
public IoTSetResponse(IoTSetRequest iotSetRequest) {
this();
- initialzeAsResultFor(iotSetRequest);
+ initializeAsResultFor(iotSetRequest);
}
@Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
index 4d9e29286..e2e004f00 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
@@ -32,7 +32,7 @@ public abstract class SetData implements NamedElement {
private final String toStringCache;
- private Type() {
+ Type() {
toStringCache = this.name().toLowerCase(Locale.US);
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
index f7d2a1b59..9f3652054 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutRequest.java
@@ -18,6 +18,6 @@ package org.jivesoftware.smackx.iot.data;
public interface ThingMomentaryReadOutRequest {
- public void momentaryReadOutRequest(ThingMomentaryReadOutResult callback);
+ void momentaryReadOutRequest(ThingMomentaryReadOutResult callback);
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
index 4662552af..0f8cb431a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/ThingMomentaryReadOutResult.java
@@ -22,6 +22,6 @@ import org.jivesoftware.smackx.iot.data.element.IoTDataField;
public interface ThingMomentaryReadOutResult {
- public void momentaryReadOut(List extends IoTDataField> results);
+ void momentaryReadOut(List extends IoTDataField> results);
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
index 70f3df80d..7c370e10b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataRequest.java
@@ -24,7 +24,7 @@ public class IoTDataRequest extends IQ {
public static final String NAMESPACE = Constants.IOT_SENSORDATA_NAMESPACE;
/**
- * The sequence nummber. According to XEP-0323 an xs:int.
+ * The sequence number. According to XEP-0323 an xs:int.
*/
private final int seqNr;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
index b64d67d21..7e688adaa 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingStateChangeListener.java
@@ -20,6 +20,6 @@ import org.jxmpp.jid.BareJid;
public interface ThingStateChangeListener {
- public void owned(BareJid owner);
+ void owned(BareJid owner);
}
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
index 0ea8c6b4f..495e5019b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java
@@ -25,7 +25,7 @@ public class Tag implements NamedElement {
public enum Type {
str,
- num;
+ num
}
private final String name;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
index a1d2c9cfe..6e6177cba 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java
@@ -161,8 +161,8 @@ public final class IoTProvisioningManager extends Manager {
// Notify the recommended friend that we will now accept his
// friendship requests.
final XMPPConnection connection = connection();
- Friend friendNotifiacation = new Friend(connection.getUser().asBareJid());
- Message notificationMessage = new Message(friendJid, friendNotifiacation);
+ Friend friendNotification = new Friend(connection.getUser().asBareJid());
+ Message notificationMessage = new Message(friendJid, friendNotification);
connection.sendStanza(notificationMessage);
} else {
// Check is the message was send from a thing we previously
@@ -236,7 +236,7 @@ public final class IoTProvisioningManager extends Manager {
}
catch (NoResponseException | XMPPErrorException | NotConnectedException | InterruptedException e) {
LOGGER.log(Level.WARNING,
- "Could not determine privisioning server. Ignoring friend request from " + from, e);
+ "Could not determine provisioning server. Ignoring friend request from " + from, e);
}
if (provisioningServer == null) {
return null;
@@ -420,7 +420,7 @@ public final class IoTProvisioningManager extends Manager {
if (!provisioningServer.equals(stanza.getFrom())) {
if (log) {
LOGGER.warning("Ignoring request '" + stanza
- + "' because not from provising server '" + provisioningServer
+ + "' because not from provisioning server '" + provisioningServer
+ "'.");
}
return false;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
index d24772b0b..1723d4acb 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
@@ -239,11 +239,11 @@ public final class MamManager extends Manager {
/**
- * Query an message archive like a MUC archive or a pubsub node archive, addressed by an archiveAddress, applying
+ * Query an message archive like a MUC archive or a PubSub node archive, addressed by an archiveAddress, applying
* filters: max count, start date, end date, from/to JID and with additional fields. When archiveAddress is null the
* default, the server will be requested.
*
- * @param node The Pubsub node name, can be null
+ * @param node The PubSub node name, can be null
* @param max
* @param start
* @param end
@@ -346,7 +346,7 @@ public final class MamManager extends Manager {
/**
* Returns a page of the archive.
*
- * @param node The Pubsub node name, can be null
+ * @param node The PubSub node name, can be null
* @param dataForm
* @param rsmSet
* @return the MAM query result
@@ -498,7 +498,7 @@ public final class MamManager extends Manager {
/**
* Get the form fields supported by the server.
*
- * @param node The Pubsub node name, can be null
+ * @param node The PubSub node name, can be null
* @return the list of form fields.
* @throws NoResponseException
* @throws XMPPErrorException
@@ -521,7 +521,7 @@ public final class MamManager extends Manager {
private MamQueryResult queryArchive(MamQueryIQ mamQueryIq) throws NoResponseException, XMPPErrorException,
NotConnectedException, InterruptedException, NotLoggedInException {
final XMPPConnection connection = getAuthenticatedConnectionOrThrow();
- MamFinIQ mamFinIQ = null;
+ MamFinIQ mamFinIQ;
StanzaCollector mamFinIQCollector = connection.createStanzaCollector(new IQReplyFilter(mamQueryIq, connection));
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
index 9e854bf48..504ec56b0 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
@@ -82,7 +82,7 @@ public class MultiUserChatLight {
* Same as {@link #fromRoomFilter} together with
* {@link MessageTypeFilter#GROUPCHAT}.
*/
- private final StanzaFilter fromRoomGroupchatFilter;
+ private final StanzaFilter fromRoomGroupChatFilter;
private final StanzaListener messageListener;
@@ -93,7 +93,7 @@ public class MultiUserChatLight {
this.room = room;
fromRoomFilter = FromMatchesFilter.create(room);
- fromRoomGroupchatFilter = new AndFilter(fromRoomFilter, MessageTypeFilter.GROUPCHAT);
+ fromRoomGroupChatFilter = new AndFilter(fromRoomFilter, MessageTypeFilter.GROUPCHAT);
messageListener = new StanzaListener() {
@Override
@@ -105,7 +105,7 @@ public class MultiUserChatLight {
}
};
- connection.addSyncStanzaListener(messageListener, fromRoomGroupchatFilter);
+ connection.addSyncStanzaListener(messageListener, fromRoomGroupChatFilter);
}
/**
@@ -266,7 +266,7 @@ public class MultiUserChatLight {
throws Exception {
MUCLightCreateIQ createMUCLightIQ = new MUCLightCreateIQ(room, roomName, occupants);
- messageCollector = connection.createStanzaCollector(fromRoomGroupchatFilter);
+ messageCollector = connection.createStanzaCollector(fromRoomGroupChatFilter);
try {
connection.createStanzaCollectorAndSend(createMUCLightIQ).nextResultOrThrow();
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
index 81f270c16..67e8fdd77 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java
@@ -96,7 +96,7 @@ public final class MultiUserChatLightManager extends Manager {
private MultiUserChatLight createNewMucLightAndAddToMap(EntityBareJid jid) {
MultiUserChatLight multiUserChatLight = new MultiUserChatLight(connection(), jid);
- multiUserChatLights.put(jid, new WeakReference(multiUserChatLight));
+ multiUserChatLights.put(jid, new WeakReference<>(multiUserChatLight));
return multiUserChatLight;
}
@@ -193,11 +193,11 @@ public final class MultiUserChatLightManager extends Manager {
*/
public List getRoomsBlocked(DomainBareJid mucLightService)
throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
- MUCLightBlockingIQ muclIghtBlockingIQResult = getBlockingList(mucLightService);
+ MUCLightBlockingIQ mucLightBlockingIQResult = getBlockingList(mucLightService);
List jids = new ArrayList<>();
- if (muclIghtBlockingIQResult.getRooms() != null) {
- jids.addAll(muclIghtBlockingIQResult.getRooms().keySet());
+ if (mucLightBlockingIQResult.getRooms() != null) {
+ jids.addAll(mucLightBlockingIQResult.getRooms().keySet());
}
return jids;
@@ -215,11 +215,11 @@ public final class MultiUserChatLightManager extends Manager {
*/
public List getUsersBlocked(DomainBareJid mucLightService)
throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
- MUCLightBlockingIQ muclIghtBlockingIQResult = getBlockingList(mucLightService);
+ MUCLightBlockingIQ mucLightBlockingIQResult = getBlockingList(mucLightService);
List jids = new ArrayList<>();
- if (muclIghtBlockingIQResult.getUsers() != null) {
- jids.addAll(muclIghtBlockingIQResult.getUsers().keySet());
+ if (mucLightBlockingIQResult.getUsers() != null) {
+ jids.addAll(mucLightBlockingIQResult.getUsers().keySet());
}
return jids;
@@ -234,9 +234,9 @@ public final class MultiUserChatLightManager extends Manager {
StanzaFilter responseFilter = new IQReplyFilter(mucLightBlockingIQ, connection());
IQ responseIq = connection().createStanzaCollectorAndSend(responseFilter, mucLightBlockingIQ)
.nextResultOrThrow();
- MUCLightBlockingIQ muclIghtBlockingIQResult = (MUCLightBlockingIQ) responseIq;
+ MUCLightBlockingIQ mucLightBlockingIQResult = (MUCLightBlockingIQ) responseIq;
- return muclIghtBlockingIQResult;
+ return mucLightBlockingIQResult;
}
/**
diff --git a/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers b/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers
index 21a8281f0..b5c89b3fb 100644
--- a/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers
+++ b/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers
@@ -254,7 +254,7 @@
urn:xmpp:hints
org.jivesoftware.smackx.hints.provider.StoreHintProvider
-g
+
slot
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
index 48cca1e63..dff548f50 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
public class ExperimentalInitializerTest {
@Test
- public void testExperimentalInitialzer() {
+ public void testExperimentalInitializer() {
ExperimentalInitializer epi = new ExperimentalInitializer();
List exceptions = epi.initialize();
assertTrue(exceptions.size() == 0);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
index acf139c6e..d0dbc2cf9 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
@@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.carbons;
-import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
+import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
index 3ed4d3c12..b7d7eb595 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
@@ -49,7 +49,7 @@ public class AcknowledgedExtensionTest {
AcknowledgedExtension acknowledgedExtension1 = new AcknowledgedProvider().parse(parser);
Assert.assertEquals("message-1", acknowledgedExtension1.getId());
- Message message = (Message) PacketParserUtils.parseStanza(acknowledgedMessageStanza);
+ Message message = PacketParserUtils.parseStanza(acknowledgedMessageStanza);
AcknowledgedExtension acknowledgedExtension2 = AcknowledgedExtension.from(message);
Assert.assertEquals("message-1", acknowledgedExtension2.getId());
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
index fd8161e8b..bba42c13c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
@@ -49,7 +49,7 @@ public class DisplayedExtensionTest {
DisplayedExtension displayedExtension1 = new DisplayedProvider().parse(parser);
Assert.assertEquals("message-1", displayedExtension1.getId());
- Message message = (Message) PacketParserUtils.parseStanza(displayedMessageStanza);
+ Message message = PacketParserUtils.parseStanza(displayedMessageStanza);
DisplayedExtension displayedExtension2 = DisplayedExtension.from(message);
Assert.assertEquals("message-1", displayedExtension2.getId());
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
index 3c28d10cb..e62e0cd98 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
@@ -51,7 +51,7 @@ public class MarkableExtensionTest {
MarkableExtension markableExtension1 = new MarkableProvider().parse(parser);
Assert.assertEquals(markableExtension, markableExtension1.toXML().toString());
- Message message = (Message) PacketParserUtils.parseStanza(markableMessageStanza);
+ Message message = PacketParserUtils.parseStanza(markableMessageStanza);
MarkableExtension markableExtension2 = MarkableExtension.from(message);
Assert.assertEquals(markableExtension, markableExtension2.toXML().toString());
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
index d34dc8088..31d668571 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
@@ -49,7 +49,7 @@ public class ReceivedExtensionTest {
ReceivedExtension receivedExtension1 = new ReceivedProvider().parse(parser);
Assert.assertEquals("message-1", receivedExtension1.getId());
- Message message = (Message) PacketParserUtils.parseStanza(receivedMessageStanza);
+ Message message = PacketParserUtils.parseStanza(receivedMessageStanza);
ReceivedExtension receivedExtension2 = ReceivedExtension.from(message);
Assert.assertEquals("message-1", receivedExtension2.getId());
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
index e1dc35b78..d64427dde 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
@@ -72,7 +72,6 @@ public class HttpOverXmppReqProviderTest {
XmlPullParser parser = PacketParserUtils.getParserFor(string);
IQ iq = provider.parse(parser);
assertTrue(iq instanceof HttpOverXmppReq);
- HttpOverXmppReq castedIq = (HttpOverXmppReq) iq;
- return castedIq;
+ return (HttpOverXmppReq) iq;
}
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
index 157dc77c4..eb7333b6d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
public class FileTooLargeErrorCreateTest {
- String fileTooLargeErrorExtensionExample
+ private static final String fileTooLargeErrorExtensionExample
= ""
+ "20000"
+ "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
index 49cd2c233..73b71d93d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
@@ -16,23 +16,26 @@
*/
package org.jivesoftware.smackx.httpfileupload;
-import java.net.MalformedURLException;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+
+import java.io.IOException;
import java.net.URL;
import org.jivesoftware.smackx.httpfileupload.element.Slot;
import org.junit.Assert;
import org.junit.Test;
+import org.xml.sax.SAXException;
public class SlotCreateTest {
- String testSlot
+ private static final String testSlot
= ""
- + "https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"
- + "https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"
+ + ""
+ + ""
+ "";
@Test
- public void checkSlotRequestCreation() throws MalformedURLException {
+ public void checkSlotRequestCreation() throws SAXException, IOException {
Slot slot = new Slot(new URL("https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"));
@@ -41,6 +44,6 @@ public class SlotCreateTest {
Assert.assertEquals(new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
slot.getGetUrl());
- Assert.assertEquals(testSlot, slot.getChildElementXML().toString());
+ assertXMLEqual(testSlot, slot.getChildElementXML().toString());
}
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
index 525322357..d49ebee73 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
@@ -29,14 +29,14 @@ import org.xml.sax.SAXException;
public class SlotRequestCreateTest {
- String testRequest
+ private static final String testRequest
= "";
- String testRequestWithoutContentType
+ private static final String testRequestWithoutContentType
= "XEP-0363: HTTP File Upload 5. Error conditions
*/
- String slotErrorFileToLarge
+ private static final String slotErrorFileToLarge
= "XEP-0363: HTTP File Upload 4. Requesting a slot
*/
- String slotExample
+ private static final String SLOT_IQ
= ""
+ ""
- + "https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"
- + "https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"
+ + ""
+ + ""
+ ""
+ "";
@Test
public void checkSlotProvider() throws Exception {
- Slot slot = PacketParserUtils.parseStanza(slotExample);
+ Slot slot = PacketParserUtils.parseStanza(SLOT_IQ);
- Assert.assertEquals(IQ.Type.result, slot.getType());
- Assert.assertEquals(new URL("https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
- slot.getPutUrl());
- Assert.assertEquals(new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
- slot.getGetUrl());
+ checkUrls(slot);
+
+ assertXMLEqual(SLOT_IQ, slot.toXML().toString());
+ }
+
+ private static final String SLOT_V0_2_IQ =
+ "" +
+ "" +
+ "" + PUT_URL_STRING + "" +
+ "" + GET_URL_STRING + "" +
+ "" +
+ "";
+
+ @Test
+ public void checkSlotV0_2Provider() throws Exception {
+ Slot_V0_2 slot = PacketParserUtils.parseStanza(SLOT_V0_2_IQ);
+
+ checkUrls(slot);
+
+ String slotXml = slot.toXML().toString();
+ assertXMLEqual(SLOT_V0_2_IQ, slotXml);
+ }
+
+ private static final String SLOT_WITH_HEADERS_IQ =
+ "" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "" +
+ "";
+
+ @Test
+ public void checkSlotWithHeaders() throws Exception {
+ Slot slot = PacketParserUtils.parseStanza(SLOT_WITH_HEADERS_IQ);
+
+ checkUrls(slot);
+
+ String slotXml = slot.toXML().toString();
+ assertXMLEqual(SLOT_WITH_HEADERS_IQ, slotXml);
+ }
+
+ private static void checkUrls(Slot slot) {
+ assertEquals(PUT_URL, slot.getPutUrl());
+ assertEquals(GET_URL, slot.getGetUrl());
}
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
index d74878e8a..fb8bbf95d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
@@ -61,7 +61,7 @@ public class MamFinProviderTest extends MamTest {
+ "";
// @formatter:on
- IQ iq = (IQ) PacketParserUtils.parseStanza(IQ_LIMITED_RESULTS_EXAMPLE);
+ IQ iq = PacketParserUtils.parseStanza(IQ_LIMITED_RESULTS_EXAMPLE);
MamFinIQ mamFinIQ = (MamFinIQ) iq;
Assert.assertEquals(mamFinIQ.getType(), Type.result);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
index fe56ca81b..0e89b9b69 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
@@ -31,18 +31,18 @@ import org.xmlpull.v1.XmlPullParser;
public class MamPrefIQProviderTest extends MamTest {
- String exampleMamPrefsIQ1 = "" + ""
+ private static final String exampleMamPrefsIQ1 = "" + ""
+ "" + "romeo@montague.lit" + "" + ""
+ "montague@montague.lit" + "" + "" + "";
- String exampleMamPrefsIQ2 = "" + ""
+ private static final String exampleMamPrefsIQ2 = "" + ""
+ "" + "romeo@montague.lit" + "montague@montague.lit" + ""
+ "" + "" + "" + "";
- String exampleMamPrefsIQ3 = "" + "" + ""
+ private static final String exampleMamPrefsIQ3 = "" + "" + ""
+ "";
- String exampleMamPrefsResultIQ = ""
+ private static final String exampleMamPrefsResultIQ = ""
+ "" + "" + "romeo@montague.lit"
+ "" + "" + "sarasa@montague.lit" + "montague@montague.lit"
+ "" + "" + "";
@@ -53,14 +53,14 @@ public class MamPrefIQProviderTest extends MamTest {
MamPrefsIQ mamPrefIQ1 = new MamPrefsIQProvider().parse(parser1);
Assert.assertEquals(IQ.Type.set, mamPrefIQ1.getType());
- Assert.assertEquals(mamPrefIQ1.getAlwaysJids().get(0), "romeo@montague.lit");
- Assert.assertEquals(mamPrefIQ1.getNeverJids().get(0), "montague@montague.lit");
+ Assert.assertEquals(mamPrefIQ1.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+ Assert.assertEquals(mamPrefIQ1.getNeverJids().get(0).toString(), "montague@montague.lit");
XmlPullParser parser2 = PacketParserUtils.getParserFor(exampleMamPrefsIQ2);
MamPrefsIQ mamPrefIQ2 = new MamPrefsIQProvider().parse(parser2);
Assert.assertEquals(IQ.Type.set, mamPrefIQ2.getType());
- Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(0), "romeo@montague.lit");
- Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(1), "montague@montague.lit");
+ Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+ Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(1).toString(), "montague@montague.lit");
Assert.assertTrue(mamPrefIQ2.getNeverJids().isEmpty());
XmlPullParser parser3 = PacketParserUtils.getParserFor(exampleMamPrefsIQ3);
@@ -70,7 +70,7 @@ public class MamPrefIQProviderTest extends MamTest {
@Test
public void checkMamPrefResult() throws Exception {
- IQ iq = (IQ) PacketParserUtils.parseStanza(exampleMamPrefsResultIQ);
+ IQ iq = PacketParserUtils.parseStanza(exampleMamPrefsResultIQ);
MamPrefsIQ mamPrefsIQ = (MamPrefsIQ) iq;
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
index b9236ad08..2c62f988b 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
public class MamQueryIQProviderTest {
- String exampleMamQueryIQ1 = "" + ""
+ private static final String exampleMamQueryIQ1 = "" + ""
+ "" + ""
+ "urn:xmpp:mam:1" + ""
+ ""
@@ -41,7 +41,7 @@ public class MamQueryIQProviderTest {
+ "{http://jabber.org/protocol/mood}mood/lonely" + "" + "" + ""
+ "";
- String exampleMamQueryIQ2 = "" + ""
+ private static final String exampleMamQueryIQ2 = "" + ""
+ "" + ""
+ "urn:xmpp:mam:1" + "" + ""
+ "" + ""
@@ -51,7 +51,7 @@ public class MamQueryIQProviderTest {
@Test
public void checkMamQueryIQProvider() throws Exception {
// example 1
- IQ iq1 = (IQ) PacketParserUtils.parseStanza(exampleMamQueryIQ1);
+ IQ iq1 = PacketParserUtils.parseStanza(exampleMamQueryIQ1);
MamQueryIQ mamQueryIQ1 = (MamQueryIQ) iq1;
Assert.assertEquals(mamQueryIQ1.getType(), Type.set);
@@ -67,7 +67,7 @@ public class MamQueryIQProviderTest {
Assert.assertEquals(fields1.get(2).getValues().get(0), "{http://jabber.org/protocol/mood}mood/lonely");
// example2
- IQ iq2 = (IQ) PacketParserUtils.parseStanza(exampleMamQueryIQ2);
+ IQ iq2 = PacketParserUtils.parseStanza(exampleMamQueryIQ2);
MamQueryIQ mamQueryIQ2 = (MamQueryIQ) iq2;
Assert.assertEquals(mamQueryIQ2.getType(), Type.result);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
index 89535a1a5..4d0c0c145 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
@@ -33,14 +33,14 @@ import org.xmlpull.v1.XmlPullParser;
public class MamResultProviderTest {
- String exampleMamResultXml = ""
+ private static final String exampleMamResultXml = ""
+ "" + ""
+ ""
+ "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo."
+ "" + "" + "";
- String exampleResultMessage = ""
+ private static final String exampleResultMessage = ""
+ ""
+ "" + ""
+ ""
@@ -62,15 +62,15 @@ public class MamResultProviderTest {
Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
Message message = (Message) forwarded.getForwardedStanza();
- Assert.assertEquals(message.getFrom(), "romeo@montague.lit/orchard");
- Assert.assertEquals(message.getTo(), "juliet@capulet.lit/balcony");
+ Assert.assertEquals(message.getFrom().toString(), "romeo@montague.lit/orchard");
+ Assert.assertEquals(message.getTo().toString(), "juliet@capulet.lit/balcony");
Assert.assertEquals(message.getBody(),
"Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.");
}
@Test
public void checkResultsParse() throws Exception {
- Message message = (Message) PacketParserUtils.parseStanza(exampleResultMessage);
+ Message message = PacketParserUtils.parseStanza(exampleResultMessage);
MamResultExtension mamResultExtension = MamResultExtension.from(message);
Assert.assertEquals(mamResultExtension.getQueryId(), "f27");
@@ -84,8 +84,8 @@ public class MamResultProviderTest {
Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
Message forwardedMessage = (Message) forwarded.getForwardedStanza();
- Assert.assertEquals(forwardedMessage.getFrom(), "witch@shakespeare.lit");
- Assert.assertEquals(forwardedMessage.getTo(), "macbeth@shakespeare.lit");
+ Assert.assertEquals(forwardedMessage.getFrom().toString(), "witch@shakespeare.lit");
+ Assert.assertEquals(forwardedMessage.getTo().toString(), "macbeth@shakespeare.lit");
Assert.assertEquals(forwardedMessage.getBody(), "Hail to thee");
}
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
index 52fe85822..fc5b9951c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
@@ -30,10 +30,10 @@ import org.jxmpp.jid.impl.JidCreate;
public class PreferencesTest {
- String retrievePrefsStanzaExample = "" + "" + "" + "";
- String updatePrefsStanzaExample = "" + "" + "" + "" + "romeo@montague.lit" + "other@montague.lit"
+ "" + "" + "montague@montague.lit" + "" + "" + "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
index 2603b7d63..af5d87a61 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
@@ -37,11 +37,11 @@ import org.jxmpp.jid.impl.JidCreate;
public class QueryArchiveTest extends MamTest {
- String mamSimpleQueryIQ = "" + ""
+ private static final String mamSimpleQueryIQ = "" + ""
+ "" + "" + ""
+ MamElements.NAMESPACE + "" + "" + "" + "" + "";
- String mamQueryResultExample = ""
+ private static final String mamQueryResultExample = ""
+ ""
+ ""
+ "" + ""
+ private static final String resultsLimitStanza = "" + ""
+ "" + "" + ""
+ MamElements.NAMESPACE + "" + "" + "" + ""
+ "10" + "" + "" + "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
index ef67ddf77..bc7c74059 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
@@ -30,19 +30,19 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightAffiliationsChangeExtensionTest {
- String exampleMessageStanza = ""
+ private static final String exampleMessageStanza = ""
+ ""
+ "sarasa2@shakespeare.lit"
+ "sarasa1@shakespeare.lit"
+ "sarasa3@shakespeare.lit" + "" + "";
- String exampleMessageStanzaWithVersion = ""
+ "" + "qwerty"
+ "sarasa1@shakespeare.lit"
+ "sarasa3@shakespeare.lit" + "" + "" + "";
- String exampleMessageStanzaWithPrevVersion = ""
+ "" + "njiokm"
+ "qwerty" + "sarasa2@shakespeare.lit"
@@ -50,7 +50,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
@Test
public void checkAffiliationsChangeExtension() throws Exception {
- Message changeAffiliationsMessage = (Message) PacketParserUtils.parseStanza(exampleMessageStanza);
+ Message changeAffiliationsMessage = PacketParserUtils.parseStanza(exampleMessageStanza);
AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
.from(changeAffiliationsMessage);
@@ -63,7 +63,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
@Test
public void checkAffiliationsChangeExtensionWithVersion() throws Exception {
- Message changeAffiliationsMessage = (Message) PacketParserUtils.parseStanza(exampleMessageStanzaWithVersion);
+ Message changeAffiliationsMessage = PacketParserUtils.parseStanza(exampleMessageStanzaWithVersion);
AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
.from(changeAffiliationsMessage);
@@ -77,7 +77,7 @@ public class MUCLightAffiliationsChangeExtensionTest {
@Test
public void checkAffiliationsChangeExtensionWithPrevVersion() throws Exception {
- Message changeAffiliationsMessage = (Message) PacketParserUtils
+ Message changeAffiliationsMessage = PacketParserUtils
.parseStanza(exampleMessageStanzaWithPrevVersion);
AffiliationsChangeExtension affiliationsChangeExtension = AffiliationsChangeExtension
.from(changeAffiliationsMessage);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
index a92bb86de..db34f9548 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
@@ -31,25 +31,25 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightBlockingTest {
- String getBlockingListIQExample = ""
+ private static final String getBlockingListIQExample = ""
+ "" + "" + "";
- String getBlockingListIQResponse = ""
+ private static final String getBlockingListIQResponse = ""
+ ""
+ "coven@muclight.shakespeare.lit"
+ "sarasa@muclight.shakespeare.lit"
+ "hag77@shakespeare.lit" + "" + "";
- String blockingRoomsIQExample = ""
+ private static final String blockingRoomsIQExample = ""
+ ""
+ "coven@muclight.shakespeare.lit"
+ "chapel@shakespeare.lit" + "" + "";
- String blockingUsersIQExample = ""
+ private static final String blockingUsersIQExample = ""
+ "" + "hag77@shakespeare.lit"
+ "hag66@shakespeare.lit" + "" + "";
- String unblockingUsersAndRoomsExample = ""
+ private static final String unblockingUsersAndRoomsExample = ""
+ ""
+ "coven@muclight.shakespeare.lit"
+ "hag66@shakespeare.lit" + "" + "";
@@ -66,7 +66,7 @@ public class MUCLightBlockingTest {
@Test
public void checkGetBlockingListResponse() throws Exception {
- IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getBlockingListIQResponse);
+ IQ iqInfoResult = PacketParserUtils.parseStanza(getBlockingListIQResponse);
MUCLightBlockingIQ mucLightBlockingIQ = (MUCLightBlockingIQ) iqInfoResult;
Assert.assertEquals(2, mucLightBlockingIQ.getRooms().size());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
index 7180bf873..44a9e067d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
@@ -29,7 +29,7 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightChangeAffiliationsIQTest {
- String stanza = ""
+ private static final String stanza = ""
+ ""
+ "sarasa2@shakespeare.lit"
+ "sarasa1@shakespeare.lit"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
index e4002c221..0b95af0d3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
@@ -26,23 +26,23 @@ import org.junit.Test;
public class MUCLightConfigurationsChangeExtensionTest {
- String messageWithSubjectChangeExample = ""
+ private static final String messageWithSubjectChangeExample = ""
+ "" + ""
+ "asdfghj000" + "asdfghj"
+ "To be or not to be?" + "" + "";
- String messageWithRoomNameChangeExample = ""
+ private static final String messageWithRoomNameChangeExample = ""
+ "" + "" + "zaqwsx"
+ "zxcvbnm" + "A Darker Cave" + "" + "";
- String messageWithConfigsChangeExample = ""
+ private static final String messageWithConfigsChangeExample = ""
+ "" + "" + "zaqwsx"
+ "zxcvbnm" + "A Darker Cave" + "blue" + ""
+ "";
@Test
public void checkSubjectChangeExtension() throws Exception {
- Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithSubjectChangeExample);
+ Message configurationsMessage = PacketParserUtils.parseStanza(messageWithSubjectChangeExample);
ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
.from(configurationsMessage);
@@ -56,7 +56,7 @@ public class MUCLightConfigurationsChangeExtensionTest {
@Test
public void checkRoomNameChangeExtension() throws Exception {
- Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithRoomNameChangeExample);
+ Message configurationsMessage = PacketParserUtils.parseStanza(messageWithRoomNameChangeExample);
ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
.from(configurationsMessage);
@@ -70,7 +70,7 @@ public class MUCLightConfigurationsChangeExtensionTest {
@Test
public void checkConfigsChangeExtension() throws Exception {
- Message configurationsMessage = (Message) PacketParserUtils.parseStanza(messageWithConfigsChangeExample);
+ Message configurationsMessage = PacketParserUtils.parseStanza(messageWithConfigsChangeExample);
ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
.from(configurationsMessage);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
index 4a5ba7067..036d3ad7c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
@@ -29,7 +29,7 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightCreateIQTest {
- String stanza = ""
+ private static final String stanza = ""
+ "" + "" + "test"
+ "" + "" + "charlie@test.com"
+ "pep@test.com" + "" + "" + "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
index cafc9264b..b00c5a0d4 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
@@ -24,7 +24,7 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightDestroyTest {
- String stanza = ""
+ private static final String stanza = ""
+ "" + "";
@Test
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
index 95d9fc19b..679772ea3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
@@ -31,10 +31,10 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightGetAffiliationsTest {
- String getAffiliationsIQExample = ""
+ private static final String getAffiliationsIQExample = ""
+ "" + "abcdefg" + "" + "";
- String getAffiliationsResponseExample = ""
+ private static final String getAffiliationsResponseExample = ""
+ "" + "123456"
+ "user1@shakespeare.lit"
+ "user2@shakespeare.lit"
@@ -50,7 +50,7 @@ public class MUCLightGetAffiliationsTest {
@Test
public void checkGetAffiliationsResponse() throws Exception {
- IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getAffiliationsResponseExample);
+ IQ iqInfoResult = PacketParserUtils.parseStanza(getAffiliationsResponseExample);
MUCLightAffiliationsIQ mucLightAffiliationsIQ = (MUCLightAffiliationsIQ) iqInfoResult;
Assert.assertEquals("123456", mucLightAffiliationsIQ.getVersion());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
index 1d92832b7..5b97c21c1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
@@ -30,15 +30,15 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightGetConfigsTest {
- String getConfigsIQExample = ""
+ private static final String getConfigsIQExample = ""
+ "" + "abcdefg" + "" + "";
- String getConfigsResponseExample = "" + ""
+ "123456" + "A Dark Cave" + "A subject"
+ "" + "";
- String getConfigsResponseExampleWithCustomConfigs = "" + ""
+ "123456" + "A Dark Cave" + "blue"
+ "20" + "" + "";
@@ -53,7 +53,7 @@ public class MUCLightGetConfigsTest {
@Test
public void checkGetConfigsResponse() throws Exception {
- IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getConfigsResponseExample);
+ IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExample);
MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
@@ -64,7 +64,7 @@ public class MUCLightGetConfigsTest {
@Test
public void checkGetConfigsResponseWithCustomConfigs() throws Exception {
- IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(getConfigsResponseExampleWithCustomConfigs);
+ IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExampleWithCustomConfigs);
MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
index 64e798ab9..f29d1e11b 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
@@ -28,13 +28,13 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightInfoTest {
- String exampleWithVersion = ""
+ private static final String exampleWithVersion = ""
+ "" + "abcdefg" + "" + "";
- String exampleWithoutVersion = ""
+ private static final String exampleWithoutVersion = ""
+ "" + "" + "";
- String exampleInfoResult = ""
+ private static final String exampleInfoResult = ""
+ "" + "123456" + ""
+ "test" + "" + ""
+ "john@test.com" + "charlie@test.com"
@@ -58,7 +58,7 @@ public class MUCLightInfoTest {
@Test
public void checkMUCLightInfoResult() throws Exception {
- IQ iqInfoResult = (IQ) PacketParserUtils.parseStanza(exampleInfoResult);
+ IQ iqInfoResult = PacketParserUtils.parseStanza(exampleInfoResult);
MUCLightInfoIQ mucLightInfoResponseIQ = (MUCLightInfoIQ) iqInfoResult;
Assert.assertEquals(mucLightInfoResponseIQ.getVersion(), "123456");
Assert.assertEquals(mucLightInfoResponseIQ.getConfiguration().getRoomName(), "test");
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
index 17ea91522..69a66c755 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
@@ -26,15 +26,15 @@ import org.jxmpp.jid.impl.JidCreate;
public class MUCLightSetConfigsIQTest {
- String setConfigsIQExample = ""
+ private static final String setConfigsIQExample = ""
+ "" + "A Darker Cave"
+ "blue" + "" + "";
- String changeRoomNameIQExample = ""
+ private static final String changeRoomNameIQExample = ""
+ "" + "A Darker Cave" + ""
+ "";
- String changeSubjectIQExample = ""
+ private static final String changeSubjectIQExample = ""
+ "" + "To be or not to be?"
+ "" + "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
index 0a607c806..76bd1de25 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
@@ -24,10 +24,10 @@ import org.jxmpp.jid.impl.JidCreate;
public class DisablePushNotificationsIQTest {
- String disableAllNotificationsIQExample = ""
+ private static final String disableAllNotificationsIQExample = ""
+ "" + "" + "";
- String disableNodeNotificationsIQExample = ""
+ private static final String disableNodeNotificationsIQExample = ""
+ "" + ""
+ "";
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
index c418d7cea..3b21ffe79 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
@@ -26,11 +26,11 @@ import org.jxmpp.jid.impl.JidCreate;
public class EnablePushNotificationsIQTest {
- String exampleEnableIQ = ""
+ private static final String exampleEnableIQ = ""
+ "" + ""
+ "";
- String exampleEnableIQWithPublishOptions = ""
+ private static final String exampleEnableIQWithPublishOptions = ""
+ ""
+ ""
+ "http://jabber.org/protocol/pubsub#publish-options"
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
index 75f9cc177..96d3ee64d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
@@ -27,24 +27,24 @@ import org.jxmpp.jid.impl.JidCreate;
public class RemoteDisablingPushNotificationsTest {
- String remoteDisablingExample = ""
+ private static final String remoteDisablingExample = ""
+ ""
+ "" + "" + "";
- String wrongRemoteDisabling1 = ""
+ private static final String wrongRemoteDisabling1 = ""
+ ""
+ "" + "" + "";
- String wrongRemoteDisabling2 = ""
+ private static final String wrongRemoteDisabling2 = ""
+ ""
+ "" + "" + "";
- String wrongRemoteDisabling3 = ""
+ private static final String wrongRemoteDisabling3 = ""
+ "" + "" + "";
@Test
public void checkRemoteDisablingPushNotificationsParse() throws Exception {
- Message message = (Message) PacketParserUtils.parseStanza(remoteDisablingExample);
+ Message message = PacketParserUtils.parseStanza(remoteDisablingExample);
RemoteDisablingExtension remoteDisablingExtension = RemoteDisablingExtension.from(message);
Assert.assertEquals("yxs32uqsflafdk3iuqo", remoteDisablingExtension.getNode());
@@ -53,15 +53,15 @@ public class RemoteDisablingPushNotificationsTest {
@Test
public void checkWrongRemoteDisablighPushNotifications() throws Exception {
- Message message1 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+ Message message1 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
RemoteDisablingExtension remoteDisablingExtension1 = RemoteDisablingExtension.from(message1);
Assert.assertNull(remoteDisablingExtension1);
- Message message2 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+ Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
RemoteDisablingExtension remoteDisablingExtension2 = RemoteDisablingExtension.from(message2);
Assert.assertNull(remoteDisablingExtension2);
- Message message3 = (Message) PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+ Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3);
Assert.assertNull(remoteDisablingExtension3);
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index 9dd6e0189..b91e10731 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -112,7 +112,7 @@ public class MultipleRecipientManager {
connection.sendStanza(packet);
return;
}
- DomainBareJid serviceAddress = getMultipleRecipienServiceAddress(connection);
+ DomainBareJid serviceAddress = getMultipleRecipientServiceAddress(connection);
if (serviceAddress != null) {
// Send packet to target users using multiple recipient service provided by the server
sendThroughService(connection, packet, to, cc, bcc, replyTo, replyRoom, noReply,
@@ -133,8 +133,8 @@ public class MultipleRecipientManager {
/**
* Sends a reply to a previously received stanza(/packet) that was sent to multiple recipients. Before
- * attempting to send the reply message some checkings are performed. If any of those checkings
- * fail then an XMPPException is going to be thrown with the specific error detail.
+ * attempting to send the reply message some checks are performed. If any of those checks
+ * fails, then an XMPPException is going to be thrown with the specific error detail.
*
* @param connection the connection to use to send the reply.
* @param original the previously received stanza(/packet) that was sent to multiple recipients.
@@ -201,8 +201,7 @@ public class MultipleRecipientManager {
* if none was found.
*/
public static MultipleRecipientInfo getMultipleRecipientInfo(Stanza packet) {
- MultipleAddresses extension = (MultipleAddresses) packet
- .getExtension(MultipleAddresses.ELEMENT, MultipleAddresses.NAMESPACE);
+ MultipleAddresses extension = packet.getExtension(MultipleAddresses.ELEMENT, MultipleAddresses.NAMESPACE);
return extension == null ? null : new MultipleRecipientInfo(extension);
}
@@ -283,7 +282,7 @@ public class MultipleRecipientManager {
* @throws NotConnectedException
* @throws InterruptedException
*/
- private static DomainBareJid getMultipleRecipienServiceAddress(XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
+ private static DomainBareJid getMultipleRecipientServiceAddress(XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection);
return sdm.findService(MultipleAddresses.NAMESPACE, true);
}
@@ -296,7 +295,7 @@ public class MultipleRecipientManager {
*/
private static class PacketCopy extends Stanza {
- private CharSequence text;
+ private final CharSequence text;
/**
* Create a copy of a stanza(/packet) with the text to send. The passed text must be a valid text to
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
index 373daba9e..ab1f5c6de 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
@@ -53,7 +53,7 @@ public class MultipleAddresses implements ExtensionElement {
ofrom,
}
- private List addresses = new ArrayList();
+ private final List addresses = new ArrayList<>();
/**
* Adds a new address to which the stanza(/packet) is going to be sent or was sent.
@@ -68,7 +68,7 @@ public class MultipleAddresses implements ExtensionElement {
*/
public void addAddress(Type type, Jid jid, String node, String desc, boolean delivered,
String uri) {
- // Create a new address with the specificed configuration
+ // Create a new address with the specified configuration
Address address = new Address(type);
address.setJid(jid);
address.setNode(node);
@@ -83,7 +83,7 @@ public class MultipleAddresses implements ExtensionElement {
* Indicate that the stanza(/packet) being sent should not be replied.
*/
public void setNoReply() {
- // Create a new address with the specificed configuration
+ // Create a new address with the specified configuration
Address address = new Address(Type.noreply);
// Add the new address to the list of multiple recipients
addresses.add(address);
@@ -97,7 +97,7 @@ public class MultipleAddresses implements ExtensionElement {
* @return the list of addresses that matches the specified type.
*/
public List getAddressesOfType(Type type) {
- List answer = new ArrayList(addresses.size());
+ List answer = new ArrayList<>(addresses.size());
for (Address address : addresses) {
if (address.getType().equals(type)) {
answer.add(address);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
index 84d15860c..46acf6a1f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java
@@ -43,7 +43,7 @@ public class AMPDeliverCondition implements AMPExtension.Condition {
private final Value value;
/**
- * Create new amp deliver condition with value setted to one of defined by XEP-0079.
+ * Create new amp deliver condition with value set to one of defined by XEP-0079.
* See http://xmpp.org/extensions/xep-0079.html#conditions-def-deliver
* @param value AMPDeliveryCondition.Value instance that will be used as value parameter. Can't be null.
*/
@@ -67,7 +67,7 @@ public class AMPDeliverCondition implements AMPExtension.Condition {
* Value for amp deliver condition as defined by XEP-0079.
* See http://xmpp.org/extensions/xep-0079.html#conditions-def-deliver
*/
- public static enum Value {
+ public enum Value {
/**
* The message would be immediately delivered to the intended recipient or routed to the next hop.
*/
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
index 8779c2820..53fc409a3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java
@@ -48,7 +48,7 @@ public class AMPExpireAtCondition implements AMPExtension.Condition {
private final String value;
/**
- * Create new expire-at amp condition with value setted as XEP-0082 formatted date.
+ * Create new expire-at amp condition with value set as XEP-0082 formatted date.
* @param utcDateTime Date instance of time
* that will be used as value parameter after formatting to XEP-0082 format. Can't be null.
*/
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
index 0445359f3..2bae2ad87 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java
@@ -43,7 +43,7 @@ public class AMPMatchResourceCondition implements AMPExtension.Condition {
private final Value value;
/**
- * Create new amp match-resource condition with value setted to one of defined by XEP-0079.
+ * Create new amp match-resource condition with value set to one of defined by XEP-0079.
* See http://xmpp.org/extensions/xep-0079.html#conditions-def-match
* @param value AMPDeliveryCondition.Value instance that will be used as value parameter. Can't be null.
*/
@@ -67,7 +67,7 @@ public class AMPMatchResourceCondition implements AMPExtension.Condition {
* match-resource amp condition value as defined by XEP-0079.
* See http://xmpp.org/extensions/xep-0079.html#conditions-def-match
*/
- public static enum Value {
+ public enum Value {
/**
* Destination resource matches any value, effectively ignoring the intended resource.
* Example: "home/laptop" matches "home", "home/desktop" or "work/desktop"
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
index 6d842e04f..c8b696cc3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
@@ -31,7 +31,7 @@ public class AMPExtension implements ExtensionElement {
public static final String NAMESPACE = "http://jabber.org/protocol/amp";
public static final String ELEMENT = "amp";
- private CopyOnWriteArrayList rules = new CopyOnWriteArrayList();
+ private final CopyOnWriteArrayList rules = new CopyOnWriteArrayList<>();
private boolean perHop = false;
private final String from;
@@ -225,18 +225,18 @@ public class AMPExtension implements ExtensionElement {
* @see AMPExpireAtCondition
* @see AMPMatchResourceCondition
**/
- public static interface Condition {
+ public interface Condition {
String getName();
String getValue();
- static final String ATTRIBUTE_NAME = "condition";
+ String ATTRIBUTE_NAME = "condition";
}
/**
* amp action attribute.
* See http://xmpp.org/extensions/xep-0079.html#actions-def
**/
- public static enum Action {
+ public enum Action {
/**
* The "alert" action triggers a reply stanza to the sending entity.
* This stanza MUST contain the element ,
@@ -272,7 +272,7 @@ public class AMPExtension implements ExtensionElement {
/**
* amp notification status as defined by XEP-0079.
*/
- public static enum Status {
+ public enum Status {
alert,
error,
notify
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
index 4be9dce33..a5347c311 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java
@@ -103,7 +103,7 @@ public final class BlockingCommandManager extends Manager {
BlockContactsIQ blockContactIQ = (BlockContactsIQ) iqRequest;
if (blockListCached == null) {
- blockListCached = new ArrayList();
+ blockListCached = new ArrayList<>();
}
List blockedJids = blockContactIQ.getJids();
@@ -125,7 +125,7 @@ public final class BlockingCommandManager extends Manager {
UnblockContactsIQ unblockContactIQ = (UnblockContactsIQ) iqRequest;
if (blockListCached == null) {
- blockListCached = new ArrayList();
+ blockListCached = new ArrayList<>();
}
List unblockedJids = unblockContactIQ.getJids();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
index 6346683c6..45ed9ab2b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
@@ -45,7 +45,7 @@ import org.jxmpp.jid.parts.Resourcepart;
* @author Alexander Wenckus
*/
public final class BookmarkManager {
- private static final Map bookmarkManagerMap = new WeakHashMap();
+ private static final Map bookmarkManagerMap = new WeakHashMap<>();
static {
PrivateDataManager.addPrivateDataProvider("storage", "storage:bookmarks",
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
index 9037f01aa..555af7e2c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
@@ -21,7 +21,7 @@ import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.parts.Resourcepart;
/**
- * Respresents a Conference Room bookmarked on the server using XEP-0048 Bookmark Storage XEP.
+ * Represents a Conference Room bookmarked on the server using XEP-0048 Bookmark Storage XEP.
*
* @author Derek DeMoro
*/
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
index a0e438bb5..1f8f14318 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
@@ -18,7 +18,7 @@
package org.jivesoftware.smackx.bookmarks;
/**
- * Respresents one instance of a URL defined using XEP-0048 Bookmark Storage XEP.
+ * Represents one instance of a URL defined using XEP-0048 Bookmark Storage XEP.
*
* @author Derek DeMoro
*/
@@ -41,9 +41,9 @@ public class BookmarkedURL implements SharedBookmark {
/**
* Returns the name representing the URL (eg. Jive Software). This can be used in as a label, or
- * identifer in applications.
+ * identifier in applications.
*
- * @return the name reprenting the URL.
+ * @return the name representing the URL.
*/
public String getName() {
return name;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
index f046be1b7..e3937f957 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
@@ -68,15 +68,15 @@ public class Bookmarks implements PrivateData {
public static final String NAMESPACE = "storage:bookmarks";
public static final String ELEMENT = "storage";
- private List bookmarkedURLS;
- private List bookmarkedConferences;
+ private final List bookmarkedURLS;
+ private final List bookmarkedConferences;
/**
* Required Empty Constructor to use Bookmarks.
*/
public Bookmarks() {
- bookmarkedURLS = new ArrayList();
- bookmarkedConferences = new ArrayList();
+ bookmarkedURLS = new ArrayList<>();
+ bookmarkedConferences = new ArrayList<>();
}
/**
@@ -280,7 +280,7 @@ public class Bookmarks implements PrivateData {
BookmarkedConference conf = new BookmarkedConference(jid);
conf.setName(name);
- conf.setAutoJoin(Boolean.valueOf(autojoin).booleanValue());
+ conf.setAutoJoin(Boolean.valueOf(autojoin));
// Check for nickname
boolean done = false;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
index 45d77ba60..d618f8ad1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java
@@ -29,5 +29,5 @@ public interface SharedBookmark {
*
* @return returns true if this bookmark is shared.
*/
- public boolean isShared();
+ boolean isShared();
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
index b5c13ff8e..13d3169dd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
@@ -45,6 +45,6 @@ public interface BytestreamListener {
*
* @param request the incoming bytestream request
*/
- public void incomingBytestreamRequest(BytestreamRequest request);
+ void incomingBytestreamRequest(BytestreamRequest request);
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
index 3edada382..d4b8cba36 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
@@ -41,14 +41,14 @@ public interface BytestreamRequest {
*
* @return the sender of the bytestream open request
*/
- public Jid getFrom();
+ Jid getFrom();
/**
* Returns the session ID of the bytestream open request.
*
* @return the session ID of the bytestream open request
*/
- public String getSessionID();
+ String getSessionID();
/**
* Accepts the bytestream open request and returns the session to send/receive data.
@@ -60,13 +60,13 @@ public interface BytestreamRequest {
* @throws NoResponseException
* @throws SmackException
*/
- public BytestreamSession accept() throws InterruptedException, NoResponseException, XMPPErrorException, SmackException;
+ BytestreamSession accept() throws InterruptedException, XMPPErrorException, SmackException;
/**
* Rejects the bytestream request by sending a reject error to the initiator.
* @throws NotConnectedException
* @throws InterruptedException
*/
- public void reject() throws NotConnectedException, InterruptedException;
+ void reject() throws NotConnectedException, InterruptedException;
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
index 4e57d257d..b38357021 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
@@ -39,7 +39,7 @@ public interface BytestreamSession {
* @return the InputStream associated with this session to send data
* @throws IOException if an error occurs while retrieving the input stream
*/
- public InputStream getInputStream() throws IOException;
+ InputStream getInputStream() throws IOException;
/**
* Returns the OutputStream associated with this session to receive data.
@@ -47,7 +47,7 @@ public interface BytestreamSession {
* @return the OutputStream associated with this session to receive data
* @throws IOException if an error occurs while retrieving the output stream
*/
- public OutputStream getOutputStream() throws IOException;
+ OutputStream getOutputStream() throws IOException;
/**
* Closes the bytestream session.
@@ -57,7 +57,7 @@ public interface BytestreamSession {
*
* @throws IOException if an error occurs while closing the session
*/
- public void close() throws IOException;
+ void close() throws IOException;
/**
* Returns the timeout for read operations of the input stream associated with this session. 0
@@ -66,7 +66,7 @@ public interface BytestreamSession {
* @return the timeout for read operations
* @throws IOException if there is an error in the underlying protocol
*/
- public int getReadTimeout() throws IOException;
+ int getReadTimeout() throws IOException;
/**
* Sets the specified timeout, in milliseconds. With this option set to a non-zero timeout, a
@@ -79,6 +79,6 @@ public interface BytestreamSession {
* @param timeout the specified timeout, in milliseconds
* @throws IOException if there is an error in the underlying protocol
*/
- public void setReadTimeout(int timeout) throws IOException;
+ void setReadTimeout(int timeout) throws IOException;
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index a4e956c25..d65909bf2 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -181,7 +181,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
* list containing session IDs of In-Band Bytestream open packets that should be ignored by the
* InitiationListener
*/
- private List ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList());
+ private final List ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList());
/**
* Returns the InBandBytestreamManager to handle In-Band Bytestreams for a given
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 79a5b29e8..3b925e91a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -532,7 +532,7 @@ public class InBandBytestreamSession implements BytestreamSession {
@Override
public void processStanza(Stanza packet) {
// get data packet extension
- DataPacketExtension data = (DataPacketExtension) packet.getExtension(
+ DataPacketExtension data = packet.getExtension(
DataPacketExtension.ELEMENT,
DataPacketExtension.NAMESPACE);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index 124652b4e..fb0c9dd43 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -40,8 +40,7 @@ public class DataPacketProvider {
public Data parse(XmlPullParser parser, int initialDepth)
throws Exception {
DataPacketExtension data = packetExtensionProvider.parse(parser);
- Data iq = new Data(data);
- return iq;
+ return new Data(data);
}
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
index 1b68bd70c..53c9e9864 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
@@ -40,7 +40,7 @@ public class OpenIQProvider extends IQProvider {
int blockSize = Integer.parseInt(parser.getAttributeValue("", "block-size"));
String stanzaValue = parser.getAttributeValue("", "stanza");
- StanzaType stanza = null;
+ StanzaType stanza;
if (stanzaValue == null) {
stanza = StanzaType.IQ;
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 258d6715b..0350ea3f5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -152,7 +152,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
* list containing session IDs of SOCKS5 Bytestream initialization packets that should be
* ignored by the InitiationListener
*/
- private List ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList());
+ private final List ignoredBytestreamRequests = Collections.synchronizedList(new LinkedList());
/**
* Returns the Socks5BytestreamManager to handle SOCKS5 Bytestreams for a given
@@ -409,13 +409,12 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
* @return the Socket to send/receive data to/from the user
* @throws IOException if the bytestream could not be established
* @throws InterruptedException if the current thread was interrupted while waiting
- * @throws NoResponseException
* @throws SmackException if the target does not support SOCKS5.
* @throws XMPPException
*/
@Override
public Socks5BytestreamSession establishSession(Jid targetJID, String sessionID)
- throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException {
+ throws IOException, InterruptedException, SmackException, XMPPException {
XMPPConnection connection = connection();
XMPPErrorException discoveryException = null;
// check if target supports SOCKS5 Bytestream
@@ -587,7 +586,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
*/
private List determineStreamHostInfos(List proxies) {
XMPPConnection connection = connection();
- List streamHosts = new ArrayList();
+ List streamHosts = new ArrayList<>();
// add local proxy on first position if exists
List localProxies = getLocalStreamHost();
@@ -599,7 +598,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
for (Jid proxy : proxies) {
Bytestream streamHostRequest = createStreamHostRequest(proxy);
try {
- Bytestream response = (Bytestream) connection.createStanzaCollectorAndSend(
+ Bytestream response = connection.createStanzaCollectorAndSend(
streamHostRequest).nextResultOrThrow();
streamHosts.addAll(response.getStreamHosts());
}
@@ -648,7 +647,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
}
final int port = socks5Server.getPort();
- List streamHosts = new ArrayList();
+ List streamHosts = new ArrayList<>();
outerloop: for (String address : addresses) {
// Prevent loopback addresses from appearing as streamhost
final String[] loopbackAddresses = { "127.0.0.1", "0:0:0:0:0:0:0:1", "::1" };
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
index 15df6af4b..b2d35e500 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
@@ -34,9 +34,7 @@ import java.util.logging.Logger;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.util.StringUtils;
-
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
/**
@@ -74,16 +72,15 @@ public class Socks5Client {
* @param timeout timeout to connect to SOCKS5 proxy in milliseconds
* @return socket the initialized socket
* @throws IOException if initializing the socket failed due to a network error
- * @throws XMPPErrorException if establishing connection to SOCKS5 proxy failed
* @throws TimeoutException if connecting to SOCKS5 proxy timed out
* @throws InterruptedException if the current thread was interrupted while waiting
- * @throws SmackException if the connection to the SOC
+ * @throws SmackException if the connection to the SOCKS5 proxy failed
* @throws XMPPException
*/
- public Socket getSocket(int timeout) throws IOException, XMPPErrorException, InterruptedException,
+ public Socket getSocket(int timeout) throws IOException, InterruptedException,
TimeoutException, SmackException, XMPPException {
// wrap connecting in future for timeout
- FutureTask futureTask = new FutureTask(new Callable() {
+ FutureTask futureTask = new FutureTask<>(new Callable() {
@Override
public Socket call() throws IOException, SmackException {
@@ -173,7 +170,7 @@ public class Socks5Client {
// check if server responded with correct version and no-authentication method
if (response[0] != (byte) 0x05 || response[1] != (byte) 0x00) {
- throw new SmackException("Remote SOCKS5 server responsed with unexpected version: " + response[0] + ' ' + response[1] + ". Should be 0x05 0x00.");
+ throw new SmackException("Remote SOCKS5 server responded with unexpected version: " + response[0] + ' ' + response[1] + ". Should be 0x05 0x00.");
}
// request SOCKS5 connection with given address/digest
@@ -188,7 +185,7 @@ public class Socks5Client {
connectionRequest[1] = (byte) 0x00; // set expected return status to 0
if (!Arrays.equals(connectionRequest, connectionResponse)) {
throw new SmackException(
- "Connection request does not equal connection reponse. Response: "
+ "Connection request does not equal connection response. Response: "
+ Arrays.toString(connectionResponse) + ". Request: "
+ Arrays.toString(connectionRequest));
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 993aaa829..580739502 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -74,7 +74,7 @@ public class Socks5ClientForInitiator extends Socks5Client {
@Override
public Socket getSocket(int timeout) throws IOException, InterruptedException,
TimeoutException, XMPPException, SmackException {
- Socket socket = null;
+ Socket socket;
// check if stream host is the local SOCKS5 proxy
if (this.streamHost.getJID().equals(this.connection.get().getUser())) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index f7e89270a..88727c668 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -93,12 +93,12 @@ public final class Socks5Proxy {
private ServerSocket serverSocket;
/* assigns a connection to a digest */
- private final Map connectionMap = new ConcurrentHashMap();
+ private final Map connectionMap = new ConcurrentHashMap<>();
/* list of digests connections should be stored */
private final List allowedConnections = Collections.synchronizedList(new LinkedList());
- private final Set localAddresses = new LinkedHashSet(4);
+ private final Set localAddresses = new LinkedHashSet<>(4);
/**
* Private constructor.
@@ -112,7 +112,7 @@ public final class Socks5Proxy {
} catch (SocketException e) {
throw new IllegalStateException(e);
}
- Set localHostAddresses = new HashSet();
+ Set localHostAddresses = new HashSet<>();
for (NetworkInterface networkInterface : Collections.list(networkInterfaces)) {
// We can't use NetworkInterface.getInterfaceAddresses here, which
// would return a List instead the deprecated Enumeration, because
@@ -293,7 +293,7 @@ public final class Socks5Proxy {
*/
public List getLocalAddresses() {
synchronized (localAddresses) {
- return new LinkedList(localAddresses);
+ return new LinkedList<>(localAddresses);
}
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 8b022d9fc..a5d0ed7f1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -46,7 +46,7 @@ public class Bytestream extends IQ {
private Mode mode = Mode.tcp;
- private final List streamHosts = new ArrayList();
+ private final List streamHosts = new ArrayList<>();
private StreamHostUsed usedHost;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index 3a94a3e0f..c79c26f4a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -96,7 +96,7 @@ public final class EntityCapsManager extends Manager {
private static boolean autoEnableEntityCaps = true;
- private static Map instances = new WeakHashMap<>();
+ private static final Map instances = new WeakHashMap<>();
private static final StanzaFilter PRESENCES_WITH_CAPS = new AndFilter(new StanzaTypeFilter(Presence.class), new StanzaExtensionFilter(
ELEMENT, NAMESPACE));
@@ -104,7 +104,7 @@ public final class EntityCapsManager extends Manager {
/**
* Map of "node + '#' + hash" to DiscoverInfo data
*/
- static final LruCache CAPS_CACHE = new LruCache(1000);
+ static final LruCache CAPS_CACHE = new LruCache<>(1000);
/**
* Map of Full JID -> DiscoverInfo/null. In case of c2s connection the
@@ -415,8 +415,8 @@ public final class EntityCapsManager extends Manager {
}
/**
- * Get our own caps version. The version depends on the enabled features. A
- * caps version looks like '66/0NaeaBKkwk85efJTGmU47vXI='
+ * Get our own caps version. The version depends on the enabled features.
+ * A caps version looks like '66/0NaeaBKkwk85efJTGmU47vXI='
*
* @return our own caps version
*/
@@ -495,7 +495,7 @@ public final class EntityCapsManager extends Manager {
if (connection != null)
JID_TO_NODEVER_CACHE.put(connection.getUser(), new NodeVerHash(entityNode, currentCapsVersion));
- final List identities = new LinkedList(ServiceDiscoveryManager.getInstanceFor(connection).getIdentities());
+ final List identities = new LinkedList<>(ServiceDiscoveryManager.getInstanceFor(connection).getIdentities());
sdm.setNodeInformationProvider(localNodeVer, new AbstractNodeInformationProvider() {
List features = sdm.getFeatures();
List packetExtensions = sdm.getExtendedInfoAsList();
@@ -529,7 +529,7 @@ public final class EntityCapsManager extends Manager {
}
/**
- * Verify DisoverInfo and Caps Node as defined in XEP-0115 5.4 Processing
+ * Verify DiscoverInfo and Caps Node as defined in XEP-0115 5.4 Processing
* Method.
*
* @see XEP-0115
@@ -567,7 +567,7 @@ public final class EntityCapsManager extends Manager {
* @return true if the stanza(/packet) extensions is ill-formed
*/
protected static boolean verifyPacketExtensions(DiscoverInfo info) {
- List foundFormTypes = new LinkedList();
+ List foundFormTypes = new LinkedList<>();
for (ExtensionElement pe : info.getExtensions()) {
if (pe.getNamespace().equals(DataForm.NAMESPACE)) {
DataForm df = (DataForm) pe;
@@ -626,10 +626,9 @@ public final class EntityCapsManager extends Manager {
// [NAME]. Note that each slash is included even if the LANG or
// NAME is not included (in accordance with XEP-0030, the category and
// type MUST be included.
- SortedSet