diff --git a/config/checkstyle.xml b/config/checkstyle.xml index 27a71807f..de313cff0 100644 --- a/config/checkstyle.xml +++ b/config/checkstyle.xml @@ -187,5 +187,12 @@ , TYPE_EXTENSION_AND "/> + + + + + + diff --git a/resources/eclipse/smack.importorder b/resources/eclipse/smack.importorder new file mode 100644 index 000000000..f87892a1c --- /dev/null +++ b/resources/eclipse/smack.importorder @@ -0,0 +1,8 @@ +#Organize Import Order +#Wed Jun 14 16:42:40 CEST 2017 +5= +4=org.jivesoftware.smackx +3=org.jivesoftware.smack +2=javax +1=java +0=\# diff --git a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java index b58f8679c..f9dcbdf1a 100644 --- a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java +++ b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java @@ -18,7 +18,6 @@ package org.jivesoftware.smack.android; import java.util.List; -import org.apache.http.conn.ssl.StrictHostnameVerifier; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.stringencoder.Base64; @@ -26,6 +25,8 @@ import org.jivesoftware.smack.util.stringencoder.Base64UrlSafeEncoder; import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64Encoder; import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64UrlSafeEncoder; +import org.apache.http.conn.ssl.StrictHostnameVerifier; + public class AndroidSmackInitializer implements SmackInitializer { @Override diff --git a/smack-android/src/main/java/org/jivesoftware/smackx/debugger/android/AndroidDebugger.java b/smack-android/src/main/java/org/jivesoftware/smackx/debugger/android/AndroidDebugger.java index 201f4e6fb..a00a9e0c2 100644 --- a/smack-android/src/main/java/org/jivesoftware/smackx/debugger/android/AndroidDebugger.java +++ b/smack-android/src/main/java/org/jivesoftware/smackx/debugger/android/AndroidDebugger.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2014 Florian Schmaus + * Copyright © 2014-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. @@ -16,14 +16,14 @@ */ package org.jivesoftware.smackx.debugger.android; -import org.jivesoftware.smack.debugger.AbstractDebugger; -import org.jivesoftware.smack.XMPPConnection; - -import android.util.Log; - import java.io.Reader; import java.io.Writer; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.debugger.AbstractDebugger; + +import android.util.Log; + /** * Very simple debugger that prints to the android log the sent and received stanzas. *

diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java index 32edb865f..84637ec9c 100644 --- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java +++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java @@ -27,25 +27,22 @@ import java.util.logging.Logger; import org.jivesoftware.smack.AbstractXMPPConnection; import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.ConnectionException; -import org.jivesoftware.smack.XMPPException.StreamErrorException; +import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; +import org.jivesoftware.smack.XMPPException.StreamErrorException; import org.jivesoftware.smack.packet.Element; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jxmpp.jid.DomainBareJid; -import org.jxmpp.jid.parts.Resourcepart; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserFactory; + import org.igniterealtime.jbosh.AbstractBody; import org.igniterealtime.jbosh.BOSHClient; import org.igniterealtime.jbosh.BOSHClientConfig; @@ -58,6 +55,11 @@ import org.igniterealtime.jbosh.BOSHMessageEvent; import org.igniterealtime.jbosh.BodyQName; import org.igniterealtime.jbosh.ComposableBody; +import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.parts.Resourcepart; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserFactory; + /** * Creates a connection to an XMPP server via HTTP binding. * This is specified in the XEP-0206: XMPP Over BOSH. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index dc467b043..cc5ffc813 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -60,15 +60,15 @@ import org.jivesoftware.smack.filter.StanzaIdFilter; import org.jivesoftware.smack.iqrequest.IQRequestHandler; import org.jivesoftware.smack.packet.Bind; import org.jivesoftware.smack.packet.ErrorIQ; +import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Mechanisms; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Session; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.StartTls; -import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.StreamError; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.parsing.ParsingExceptionCallback; @@ -83,6 +83,7 @@ import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.SmackExecutorThreadFactory; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.dns.HostAddress; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; 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 ff35a6968..4585595e4 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java @@ -24,6 +24,12 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import javax.net.SocketFactory; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.X509TrustManager; +import javax.security.auth.callback.CallbackHandler; + import org.jivesoftware.smack.packet.Session; import org.jivesoftware.smack.proxy.ProxyInfo; import org.jivesoftware.smack.sasl.SASLMechanism; @@ -31,18 +37,13 @@ import org.jivesoftware.smack.sasl.core.SASLAnonymous; import org.jivesoftware.smack.util.CollectionUtil; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.stringprep.XmppStringprepException; -import javax.net.SocketFactory; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; -import javax.net.ssl.X509TrustManager; -import javax.security.auth.callback.CallbackHandler; - /** * Configuration to use while establishing the connection to the server. * 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 4430b1f9e..c2b35110d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java @@ -16,10 +16,6 @@ */ package org.jivesoftware.smack; -import org.jivesoftware.smack.XMPPException.StreamErrorException; -import org.jivesoftware.smack.packet.StreamError; -import org.jivesoftware.smack.util.Async; - import java.io.IOException; import java.lang.ref.WeakReference; import java.util.Map; @@ -28,6 +24,10 @@ import java.util.WeakHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.jivesoftware.smack.XMPPException.StreamErrorException; +import org.jivesoftware.smack.packet.StreamError; +import org.jivesoftware.smack.util.Async; + /** * Handles the automatic reconnection process. Every time a connection is dropped without * the application explicitly closing it, the manager automatically tries to reconnect to 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 137e07110..8c4cfe88f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java @@ -17,20 +17,6 @@ package org.jivesoftware.smack; -import org.jivesoftware.smack.SmackException.NoResponseException; -import org.jivesoftware.smack.XMPPException.XMPPErrorException; -import org.jivesoftware.smack.packet.Mechanisms; -import org.jivesoftware.smack.sasl.SASLErrorException; -import org.jivesoftware.smack.sasl.SASLMechanism; -import org.jivesoftware.smack.sasl.core.ScramSha1PlusMechanism; -import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; -import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success; -import org.jxmpp.jid.DomainBareJid; -import org.jxmpp.jid.EntityBareJid; - -import javax.net.ssl.SSLSession; -import javax.security.auth.callback.CallbackHandler; - import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -42,6 +28,21 @@ import java.util.Map; import java.util.Set; import java.util.logging.Logger; +import javax.net.ssl.SSLSession; +import javax.security.auth.callback.CallbackHandler; + +import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.XMPPException.XMPPErrorException; +import org.jivesoftware.smack.packet.Mechanisms; +import org.jivesoftware.smack.sasl.SASLErrorException; +import org.jivesoftware.smack.sasl.SASLMechanism; +import org.jivesoftware.smack.sasl.core.ScramSha1PlusMechanism; +import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; +import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success; + +import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.EntityBareJid; + /** *

This class is responsible authenticating the user using SASL, binding the resource * to the connection and establishing a session with the server.

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 b6d190fa6..988d2091d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java @@ -21,6 +21,7 @@ import java.util.List; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.util.dns.HostAddress; + import org.jxmpp.jid.Jid; /** 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 d7ac9410a..3573e9f48 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java @@ -38,6 +38,7 @@ import org.jivesoftware.smack.sasl.core.SCRAMSHA1Mechanism; import org.jivesoftware.smack.sasl.core.ScramSha1PlusMechanism; 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; 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 888884efd..b5f325a09 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java @@ -20,8 +20,8 @@ package org.jivesoftware.smack; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; -import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java index 8906fc65e..dd99e8d9e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java @@ -22,9 +22,9 @@ import java.util.concurrent.locks.Lock; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.packet.TopLevelStreamElement; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Nonza; +import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.packet.TopLevelStreamElement; public class SynchronizationPoint { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java index b22d004aa..f6e48b8d4 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -16,16 +16,16 @@ */ package org.jivesoftware.smack; - import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.filter.IQReplyFilter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.iqrequest.IQRequestHandler; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Nonza; +import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityFullJid; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java index 99f3fb4b5..7a250ff4d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java @@ -21,6 +21,7 @@ import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.StreamError; import org.jivesoftware.smack.packet.XMPPError; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java index 7b68e31b4..78b7cecdb 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java @@ -19,8 +19,8 @@ package org.jivesoftware.smack.compress.packet; import java.util.Collections; import java.util.List; -import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.util.XmlStringBuilder; public class Compress implements Nonza { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java index 7a58e64cb..0bf5213bd 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java @@ -16,6 +16,9 @@ */ package org.jivesoftware.smack.debugger; +import java.io.Reader; +import java.io.Writer; + import org.jivesoftware.smack.ConnectionListener; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; @@ -24,10 +27,8 @@ import org.jivesoftware.smack.util.ObservableReader; import org.jivesoftware.smack.util.ObservableWriter; import org.jivesoftware.smack.util.ReaderListener; import org.jivesoftware.smack.util.WriterListener; -import org.jxmpp.jid.EntityFullJid; -import java.io.Reader; -import java.io.Writer; +import org.jxmpp.jid.EntityFullJid; public abstract class AbstractDebugger implements SmackDebugger { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java index 311e8edb1..306c0603e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java @@ -16,8 +16,6 @@ */ package org.jivesoftware.smack.debugger; -import org.jivesoftware.smack.XMPPConnection; - import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; @@ -25,6 +23,8 @@ import java.io.Writer; import java.text.SimpleDateFormat; import java.util.Date; +import org.jivesoftware.smack.XMPPConnection; + /** * Very simple debugger that prints to the console (stdout) the sent and received stanzas. Use * this debugger with caution since printing to the console is an expensive operation that may diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/JulDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/JulDebugger.java index d1eddbd38..2fbcfeee1 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/JulDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/JulDebugger.java @@ -16,13 +16,13 @@ */ package org.jivesoftware.smack.debugger; -import org.jivesoftware.smack.XMPPConnection; - import java.io.Reader; import java.io.Writer; import java.util.logging.Level; import java.util.logging.Logger; +import org.jivesoftware.smack.XMPPConnection; + /** * Very simple debugger that prints to the console (stdout) the sent and received stanzas. Use * this debugger with caution since printing to the console is an expensive operation that may diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ReflectionDebuggerFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ReflectionDebuggerFactory.java index ecd78ceeb..12fbeae4d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/ReflectionDebuggerFactory.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ReflectionDebuggerFactory.java @@ -18,15 +18,15 @@ package org.jivesoftware.smack.debugger; -import org.jivesoftware.smack.SmackConfiguration; -import org.jivesoftware.smack.XMPPConnection; - import java.io.Reader; import java.io.Writer; import java.lang.reflect.Constructor; import java.util.logging.Level; import java.util.logging.Logger; +import org.jivesoftware.smack.SmackConfiguration; +import org.jivesoftware.smack.XMPPConnection; + public class ReflectionDebuggerFactory implements SmackDebuggerFactory { private static final Logger LOGGER = Logger.getLogger(ReflectionDebuggerFactory.class.getName()); private static final String DEBUGGER_CLASS_PROPERTY_NAME = "smack.debuggerClass"; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java index 043a0f9e6..43ae57434 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java @@ -21,6 +21,7 @@ import java.io.Reader; import java.io.Writer; import org.jivesoftware.smack.StanzaListener; + import org.jxmpp.jid.EntityFullJid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebuggerFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebuggerFactory.java index cad0dd155..57d0aac84 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebuggerFactory.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebuggerFactory.java @@ -18,11 +18,11 @@ package org.jivesoftware.smack.debugger; -import org.jivesoftware.smack.XMPPConnection; - import java.io.Reader; import java.io.Writer; +import org.jivesoftware.smack.XMPPConnection; + public interface SmackDebuggerFactory { /** * Initialize the new SmackDebugger instance. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractFromToMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractFromToMatchesFilter.java index d9b5605e0..1a0198ee4 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractFromToMatchesFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractFromToMatchesFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public abstract class AbstractFromToMatchesFilter implements StanzaFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java index 502c2951e..60bd2df5b 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public abstract class AbstractJidTypeFilter implements StanzaFilter { 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 0ac3b9b1b..ff3b5d72a 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 @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public final class EmptyToMatcher implements StanzaFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java index 1e46de307..1b16b09ae 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java index 1948d5f84..27258547f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public final class FromTypeFilter extends AbstractJidTypeFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java index 494bd7def..130e0cb10 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java @@ -22,6 +22,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java index 82c1016c0..a310fafdc 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java @@ -17,8 +17,8 @@ package org.jivesoftware.smack.filter; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java index 8b254f56e..a56e7a380 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java @@ -18,8 +18,8 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; /** * Filters for packets of a particular type. The type is given as a Class object, so diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaExtensionFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaExtensionFilter.java index f7f810e82..ab55bad6e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaExtensionFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaExtensionFilter.java @@ -17,8 +17,8 @@ package org.jivesoftware.smack.filter; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java index 156a7914e..73c438cdf 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java @@ -17,10 +17,10 @@ package org.jivesoftware.smack.filter; -import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; /** * Filters for Stanzas of a particular type. The type is given as a Class object, so diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToFilter.java index d8964b5f1..94da6a332 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToMatchesFilter.java index 99ca2a762..a923bfe86 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToMatchesFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToMatchesFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public final class ToMatchesFilter extends AbstractFromToMatchesFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java index 8d8059627..0f3ea6835 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; public final class ToTypeFilter extends AbstractJidTypeFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/AbstractJidTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/AbstractJidTypeFilter.java index 13ea8972a..7c1c4c86a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/AbstractJidTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/AbstractJidTypeFilter.java @@ -19,6 +19,7 @@ package org.jivesoftware.smack.filter.jidtype; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.Objects; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/FromJidTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/FromJidTypeFilter.java index 97c82ba64..c9326c175 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/FromJidTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/jidtype/FromJidTypeFilter.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.filter.jidtype; import org.jivesoftware.smack.packet.Stanza; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java new file mode 100644 index 000000000..91f9f4582 --- /dev/null +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java @@ -0,0 +1,56 @@ +/** + * + * 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.packet; + +import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smack.util.XmlStringBuilder; + +public abstract class AbstractTextElement implements ExtensionElement { + + public static final String ELEMENT = "text"; + + private final String text; + private final String lang; + + protected AbstractTextElement(String text, String lang) { + this.text = StringUtils.requireNotNullOrEmpty(text, "Text must not be null or empty"); + this.lang = lang; + } + + @Override + public String getElementName() { + return ELEMENT; + } + + @Override + public XmlStringBuilder toXML() { + XmlStringBuilder xml = new XmlStringBuilder(this); + xml.optXmlLangAttribute(lang); + xml.rightAngleBracket(); + xml.escape(text); + xml.closeElement(this); + return xml; + } + + public final String getText() { + return text; + } + + public final String getLang() { + return lang; + } +} diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java index 11bb224ef..eeae6fcf0 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java @@ -26,6 +26,7 @@ import java.util.Set; import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.stringprep.XmppStringprepException; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index 976c60dd6..71d7c3697 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -24,6 +24,7 @@ import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.Jid; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java index 35d904f20..a092c9728 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java @@ -25,6 +25,7 @@ import org.jivesoftware.smack.util.MultiMap; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.util.XmppStringUtils; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java index aed2905b1..b561e5763 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java @@ -19,19 +19,20 @@ package org.jivesoftware.smack.packet; import static org.jivesoftware.smack.util.StringUtils.requireNotNullOrEmpty; +import java.util.Collection; +import java.util.List; +import java.util.Locale; + import org.jivesoftware.smack.packet.id.StanzaIdUtil; import org.jivesoftware.smack.util.MultiMap; import org.jivesoftware.smack.util.PacketUtil; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.stringprep.XmppStringprepException; import org.jxmpp.util.XmppStringUtils; -import java.util.Collection; -import java.util.List; -import java.util.Locale; - /** * Base class for XMPP Stanzas, which are called Stanza(/Packet) in older versions of Smack (i.e. < 4.1). *

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaErrorTextElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaErrorTextElement.java new file mode 100644 index 000000000..a593ffc9d --- /dev/null +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaErrorTextElement.java @@ -0,0 +1,32 @@ +/** + * + * 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.packet; + +public class StanzaErrorTextElement extends AbstractTextElement { + + public static final String NAMESPACE = XMPPError.NAMESPACE; + + public StanzaErrorTextElement(String text, String lang) { + super(text, lang); + } + + @Override + public String getNamespace() { + return NAMESPACE; + } + +} diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java index 7aafca4d9..3913fe374 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java @@ -62,6 +62,8 @@ import org.jivesoftware.smack.util.XmlStringBuilder; * @author Matt Tucker * @see RFC 6120 - 8.3.2 Syntax: The Syntax of XMPP error stanzas */ +// TODO Rename this class to StanzaError (RFC 6120 § 8.3) in Smack 4.3, as this is what this class actually is. SMACK-769 +// TODO Use StanzaErrorTextElement here. public class XMPPError extends AbstractError { public static final String NAMESPACE = "urn:ietf:params:xml:ns:xmpp-stanzas"; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java index 7785c617f..6572cca01 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java @@ -25,6 +25,7 @@ import org.jivesoftware.smack.packet.StandardExtensionElement.Builder; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.StringUtils; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java index 91925dffa..1f5b11d1d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.packet.Bind; + import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java index 6b2777c1b..263916c59 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java @@ -23,6 +23,7 @@ import java.util.Map; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.PacketParserUtils; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionElementProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionElementProvider.java index b36b3316f..9bb34f1cf 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionElementProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionElementProvider.java @@ -17,7 +17,6 @@ package org.jivesoftware.smack.provider; - import org.jivesoftware.smack.packet.ExtensionElement; /** diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java index e51033f43..32ad4f9c3 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java @@ -20,9 +20,10 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.ParserUtils; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java index b9d64e7aa..225ff3079 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java @@ -19,6 +19,7 @@ package org.jivesoftware.smack.provider; import org.jivesoftware.smack.packet.Element; import org.jivesoftware.smack.util.ParserUtils; + import org.xmlpull.v1.XmlPullParser; public abstract class Provider { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java index 4fa884d39..0858809c3 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java @@ -24,10 +24,11 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; -import org.xmlpull.v1.XmlPullParserFactory; +import org.jivesoftware.smack.packet.IQ; + import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserFactory; /** * Loads the {@link IQProvider} and {@link ExtensionElementProvider} information from a standard provider file in preparation 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 ccc67e789..de5f2e28c 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 @@ -23,9 +23,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.jivesoftware.smack.SmackConfiguration; -import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; + import org.jxmpp.util.XmppStringUtils; /** 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 1e8932b31..51df1a1a3 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 @@ -23,12 +23,11 @@ import java.io.StringReader; import java.net.HttpURLConnection; import java.net.InetSocketAddress; import java.net.Socket; - -import org.jivesoftware.smack.util.stringencoder.Base64; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jivesoftware.smack.util.stringencoder.Base64; + /** * HTTP Proxy Socket Connection which connects the socket using a HTTP Proxy. * diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java index 771239935..52fcdf30d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java @@ -16,6 +16,9 @@ */ package org.jivesoftware.smack.sasl; +import javax.net.ssl.SSLSession; +import javax.security.auth.callback.CallbackHandler; + import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NotConnectedException; @@ -25,12 +28,10 @@ import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Response; import org.jivesoftware.smack.util.StringTransformer; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.stringencoder.Base64; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; -import javax.net.ssl.SSLSession; -import javax.security.auth.callback.CallbackHandler; - /** * Base class for SASL mechanisms. * Subclasses will likely want to implement their own versions of these methods: diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLAnonymous.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLAnonymous.java index 509104d2b..5fc222d32 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLAnonymous.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SASLAnonymous.java @@ -16,11 +16,11 @@ */ package org.jivesoftware.smack.sasl.core; +import javax.security.auth.callback.CallbackHandler; + import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.sasl.SASLMechanism; -import javax.security.auth.callback.CallbackHandler; - /** * Implementation of the SASL ANONYMOUS mechanism. * 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 8ce0e8b36..65f033b18 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 @@ -32,6 +32,7 @@ import org.jivesoftware.smack.util.ByteUtils; import org.jivesoftware.smack.util.SHA1; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.stringencoder.Base64; + import org.jxmpp.util.cache.Cache; import org.jxmpp.util.cache.LruCache; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java index 60cfd8af3..554e52250 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java @@ -27,9 +27,9 @@ import java.util.logging.Logger; import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode; import org.jivesoftware.smack.util.dns.DNSResolver; -import org.jivesoftware.smack.util.dns.SmackDaneProvider; import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.SRVRecord; +import org.jivesoftware.smack.util.dns.SmackDaneProvider; /** * Utility class to perform DNS lookups for XMPP services. 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 498344bb8..02a6c96a3 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 @@ -31,21 +31,22 @@ import java.util.logging.Logger; import org.jivesoftware.smack.compress.packet.Compress; import org.jivesoftware.smack.packet.EmptyResultIQ; import org.jivesoftware.smack.packet.ErrorIQ; +import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Session; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.StartTls; import org.jivesoftware.smack.packet.StreamError; import org.jivesoftware.smack.packet.UnparsedIQ; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.parsing.StandardExtensionElementProvider; -import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.ExtensionElementProvider; +import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -975,6 +976,8 @@ public class PacketParserUtils { return new Session.Feature(optional); } + + // TODO Remove this static method and use ParserUtils.getXmlLang(XmlPullParser) instead. private static String getLanguageAttribute(XmlPullParser parser) { // CHECKSTYLE:OFF for (int i = 0; i < parser.getAttributeCount(); i++) { 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 3badf6a02..14a003a21 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 @@ -24,6 +24,7 @@ import java.util.Date; import java.util.Locale; import org.jivesoftware.smack.SmackException; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.EntityJid; @@ -250,4 +251,9 @@ public class ParserUtils { } return text; } + + public static String getXmlLang(XmlPullParser parser) { + String langString = parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang"); + return langString; + } } 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 be3d3a46f..94a83c3b0 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 @@ -20,6 +20,8 @@ import java.security.KeyManagementException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Arrays; @@ -33,8 +35,6 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import java.security.cert.Certificate; -import java.security.cert.CertificateEncodingException; import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.SmackException.SecurityNotPossibleException; 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 e04796df5..2579bf522 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 @@ -1,6 +1,6 @@ /** * - * Copyright 2014-2015 Florian Schmaus + * Copyright 2014-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. @@ -22,8 +22,9 @@ import java.util.Collection; import java.util.Date; import org.jivesoftware.smack.packet.Element; -import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.NamedElement; + import org.jxmpp.util.XmppDateTime; public class XmlStringBuilder implements Appendable, CharSequence { @@ -359,6 +360,13 @@ public class XmlStringBuilder implements Appendable, CharSequence { return this; } + public XmlStringBuilder optXmlLangAttribute(String lang) { + if (lang != null) { + xmllangAttribute(lang); + } + return this; + } + public XmlStringBuilder escape(String text) { assert text != null; sb.append(StringUtils.escapeForXml(text)); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SmackDaneVerifier.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SmackDaneVerifier.java index f50b38756..551cb8c59 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SmackDaneVerifier.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SmackDaneVerifier.java @@ -16,13 +16,14 @@ */ package org.jivesoftware.smack.util.dns; +import java.security.KeyManagementException; +import java.security.SecureRandom; +import java.security.cert.CertificateException; + import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.X509TrustManager; -import java.security.KeyManagementException; -import java.security.SecureRandom; -import java.security.cert.CertificateException; /** * Implementations of this interface define a class that is capable of enabling DANE on a connection. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java index 8e2f27f14..e52b17858 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java @@ -16,7 +16,6 @@ */ package org.jivesoftware.smack.util.stringencoder; - import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java index 40f9b4e7a..b871b27cb 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java @@ -25,9 +25,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import org.jivesoftware.smack.packet.ExtensionElement; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Nonza; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.TopLevelStreamElement; + import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.JidTestUtil; import org.jxmpp.jid.impl.JidCreate; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java index c14f13740..d42770547 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/SmackExceptionTest.java @@ -26,6 +26,7 @@ import java.util.List; import org.jivesoftware.smack.SmackException.ConnectionException; import org.jivesoftware.smack.util.dns.HostAddress; + import org.junit.Test; public class SmackExceptionTest { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/SmackFutureTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackFutureTest.java index 52a592f4b..90bb7cb20 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/SmackFutureTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/SmackFutureTest.java @@ -26,6 +26,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackFuture.InternalSmackFuture; import org.jivesoftware.smack.SmackFuture.SimpleInternalSmackFuture; import org.jivesoftware.smack.packet.Stanza; + import org.junit.Test; public class SmackFutureTest { 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 5bd654721..f8a9477ce 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertNull; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; + import org.junit.Test; public class StanzaCollectorTest diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaIdTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaIdTest.java index 69a94938f..8a73f1a96 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaIdTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaIdTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.TestIQ; import org.jivesoftware.smack.util.StringUtils; + import org.junit.Test; public class StanzaIdTest { 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 35aeaed9b..ba7806491 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java @@ -25,9 +25,9 @@ import java.util.logging.Logger; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.IQ.Type; /** * A threaded dummy connection. diff --git a/smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java b/smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java index 406375579..3be624c99 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/filter/FromMatchesFilterTest.java @@ -16,11 +16,12 @@ */ package org.jivesoftware.smack.filter; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; + import org.junit.Test; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; 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 021a0778c..4c546c9c2 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 @@ -21,14 +21,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.jivesoftware.smack.test.util.XmlUnitUtils; -import org.junit.Test; -import org.xml.sax.SAXException; - import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.ArrayList; + +import org.jivesoftware.smack.test.util.XmlUnitUtils; + +import org.junit.Test; +import org.xml.sax.SAXException; public class MessageTest { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java index 39c4c3e25..22836de92 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java @@ -16,17 +16,16 @@ */ package org.jivesoftware.smack.packet; -import org.junit.Test; - import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.xml.sax.SAXException; - import java.io.IOException; +import org.junit.Test; +import org.xml.sax.SAXException; + public class PresenceTest { @Test public void setPresenceTypeTest() throws IOException, SAXException { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java index a596614d2..f390497f5 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.fail; import org.jivesoftware.smack.packet.StreamError.Condition; import org.jivesoftware.smack.util.PacketParserUtils; + import org.junit.Test; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/ToStringTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/ToStringTest.java index d7c7e924a..c15b3052b 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/ToStringTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/ToStringTest.java @@ -19,6 +19,7 @@ package org.jivesoftware.smack.packet; import static org.junit.Assert.assertEquals; import org.jivesoftware.smack.packet.Presence.Mode; + import org.junit.Test; import org.jxmpp.jid.JidTestUtil; import org.jxmpp.stringprep.XmppStringprepException; 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 a82f4ff58..d59404759 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,8 +16,8 @@ */ package org.jivesoftware.smack.parsing; -import static org.junit.Assert.assertThat; import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence; +import static org.junit.Assert.assertThat; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.packet.ExtensionElement; @@ -25,6 +25,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.util.PacketParserUtils; + import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java index a807a6372..b00844092 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import org.jivesoftware.smack.packet.StandardExtensionElement; import org.jivesoftware.smack.packet.StandardExtensionElement.Builder; + import org.junit.Test; public class StandardExtensionElementParserTest { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java index 73e57d8b7..89e2b7093 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java @@ -19,10 +19,10 @@ package org.jivesoftware.smack.provider; import java.util.ArrayList; import java.util.Collection; -import org.junit.Assert; - import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.FileUtils; + +import org.junit.Assert; import org.junit.Test; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java index cbbd8278d..6ee9a2d0f 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.packet.IQ; + import org.junit.Test; import org.xmlpull.v1.XmlPullParser; 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 7c919d00b..04a0cbf3a 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 @@ -26,9 +26,10 @@ 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; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.stringprep.XmppStringprepException; -import org.jxmpp.jid.EntityBareJid; public class DigestMd5SaslTest extends AbstractSaslTest { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1MechanismTest.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1MechanismTest.java index 9fe177bd7..32af99e7e 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1MechanismTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1MechanismTest.java @@ -25,6 +25,7 @@ import org.jivesoftware.smack.sasl.packet.SaslStreamElements.AuthMechanism; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Response; import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.util.stringencoder.Base64; + import org.junit.Test; import org.jxmpp.jid.JidTestUtil; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java index c2a932070..20aeedefb 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java @@ -19,11 +19,11 @@ package org.jivesoftware.smack.test.util; import java.io.IOException; import java.io.UnsupportedEncodingException; -import net.iharder.Base64; - import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.stringencoder.Base64.Encoder; +import net.iharder.Base64; + /** * The SmackTestSuite takes care of initializing Smack for the unit tests. For example the Base64 * encoder is configured. diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java index fd687a95c..d22b54243 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java @@ -23,6 +23,7 @@ import java.io.StringReader; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smack.util.ParserUtils; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/WaitForPacketListener.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/WaitForPacketListener.java index 5e56d4837..f3073ce73 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/WaitForPacketListener.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/WaitForPacketListener.java @@ -19,8 +19,8 @@ package org.jivesoftware.smack.test.util; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.packet.Stanza; public class WaitForPacketListener implements StanzaListener { 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 1494f220a..780e0bb23 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 @@ -33,20 +33,20 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.sasl.SASLError; import org.jivesoftware.smack.sasl.packet.SaslStreamElements; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.test.util.XmlUnitUtils; + +import com.jamesmurty.utils.XMLBuilder; import org.junit.Test; import org.xml.sax.SAXException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import com.jamesmurty.utils.XMLBuilder; - public class PacketParserUtilsTest { private static Properties outputProperties = new Properties(); diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JDebuggerFactory.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JDebuggerFactory.java index dfa138b3e..0cbd95581 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JDebuggerFactory.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JDebuggerFactory.java @@ -17,13 +17,13 @@ package org.jivesoftware.smackx.debugger.slf4j; +import java.io.Reader; +import java.io.Writer; + import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.debugger.SmackDebugger; import org.jivesoftware.smack.debugger.SmackDebuggerFactory; -import java.io.Reader; -import java.io.Writer; - /** * Implementation of SmackDebuggerFactory which always creates instance of SLF4JSmackDebugger. */ diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java index a0161f3e6..61ea3a9d9 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.debugger.slf4j; import org.jivesoftware.smack.ConnectionListener; import org.jivesoftware.smack.XMPPConnection; + import org.slf4j.Logger; class SLF4JLoggingConnectionListener implements ConnectionListener { diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingPacketListener.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingPacketListener.java index 2b651dfc5..db25a7f55 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingPacketListener.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingPacketListener.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.debugger.slf4j; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.packet.Stanza; + import org.slf4j.Logger; diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java index c013a18b6..ee0840d8a 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.debugger.slf4j; import org.jivesoftware.smack.util.ReaderListener; import org.jivesoftware.smack.util.WriterListener; + import org.slf4j.Logger; class SLF4JRawXmlListener implements ReaderListener, WriterListener { diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java index 7834701c9..c3b683c37 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java @@ -17,20 +17,21 @@ package org.jivesoftware.smackx.debugger.slf4j; -import org.jivesoftware.smack.StanzaListener; +import java.io.Reader; +import java.io.Writer; +import java.util.concurrent.atomic.AtomicBoolean; + import org.jivesoftware.smack.SmackConfiguration; +import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.debugger.SmackDebugger; import org.jivesoftware.smack.util.ObservableReader; import org.jivesoftware.smack.util.ObservableWriter; + import org.jxmpp.jid.EntityFullJid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Reader; -import java.io.Writer; -import java.util.concurrent.atomic.AtomicBoolean; - /** * Implementation of SmackDebugger that writes log messages using SLF4J API. diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java index a4528be3f..c9ad9909d 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java @@ -17,23 +17,28 @@ package org.jivesoftware.smackx.debugger; -import org.jivesoftware.smack.AbstractConnectionListener; -import org.jivesoftware.smack.ConnectionListener; -import org.jivesoftware.smack.StanzaListener; -import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.debugger.SmackDebugger; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.Presence; -import org.jivesoftware.smack.util.ObservableReader; -import org.jivesoftware.smack.util.ObservableWriter; -import org.jivesoftware.smack.util.ReaderListener; -import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smack.util.WriterListener; -import org.jxmpp.jid.EntityFullJid; -import org.jxmpp.jid.Jid; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.StringSelection; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.BorderFactory; @@ -64,28 +69,24 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.GridLayout; -import java.awt.Insets; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.StringSelection; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.jivesoftware.smack.AbstractConnectionListener; +import org.jivesoftware.smack.ConnectionListener; +import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.debugger.SmackDebugger; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.util.ObservableReader; +import org.jivesoftware.smack.util.ObservableWriter; +import org.jivesoftware.smack.util.ReaderListener; +import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smack.util.WriterListener; + +import org.jxmpp.jid.EntityFullJid; +import org.jxmpp.jid.Jid; /** * The EnhancedDebugger is a debugger that allows to debug sent, received and interpreted messages diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java index f8fc495cf..cb43de6dd 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java @@ -48,6 +48,7 @@ import org.jivesoftware.smack.util.ObservableReader; import org.jivesoftware.smack.util.ObservableWriter; import org.jivesoftware.smack.util.ReaderListener; import org.jivesoftware.smack.util.WriterListener; + import org.jxmpp.jid.EntityFullJid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonCopyReceivedListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonCopyReceivedListener.java index 25a82be4b..864e25cbc 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonCopyReceivedListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonCopyReceivedListener.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.carbons; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Direction; public interface CarbonCopyReceivedListener { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java index 98321a2b0..83243add5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java @@ -42,12 +42,14 @@ import org.jivesoftware.smack.filter.StanzaTypeFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.carbons.packet.Carbon; import org.jivesoftware.smackx.carbons.packet.CarbonExtension; import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Direction; import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Private; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.forward.packet.Forwarded; + import org.jxmpp.jid.EntityFullJid; /** 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 8fa7af1ad..f6d63952d 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 @@ -16,9 +16,10 @@ */ package org.jivesoftware.smackx.carbons.packet; -import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.forward.packet.Forwarded; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java index 1c93b288f..95f7f17ab 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java @@ -18,10 +18,12 @@ package org.jivesoftware.smackx.carbons.provider; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.carbons.packet.CarbonExtension; import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Direction; import org.jivesoftware.smackx.forward.packet.Forwarded; import org.jivesoftware.smackx.forward.provider.ForwardedProvider; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java index 1727f83a3..2749b5a75 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java @@ -26,6 +26,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java index b4ca97d5d..aaee88c72 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.chat_markers.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.AcknowledgedExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java index 340bd3e82..734688628 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.chat_markers.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.DisplayedExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java index 452d54d38..0975ee85b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.chat_markers.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.MarkableExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java index 4e0676606..1d462958e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.chat_markers.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.ReceivedExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/ClientStateIndicationManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/ClientStateIndicationManager.java index 6a1db1b9b..0dd861b0a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/ClientStateIndicationManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/ClientStateIndicationManager.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.csi; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; + import org.jivesoftware.smackx.csi.packet.ClientStateIndication; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java index 9e7a24391..0526b55eb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java @@ -16,8 +16,8 @@ */ package org.jivesoftware.smackx.csi.packet; -import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Nonza; /** * Client State Indication. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java index 95685e0af..dadd019d5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java @@ -20,7 +20,9 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.csi.packet.ClientStateIndication; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionManager.java index b1808c45d..7f0646ee8 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionManager.java @@ -22,6 +22,7 @@ import java.util.WeakHashMap; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java index b466f4b70..279fb144d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.eme.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement; + import org.xmlpull.v1.XmlPullParser; public class ExplicitMessageEncryptionProvider extends ExtensionElementProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java index 018955810..ab0981f7f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.gcm.packet; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.json.packet.AbstractJsonPacketExtension; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/HashManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/HashManager.java index cfc3858f8..9236dca83 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/HashManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/HashManager.java @@ -42,13 +42,15 @@ import java.util.Collections; import java.util.List; import java.util.WeakHashMap; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.hashes.element.HashElement; +import org.bouncycastle.jce.provider.BouncyCastleProvider; + /** * Manager that can be used to determine support for hash functions. */ diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java index c1dad6a0a..5dc8317cd 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java @@ -16,13 +16,13 @@ */ package org.jivesoftware.smackx.hashes.element; +import static org.jivesoftware.smack.util.Objects.requireNonNull; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smack.util.stringencoder.Base64; -import org.jivesoftware.smackx.hashes.HashManager; -import static org.jivesoftware.smack.util.Objects.requireNonNull; +import org.jivesoftware.smackx.hashes.HashManager; /** * Represent a hash element. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java index 0042f2930..62e5a657a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java @@ -17,8 +17,10 @@ package org.jivesoftware.smackx.hashes.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.hashes.HashManager; import org.jivesoftware.smackx.hashes.element.HashElement; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/MessageProcessingHintsManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/MessageProcessingHintsManager.java index 4f0e20522..5595386ec 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/MessageProcessingHintsManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/MessageProcessingHintsManager.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.Set; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.hints.element.MessageProcessingHintType; import org.jivesoftware.smackx.hints.element.NoCopyHint; import org.jivesoftware.smackx.hints.element.NoPermanentStoreHint; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java index 0918bcd56..34f54e844 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.hints.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.hints.element.MessageProcessingHint; + import org.xmlpull.v1.XmlPullParser; public abstract class MessageProcessingHintProvider extends ExtensionElementProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java index a99132630..9c0866c28 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java @@ -18,12 +18,14 @@ package org.jivesoftware.smackx.hoxt; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; -import org.jivesoftware.smack.SmackException.NotConnectedException; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp; + import org.jxmpp.jid.Jid; /** 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 c4eccfdf9..0842b15ae 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 @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.shim.packet.HeadersExtension; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java index 0d68414b6..6b307f70e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.hoxt.packet; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.hoxt.HOXTManager; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java index b3cbccb6d..17903ee32 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java @@ -16,17 +16,19 @@ */ package org.jivesoftware.smackx.hoxt.provider; +import java.io.IOException; + import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp; import org.jivesoftware.smackx.shim.packet.HeadersExtension; import org.jivesoftware.smackx.shim.provider.HeadersProvider; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.IOException; - /** * Abstract parent for Req and Resp stanza(/packet) providers. * diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java index 64c1743e2..9755d9d52 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.hoxt.provider; import java.io.IOException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.hoxt.packet.Base64BinaryChunk; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java index 501a34688..a87776867 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.hoxt.provider; import org.jivesoftware.smackx.hoxt.packet.HttpMethod; import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java index c3ff3868c..8b4067629 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.hoxt.provider; import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp; import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp; import org.jivesoftware.smackx.shim.packet.HeadersExtension; + import org.xmlpull.v1.XmlPullParser; /** 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 bbc5cb51c..da2e6d609 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 @@ -16,24 +16,6 @@ */ package org.jivesoftware.smackx.httpfileupload; -import org.jivesoftware.smack.AbstractConnectionListener; -import org.jivesoftware.smack.ConnectionConfiguration; -import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.XMPPConnectionRegistry; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo; -import org.jivesoftware.smackx.httpfileupload.UploadService.Version; -import org.jivesoftware.smackx.httpfileupload.element.Slot; -import org.jivesoftware.smackx.httpfileupload.element.SlotRequest; -import org.jivesoftware.smackx.httpfileupload.element.SlotRequest_V0_2; -import org.jivesoftware.smackx.xdata.FormField; -import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.DomainBareJid; - import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -53,6 +35,26 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; +import org.jivesoftware.smack.AbstractConnectionListener; +import org.jivesoftware.smack.ConnectionConfiguration; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.SmackException; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPConnectionRegistry; +import org.jivesoftware.smack.XMPPException; + +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.httpfileupload.UploadService.Version; +import org.jivesoftware.smackx.httpfileupload.element.Slot; +import org.jivesoftware.smackx.httpfileupload.element.SlotRequest; +import org.jivesoftware.smackx.httpfileupload.element.SlotRequest_V0_2; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; + +import org.jxmpp.jid.DomainBareJid; + /** * A manager for XEP-0363: HTTP File Upload. * 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 e9d81a447..ae9f90cbb 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 @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.httpfileupload; import org.jivesoftware.smack.util.Objects; + import org.jxmpp.jid.DomainBareJid; public class UploadService { 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 e341bca46..943929f9f 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 @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.httpfileupload.element; -import org.jivesoftware.smack.packet.IQ; - import java.net.URL; import java.util.Collections; import java.util.Map; +import org.jivesoftware.smack.packet.IQ; + /** * Slot responded by upload service. * diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest.java index a776ccf32..882e93054 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.httpfileupload.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager; + import org.jxmpp.jid.DomainBareJid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest_V0_2.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest_V0_2.java index eb87bc923..4a7b02244 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest_V0_2.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/SlotRequest_V0_2.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.httpfileupload.element; import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager; + import org.jxmpp.jid.DomainBareJid; public class SlotRequest_V0_2 extends SlotRequest { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java index d8114c0d3..0fa1feaec 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java @@ -17,8 +17,10 @@ package org.jivesoftware.smackx.httpfileupload.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError; import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError_V0_2; + import org.xmlpull.v1.XmlPullParser; /** 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 fdfd8b012..4647f168c 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 @@ -16,19 +16,21 @@ */ package org.jivesoftware.smackx.httpfileupload.provider; -import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smack.util.ParserUtils; -import org.jivesoftware.smackx.httpfileupload.element.Slot; -import org.jivesoftware.smackx.httpfileupload.element.Slot_V0_2; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.IOException; import java.net.URL; import java.util.HashMap; import java.util.Map; +import org.jivesoftware.smack.SmackException; +import org.jivesoftware.smack.provider.IQProvider; +import org.jivesoftware.smack.util.ParserUtils; + +import org.jivesoftware.smackx.httpfileupload.element.Slot; +import org.jivesoftware.smackx.httpfileupload.element.Slot_V0_2; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + /** * Provider for Slot. * diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/IoTManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/IoTManager.java index 97ed28fce..61c52bea6 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/IoTManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/IoTManager.java @@ -23,7 +23,9 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; + import org.jivesoftware.smackx.iot.provisioning.IoTProvisioningManager; + import org.jxmpp.jid.Jid; public abstract class IoTManager extends Manager { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/IoTControlManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/IoTControlManager.java index 12ec2b085..ca3fc1df1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/IoTControlManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/IoTControlManager.java @@ -28,12 +28,14 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.IoTManager; import org.jivesoftware.smackx.iot.Thing; import org.jivesoftware.smackx.iot.control.element.IoTSetRequest; import org.jivesoftware.smackx.iot.control.element.IoTSetResponse; import org.jivesoftware.smackx.iot.control.element.SetData; import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.FullJid; /** 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 3af221a83..3eb58e40e 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 @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.iot.control; import java.util.Collection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.iot.control.element.SetData; + import org.jxmpp.jid.Jid; public interface ThingControlRequest { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java index fdd5a63d7..4f6c62b17 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java @@ -20,12 +20,14 @@ import java.util.ArrayList; import java.util.List; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iot.control.element.IoTSetRequest; import org.jivesoftware.smackx.iot.control.element.SetBoolData; import org.jivesoftware.smackx.iot.control.element.SetData; import org.jivesoftware.smackx.iot.control.element.SetDoubleData; import org.jivesoftware.smackx.iot.control.element.SetIntData; import org.jivesoftware.smackx.iot.control.element.SetLongData; + import org.xmlpull.v1.XmlPullParser; public class IoTSetRequestProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java index 7de60f00f..e484d8461 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.iot.control.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iot.control.element.IoTSetResponse; + import org.xmlpull.v1.XmlPullParser; public class IoTSetResponseProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java index 78268a159..27077bdaa 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java @@ -26,9 +26,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; @@ -36,6 +36,7 @@ import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.iot.IoTManager; import org.jivesoftware.smackx.iot.Thing; import org.jivesoftware.smackx.iot.data.element.IoTDataField; @@ -44,6 +45,7 @@ import org.jivesoftware.smackx.iot.data.element.IoTDataRequest; import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension; import org.jivesoftware.smackx.iot.data.filter.IoTFieldsExtensionFilter; import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.EntityFullJid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java index 2a9651f49..577d4072a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java @@ -23,6 +23,7 @@ import java.util.List; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class IoTFieldsExtension implements ExtensionElement { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java index 495366896..7855685c4 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java @@ -21,6 +21,7 @@ import java.util.List; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class NodeElement implements NamedElement { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/filter/IoTFieldsExtensionFilter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/filter/IoTFieldsExtensionFilter.java index d9a1b484a..dca8f0154 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/filter/IoTFieldsExtensionFilter.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/filter/IoTFieldsExtensionFilter.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.iot.data.filter; import org.jivesoftware.smack.filter.FlexibleStanzaTypeFilter; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension; public class IoTFieldsExtensionFilter extends FlexibleStanzaTypeFilter { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java index 7d2769493..398b1ac36 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.iot.data.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.data.element.IoTDataReadOutAccepted; + import org.xmlpull.v1.XmlPullParser; public class IoTDataReadOutAcceptedProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java index 575d746bf..b06ca9495 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.iot.data.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.data.element.IoTDataRequest; + import org.xmlpull.v1.XmlPullParser; public class IoTDataRequestProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java index cd3ef6afe..03b6e870d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java @@ -25,12 +25,14 @@ import java.util.logging.Logger; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.data.element.IoTDataField; import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension; import org.jivesoftware.smackx.iot.data.element.NodeElement; import org.jivesoftware.smackx.iot.data.element.TimestampElement; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.jxmpp.util.XmppDateTime; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java index e81a41818..121c4d6ee 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java @@ -37,6 +37,7 @@ import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.Objects; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.iot.IoTManager; @@ -55,6 +56,7 @@ import org.jivesoftware.smackx.iot.discovery.element.IoTUnregister; import org.jivesoftware.smackx.iot.discovery.element.Tag; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.provisioning.IoTProvisioningManager; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingState.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingState.java index 959bf8896..fd9628ea2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingState.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/ThingState.java @@ -20,7 +20,9 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.jivesoftware.smack.util.Async; + import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.BareJid; public class ThingState { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTClaimed.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTClaimed.java index f62c665b3..f412bae99 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTClaimed.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTClaimed.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.Jid; public class IoTClaimed extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisown.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisown.java index 04324579d..22a4472d0 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisown.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisown.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.Jid; public class IoTDisown extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisowned.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisowned.java index 69aa1b6ba..032ab48fb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisowned.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTDisowned.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class IoTDisowned extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRegister.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRegister.java index ebc535c1d..b3134027c 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRegister.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRegister.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.discovery.element; import java.util.Collection; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class IoTRegister extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemove.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemove.java index 2485fc765..9182ef995 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemove.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemove.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemoved.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemoved.java index 3a1d47034..d40358e24 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemoved.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTRemoved.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class IoTRemoved extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTUnregister.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTUnregister.java index 767117418..bdc536f97 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTUnregister.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/IoTUnregister.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.discovery.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.iot.element.NodeInfo; public class IoTUnregister extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java index 7297a5f18..8a8b0c0ee 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.discovery.element.IoTClaimed; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java index 1711130f3..b9be81252 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.discovery.element.IoTDisown; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java index 4200e8040..51245ab3e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java @@ -17,9 +17,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iot.discovery.element.IoTDisowned; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.xmlpull.v1.XmlPullParser; public class IoTDisownedProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java index 672a17cc4..9b1b5d068 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java @@ -21,10 +21,12 @@ import java.util.List; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.discovery.element.IoTRegister; import org.jivesoftware.smackx.iot.discovery.element.Tag; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.xmlpull.v1.XmlPullParser; public class IoTRegisterProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java index 528871d1e..754cb18a1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java @@ -19,9 +19,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.discovery.element.IoTRemove; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java index be54303db..a181cefec 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java @@ -17,9 +17,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iot.discovery.element.IoTRemoved; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.xmlpull.v1.XmlPullParser; public class IoTRemovedProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java index 4352bf4a3..ecd636a23 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java @@ -17,9 +17,11 @@ package org.jivesoftware.smackx.iot.discovery.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iot.discovery.element.IoTUnregister; import org.jivesoftware.smackx.iot.element.NodeInfo; import org.jivesoftware.smackx.iot.parser.NodeInfoParser; + import org.xmlpull.v1.XmlPullParser; public class IoTUnregisterProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java index 7cc7ae2c9..bec0bc14a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java @@ -16,11 +16,12 @@ */ package org.jivesoftware.smackx.iot.parser; -import org.jivesoftware.smackx.iot.element.NodeInfo; -import org.xmlpull.v1.XmlPullParser; - import static org.jivesoftware.smack.util.StringUtils.isNullOrEmpty; +import org.jivesoftware.smackx.iot.element.NodeInfo; + +import org.xmlpull.v1.XmlPullParser; + public class NodeInfoParser { public static NodeInfo parse(XmlPullParser parser) { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/BecameFriendListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/BecameFriendListener.java index 83d9f49fe..e68541476 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/BecameFriendListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/BecameFriendListener.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.provisioning; import org.jivesoftware.smack.packet.Presence; + import org.jxmpp.jid.BareJid; public interface BecameFriendListener { 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 42a53e6c0..a1d2c9cfe 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 @@ -46,6 +46,7 @@ import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.roster.AbstractPresenceEventListener; import org.jivesoftware.smack.roster.Roster; import org.jivesoftware.smack.roster.SubscribeListener; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.iot.IoTManager; @@ -57,6 +58,7 @@ import org.jivesoftware.smackx.iot.provisioning.element.Friend; import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriend; import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriendResponse; import org.jivesoftware.smackx.iot.provisioning.element.Unfriend; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/WasUnfriendedListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/WasUnfriendedListener.java index 43e9a6d31..e9d31d624 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/WasUnfriendedListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/WasUnfriendedListener.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.provisioning; import org.jivesoftware.smack.packet.Presence; + import org.jxmpp.jid.BareJid; public interface WasUnfriendedListener { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java index 224269fbd..50fa0df61 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.BareJid; public class Friend implements ExtensionElement { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriend.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriend.java index 1aab7d87d..644a382b5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriend.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriend.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.provisioning.element; import org.jivesoftware.smack.packet.IQ; + import org.jxmpp.jid.Jid; public class IoTIsFriend extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriendResponse.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriendResponse.java index 042b69055..f7dfa54f2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriendResponse.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/IoTIsFriendResponse.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.iot.provisioning.element; import org.jivesoftware.smack.packet.IQ; + import org.jxmpp.jid.BareJid; public class IoTIsFriendResponse extends IQ { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java index 9a1ae5256..27da772cb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.provisioning.element; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.BareJid; public class Unfriend implements ExtensionElement { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java index b8f7e7565..b39a7e273 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smackx.iot.provisioning.element.ClearCache; + import org.xmlpull.v1.XmlPullParser; public class ClearCacheProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java index d535d9469..b1aa58192 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smackx.iot.provisioning.element.ClearCacheResponse; + import org.xmlpull.v1.XmlPullParser; public class ClearCacheResponseProvider extends IQProvider { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java index 7267a75ad..358e6b7cb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.provisioning.element.Friend; + import org.jxmpp.jid.BareJid; import org.jxmpp.stringprep.XmppStringprepException; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java index 9a4fa21a6..db4b254cb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java @@ -17,9 +17,10 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.IQProvider; - import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriend; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java index 7080b8dc3..c3c1808b4 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriendResponse; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java index 73fd940ee..7eb47d70a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.iot.provisioning.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.iot.provisioning.element.Unfriend; + import org.jxmpp.jid.BareJid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java index ab96a7d0b..f6e393a87 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java @@ -21,7 +21,9 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.json.packet.AbstractJsonPacketExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; 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 1a07554a4..fb9c2535c 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 @@ -37,6 +37,7 @@ import org.jivesoftware.smack.filter.IQReplyFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.Objects; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.forward.packet.Forwarded; import org.jivesoftware.smackx.mam.element.MamElements; @@ -48,6 +49,7 @@ import org.jivesoftware.smackx.mam.filter.MamResultFilter; import org.jivesoftware.smackx.rsm.packet.RSMSet; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java index 8c8eecfe1..97b0f80d0 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java @@ -23,7 +23,9 @@ import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.forward.packet.Forwarded; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamFinIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamFinIQ.java index 4b8a61de8..43796fff9 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamFinIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamFinIQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.mam.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.rsm.packet.RSMSet; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamPrefsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamPrefsIQ.java index 213737479..8f312c038 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamPrefsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamPrefsIQ.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.mam.element; import java.util.List; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.mam.element.MamElements.AlwaysJidListElement; import org.jivesoftware.smackx.mam.element.MamElements.NeverJidListElement; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java index 3773985ba..bd9a65d4e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamQueryIQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.mam.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/filter/MamResultFilter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/filter/MamResultFilter.java index 8dcd31897..965e1dd04 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/filter/MamResultFilter.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/filter/MamResultFilter.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.mam.filter; import org.jivesoftware.smack.filter.FlexibleStanzaTypeFilter; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension; import org.jivesoftware.smackx.mam.element.MamQueryIQ; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java index dbdd4942b..155b9b94f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.mam.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.mam.element.MamFinIQ; import org.jivesoftware.smackx.rsm.packet.RSMSet; import org.jivesoftware.smackx.rsm.provider.RSMSetProvider; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java index e65629780..07d5ec1e5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java @@ -21,8 +21,10 @@ import java.util.ArrayList; import java.util.List; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.mam.element.MamPrefsIQ; import org.jivesoftware.smackx.mam.element.MamPrefsIQ.DefaultBehavior; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java index cdb859a04..663481890 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java @@ -17,9 +17,11 @@ package org.jivesoftware.smackx.mam.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jivesoftware.smackx.xdata.provider.DataFormProvider; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java index c3b5be198..f8c5d1282 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java @@ -17,9 +17,11 @@ package org.jivesoftware.smackx.mam.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.forward.packet.Forwarded; import org.jivesoftware.smackx.forward.provider.ForwardedProvider; import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MUCLightRoomInfo.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MUCLightRoomInfo.java index 486b55d05..1de640ee0 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MUCLightRoomInfo.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MUCLightRoomInfo.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; + import org.jxmpp.jid.Jid; /** 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 93796738a..41f13b8e3 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 @@ -22,9 +22,9 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import org.jivesoftware.smack.MessageListener; -import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; @@ -36,6 +36,7 @@ import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ; import org.jivesoftware.smackx.muclight.element.MUCLightChangeAffiliationsIQ; import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ; @@ -46,6 +47,7 @@ import org.jivesoftware.smackx.muclight.element.MUCLightGetConfigsIQ; import org.jivesoftware.smackx.muclight.element.MUCLightGetInfoIQ; import org.jivesoftware.smackx.muclight.element.MUCLightInfoIQ; import org.jivesoftware.smackx.muclight.element.MUCLightSetConfigsIQ; + import org.jxmpp.jid.EntityJid; import org.jxmpp.jid.Jid; 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 9d1566572..81f270c16 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 @@ -32,9 +32,11 @@ import org.jivesoftware.smack.filter.IQReplyFilter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ; + import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightAffiliationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightAffiliationsIQ.java index a5b23c23f..e82b8f600 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightAffiliationsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightAffiliationsIQ.java @@ -21,9 +21,11 @@ import java.util.Iterator; import java.util.Map; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.UserWithAffiliationElement; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java index f0915a01b..e89a41516 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightBlockingIQ.java @@ -21,8 +21,10 @@ import java.util.Iterator; import java.util.Map; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.BlockingElement; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightChangeAffiliationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightChangeAffiliationsIQ.java index d165d24b9..89bd8daf2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightChangeAffiliationsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightChangeAffiliationsIQ.java @@ -21,9 +21,11 @@ import java.util.Iterator; import java.util.Map; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.UserWithAffiliationElement; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightConfigurationIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightConfigurationIQ.java index a0d93ce1d..e673fa865 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightConfigurationIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightConfigurationIQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.muclight.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightCreateIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightCreateIQ.java index e52e6ce1a..ecdcaa057 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightCreateIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightCreateIQ.java @@ -20,11 +20,13 @@ import java.util.HashMap; import java.util.List; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationElement; import org.jivesoftware.smackx.muclight.element.MUCLightElements.OccupantsElement; + import org.jxmpp.jid.EntityJid; import org.jxmpp.jid.Jid; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightDestroyIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightDestroyIQ.java index 15b027aa1..6dd4f24bb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightDestroyIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightDestroyIQ.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.muclight.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java index 8df76d080..75f94b433 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java @@ -24,10 +24,12 @@ import org.jivesoftware.smack.packet.Element; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.jxmpp.jid.Jid; public abstract class MUCLightElements { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetAffiliationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetAffiliationsIQ.java index a50d93201..1d198faea 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetAffiliationsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetAffiliationsIQ.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.muclight.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetConfigsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetConfigsIQ.java index 7743ce4ba..1e8dca964 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetConfigsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetConfigsIQ.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.muclight.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetInfoIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetInfoIQ.java index 6c5d03125..70b03db06 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetInfoIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightGetInfoIQ.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.muclight.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightInfoIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightInfoIQ.java index 44f74db30..af01bd01f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightInfoIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightInfoIQ.java @@ -19,11 +19,13 @@ package org.jivesoftware.smackx.muclight.element; import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.MultiUserChatLight; import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationElement; import org.jivesoftware.smackx.muclight.element.MUCLightElements.OccupantsElement; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightSetConfigsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightSetConfigsIQ.java index d7dbfbf14..a63ecab10 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightSetConfigsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightSetConfigsIQ.java @@ -21,7 +21,9 @@ import java.util.Iterator; import java.util.Map; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.MultiUserChatLight; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java index fc64af397..84b831be8 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.muclight.provider; import java.util.HashMap; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.element.MUCLightElements.AffiliationsChangeExtension; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java index 90601d841..62c41b2ed 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.muclight.provider; import java.util.HashMap; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java index 85803e7a3..576dd59e1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java @@ -21,7 +21,9 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.stringprep.XmppStringprepException; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java index 494ba2657..48af0d66e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.muclight.provider; import java.util.HashMap; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java index efd8770a5..1785bfc7f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.muclight.provider; import java.util.HashMap; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationsChangeExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java index da6e5fdb0..b76274424 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java @@ -19,9 +19,11 @@ package org.jivesoftware.smackx.muclight.provider; import java.util.HashMap; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.muclight.MUCLightAffiliation; import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration; import org.jivesoftware.smackx.muclight.element.MUCLightInfoIQ; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java index 2f3602d62..0a9e2303b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java @@ -29,10 +29,12 @@ import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.push_notifications.element.DisablePushNotificationsIQ; import org.jivesoftware.smackx.push_notifications.element.EnablePushNotificationsIQ; import org.jivesoftware.smackx.push_notifications.element.PushNotificationsElements; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/DisablePushNotificationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/DisablePushNotificationsIQ.java index 278dc3ad6..cb2630ad8 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/DisablePushNotificationsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/DisablePushNotificationsIQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.push_notifications.element; import org.jivesoftware.smack.packet.IQ; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java index 1fea8d518..a63b779a3 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java @@ -21,9 +21,11 @@ import java.util.Iterator; import java.util.Map; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java index f1805127c..d7e369320 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.push_notifications.element; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.pubsub.packet.PubSub; + import org.jxmpp.jid.Jid; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java index e642f91b0..946489440 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.push_notifications.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.push_notifications.element.PushNotificationsElements.RemoteDisablingExtension; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; 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 47a3fc4ec..48cca1e63 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; import org.jivesoftware.smack.experimental.ExperimentalInitializer; + import org.junit.Test; public class ExperimentalInitializerTest { 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 20e479f95..acf139c6e 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,21 +16,22 @@ */ package org.jivesoftware.smackx.carbons; +import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence; import java.util.Properties; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.ExperimentalInitializerTest; import org.jivesoftware.smackx.carbons.packet.CarbonExtension; import org.jivesoftware.smackx.carbons.provider.CarbonManagerProvider; import org.jivesoftware.smackx.forward.packet.Forwarded; -import org.junit.Test; -import org.xmlpull.v1.XmlPullParser; import com.jamesmurty.utils.XMLBuilder; +import org.junit.Test; +import org.xmlpull.v1.XmlPullParser; public class CarbonTest extends ExperimentalInitializerTest { 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 20546ca02..3ed4d3c12 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 @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.AcknowledgedExtension; import org.jivesoftware.smackx.chat_markers.provider.AcknowledgedProvider; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 7bd146400..fd8161e8b 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 @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.DisplayedExtension; import org.jivesoftware.smackx.chat_markers.provider.DisplayedProvider; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 a595a21f5..3c28d10cb 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 @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.MarkableExtension; import org.jivesoftware.smackx.chat_markers.provider.MarkableProvider; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 ffdadec3d..d34dc8088 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 @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.chat_markers; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements; import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.ReceivedExtension; import org.jivesoftware.smackx.chat_markers.provider.ReceivedProvider; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java index 248b9e39a..3599924fd 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.eme.provider; import static org.junit.Assert.assertEquals; import org.jivesoftware.smack.test.util.TestUtils; + import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement; import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement.ExplicitMessageEncryptionProtocol; + import org.junit.Test; public class ExplicitMessageEncryptionProviderTest { diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java index d5fdd8739..2121d588d 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java @@ -25,8 +25,10 @@ import static org.junit.Assert.assertArrayEquals; import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.hashes.element.HashElement; import org.jivesoftware.smackx.hashes.provider.HashElementProvider; + import org.junit.Test; /** diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java index 3326abaaf..82d30b882 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.hashes; import static junit.framework.TestCase.assertEquals; import org.jivesoftware.smack.test.util.SmackTestSuite; + import org.junit.Test; /** diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java index 420d0bd5d..4155a6f48 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java @@ -16,22 +16,24 @@ */ package org.jivesoftware.smackx.hoxt.provider; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp; -import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq; -import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp; -import org.jivesoftware.smackx.shim.packet.Header; -import org.jivesoftware.smackx.shim.packet.HeadersExtension; -import org.junit.Test; -import org.xmlpull.v1.XmlPullParser; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.util.PacketParserUtils; + +import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp; +import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq; +import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp; +import org.jivesoftware.smackx.shim.packet.Header; +import org.jivesoftware.smackx.shim.packet.HeadersExtension; + +import org.junit.Test; +import org.xmlpull.v1.XmlPullParser; /** * Tests correct headers and data parsing in 'req' and 'resp' elements. diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java index a4b00dd23..9845e0ecc 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.hoxt.packet.Base64BinaryChunk; + import org.junit.Test; import org.xmlpull.v1.XmlPullParser; 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 c4cab9606..e1dc35b78 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 @@ -16,16 +16,18 @@ */ package org.jivesoftware.smackx.hoxt.provider; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.hoxt.packet.HttpMethod; -import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq; -import org.junit.Test; -import org.xmlpull.v1.XmlPullParser; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.util.PacketParserUtils; + +import org.jivesoftware.smackx.hoxt.packet.HttpMethod; +import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq; + +import org.junit.Test; +import org.xmlpull.v1.XmlPullParser; + public class HttpOverXmppReqProviderTest { @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java index 6da0887a3..3001eb844 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp; + import org.junit.Test; import org.xmlpull.v1.XmlPullParser; 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 d2abf74f6..157dc77c4 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 @@ -16,8 +16,8 @@ */ package org.jivesoftware.smackx.httpfileupload; - import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError; + import org.junit.Assert; import org.junit.Test; 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 ebb5170cd..49cd2c233 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,14 +16,14 @@ */ package org.jivesoftware.smackx.httpfileupload; - -import org.jivesoftware.smackx.httpfileupload.element.Slot; -import org.junit.Assert; -import org.junit.Test; - import java.net.MalformedURLException; import java.net.URL; +import org.jivesoftware.smackx.httpfileupload.element.Slot; + +import org.junit.Assert; +import org.junit.Test; + public class SlotCreateTest { String testSlot = "" 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 43c6fe80d..153dec1cc 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 @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.httpfileupload; import org.jivesoftware.smackx.httpfileupload.element.SlotRequest; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.JidTestUtil; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java index 564b142d6..079109371 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.httpfileupload.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError; + import org.junit.Assert; import org.junit.Test; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java index 4cef3c550..82813d5e3 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java @@ -16,14 +16,16 @@ */ package org.jivesoftware.smackx.httpfileupload.provider; +import java.net.URL; + import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.httpfileupload.element.Slot; + import org.junit.Assert; import org.junit.Test; -import java.net.URL; - public class SlotProviderTest { diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java index c9c4e37a5..c2c371c6e 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java @@ -23,6 +23,7 @@ import java.util.List; import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 a44be134e..d74878e8a 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 @@ -19,9 +19,11 @@ package org.jivesoftware.smackx.mam; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.mam.element.MamFinIQ; import org.jivesoftware.smackx.mam.provider.MamFinIQProvider; import org.jivesoftware.smackx.rsm.packet.RSMSet; + import org.junit.Assert; import org.junit.Test; import org.xmlpull.v1.XmlPullParser; 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 30c270cd9..fe56ca81b 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 @@ -20,8 +20,10 @@ import java.util.List; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.mam.element.MamPrefsIQ; import org.jivesoftware.smackx.mam.provider.MamPrefsIQProvider; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 9141137c3..b9236ad08 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 @@ -22,9 +22,11 @@ import java.util.List; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.junit.Assert; import org.junit.Test; 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 c8c43eaea..89535a1a5 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 @@ -22,9 +22,11 @@ import java.util.TimeZone; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.forward.packet.Forwarded; import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension; import org.jivesoftware.smackx.mam.provider.MamResultProvider; + import org.junit.Assert; import org.junit.Test; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java index 3327f8384..494654a91 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java @@ -21,8 +21,10 @@ import java.lang.reflect.Method; import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.XMPPConnection; + import org.jivesoftware.smackx.InitExtensions; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.junit.Before; public class MamTest extends InitExtensions { diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java index ad32e32d5..83cdba531 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java @@ -17,12 +17,13 @@ package org.jivesoftware.smackx.mam; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.rsm.packet.RSMSet; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; public class PagingTest extends MamTest { 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 3ce06cc81..52fe85822 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 @@ -19,13 +19,14 @@ package org.jivesoftware.smackx.mam; import java.util.ArrayList; import java.util.List; -import org.junit.Test; -import org.jxmpp.jid.Jid; -import org.jxmpp.jid.impl.JidCreate; import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamPrefsIQ; import org.jivesoftware.smackx.mam.element.MamPrefsIQ.DefaultBehavior; + import org.junit.Assert; +import org.junit.Test; +import org.jxmpp.jid.Jid; +import org.jxmpp.jid.impl.JidCreate; public class PreferencesTest { 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 936aa33e1..2603b7d63 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 @@ -23,12 +23,14 @@ import java.util.TimeZone; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Message.Type; + import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.jivesoftware.smackx.forward.packet.Forwarded; import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension; import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java index f932666d3..a2df5535b 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java @@ -19,9 +19,11 @@ package org.jivesoftware.smackx.mam; import java.lang.reflect.Method; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.junit.Assert; import org.junit.Test; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java index 46939c42d..e717bcfc0 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java @@ -24,9 +24,9 @@ import org.jivesoftware.smackx.mam.element.MamElements; import org.jivesoftware.smackx.mam.element.MamQueryIQ; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.junit.Test; import org.junit.Assert; +import org.junit.Test; public class RetrieveFormFieldsTest extends MamTest { 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 04e6151db..ef67ddf77 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 @@ -20,7 +20,9 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightElements.AffiliationsChangeExtension; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 8e3e68185..a92bb86de 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 @@ -21,7 +21,9 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 e12dd22c5..7180bf873 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 @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.muclight.element.MUCLightChangeAffiliationsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 e3b5f2ab8..e4002c221 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 @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.muclight; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationsChangeExtension; + import org.junit.Assert; import org.junit.Test; 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 ffc575006..4a5ba7067 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 @@ -21,12 +21,12 @@ import java.util.HashMap; import java.util.List; import org.jivesoftware.smackx.muclight.element.MUCLightCreateIQ; + +import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; -import org.junit.Assert; - public class MUCLightCreateIQTest { String stanza = "" 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 ae73e3d5b..cafc9264b 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 @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.muclight; import org.jivesoftware.smackx.muclight.element.MUCLightDestroyIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 7e8fdea52..95d9fc19b 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 @@ -20,8 +20,10 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ; import org.jivesoftware.smackx.muclight.element.MUCLightGetAffiliationsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.Jid; 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 896bfb7ad..1d92832b7 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 @@ -20,8 +20,10 @@ import java.util.HashMap; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ; import org.jivesoftware.smackx.muclight.element.MUCLightGetConfigsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 f89661c1e..64e798ab9 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 @@ -18,8 +18,10 @@ package org.jivesoftware.smackx.muclight; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muclight.element.MUCLightGetInfoIQ; import org.jivesoftware.smackx.muclight.element.MUCLightInfoIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 be644db3d..17ea91522 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 @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.muclight; import java.util.HashMap; import org.jivesoftware.smackx.muclight.element.MUCLightSetConfigsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 04a080457..0a607c806 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 @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.push_notifications; import org.jivesoftware.smackx.push_notifications.element.DisablePushNotificationsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 c42e5bf12..c418d7cea 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 @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.push_notifications; import java.util.HashMap; import org.jivesoftware.smackx.push_notifications.element.EnablePushNotificationsIQ; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; 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 58630feda..75f9cc177 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 @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.push_notifications; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.push_notifications.element.PushNotificationsElements.RemoteDisablingExtension; + import org.junit.Assert; import org.junit.Test; import org.jxmpp.jid.impl.JidCreate; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/Chat.java b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/Chat.java index f8b9edbd6..0db529a8c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/Chat.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/Chat.java @@ -21,6 +21,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Presence; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java index 9e8ab2410..6448900ac 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java @@ -39,7 +39,9 @@ import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.roster.AbstractRosterListener; import org.jivesoftware.smack.roster.Roster; + import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/IncomingChatMessageListener.java b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/IncomingChatMessageListener.java index a59e7b057..71caf0122 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/IncomingChatMessageListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/IncomingChatMessageListener.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.chat2; import org.jivesoftware.smack.packet.Message; + import org.jxmpp.jid.EntityBareJid; public interface IncomingChatMessageListener { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/OutgoingChatMessageListener.java b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/OutgoingChatMessageListener.java index 74660cb56..4ceba2c6f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/OutgoingChatMessageListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/OutgoingChatMessageListener.java @@ -17,6 +17,7 @@ package org.jivesoftware.smack.chat2; import org.jivesoftware.smack.packet.Message; + import org.jxmpp.jid.EntityBareJid; public interface OutgoingChatMessageListener { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java index 928d2fbc4..c2b003e6e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java @@ -17,11 +17,12 @@ package org.jivesoftware.smackx.address; -import org.jivesoftware.smackx.address.packet.MultipleAddresses; -import org.jxmpp.jid.Jid; - import java.util.List; +import org.jivesoftware.smackx.address.packet.MultipleAddresses; + +import org.jxmpp.jid.Jid; + /** * MultipleRecipientInfo keeps information about the multiple recipients extension included * in a received packet. Among the information we can find the list of TO and CC addresses. 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 2161b6ca7..9dd6e0189 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 @@ -17,26 +17,28 @@ package org.jivesoftware.smackx.address; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.FeatureNotSupportedException; +import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.address.packet.MultipleAddresses; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; -import org.jxmpp.jid.EntityBareJid; + import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * A MultipleRecipientManager allows to send packets to multiple recipients by making use of * XEP-33: Extended Stanza Addressing. 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 2eac46e0f..373daba9e 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 @@ -17,14 +17,15 @@ package org.jivesoftware.smackx.address.packet; -import org.jivesoftware.smack.packet.NamedElement; -import org.jivesoftware.smack.packet.ExtensionElement; -import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jxmpp.jid.Jid; - import java.util.ArrayList; import java.util.List; +import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.NamedElement; +import org.jivesoftware.smack.util.XmlStringBuilder; + +import org.jxmpp.jid.Jid; + /** * Stanza(/Packet) extension that contains the list of addresses that a stanza(/packet) should be sent or was sent. * diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java index 2fac45687..ae1a829db 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java @@ -21,8 +21,10 @@ import java.io.IOException; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.address.packet.MultipleAddresses; import org.jivesoftware.smackx.address.packet.MultipleAddresses.Type; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java index 6bf423655..369ea7ce9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java @@ -26,10 +26,12 @@ import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.commands.AdHocCommandManager; import org.jivesoftware.smackx.commands.RemoteCommand; import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smackx.xdata.FormField; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.util.JidUtil; 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 2b81b6b5b..84d15860c 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 @@ -20,6 +20,7 @@ import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.amp.packet.AMPExtension; public class AMPDeliverCondition implements AMPExtension.Condition { 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 fafea778f..8779c2820 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 @@ -16,14 +16,16 @@ */ package org.jivesoftware.smackx.amp; +import java.util.Date; + import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; -import org.jxmpp.util.XmppDateTime; + import org.jivesoftware.smackx.amp.packet.AMPExtension; -import java.util.Date; +import org.jxmpp.util.XmppDateTime; public class AMPExpireAtCondition implements AMPExtension.Condition { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java index 8800268c8..bdeb456ae 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java @@ -16,12 +16,13 @@ */ package org.jivesoftware.smackx.amp; +import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.amp.packet.AMPExtension; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; 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 9df5aaa11..0445359f3 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 @@ -20,6 +20,7 @@ import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.amp.packet.AMPExtension; public class AMPMatchResourceCondition implements AMPExtension.Condition { 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 f6feabb59..6d842e04f 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 @@ -21,6 +21,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.jivesoftware.smack.packet.ExtensionElement; + import org.jivesoftware.smackx.amp.AMPDeliverCondition; import org.jivesoftware.smackx.amp.AMPExpireAtCondition; import org.jivesoftware.smackx.amp.AMPMatchResourceCondition; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java index 3fd2e4c88..e93c718c7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java @@ -20,10 +20,12 @@ import java.io.IOException; import java.util.logging.Logger; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.amp.AMPDeliverCondition; import org.jivesoftware.smackx.amp.AMPExpireAtCondition; import org.jivesoftware.smackx.amp.AMPMatchResourceCondition; import org.jivesoftware.smackx.amp.packet.AMPExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java index 18869392a..deb3a506a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.attention.packet; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.xmlpull.v1.XmlPullParser; /** 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 c67b82692..4be9dce33 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 @@ -36,10 +36,12 @@ import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; + import org.jivesoftware.smackx.blocking.element.BlockContactsIQ; import org.jivesoftware.smackx.blocking.element.BlockListIQ; import org.jivesoftware.smackx.blocking.element.UnblockContactsIQ; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockContactsIQ.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockContactsIQ.java index 7a137668a..ad4b363b0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockContactsIQ.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockContactsIQ.java @@ -20,7 +20,9 @@ import java.util.Collections; import java.util.List; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.blocking.BlockingCommandManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockListIQ.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockListIQ.java index 60267d3fb..34e5bccf2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockListIQ.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockListIQ.java @@ -21,7 +21,9 @@ import java.util.Collections; import java.util.List; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.blocking.BlockingCommandManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java index da9e8eba8..0e04e7f03 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java @@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.blocking.BlockingCommandManager; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/UnblockContactsIQ.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/UnblockContactsIQ.java index 73d36ff9e..ede8c9347 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/UnblockContactsIQ.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/UnblockContactsIQ.java @@ -20,7 +20,9 @@ import java.util.Collections; import java.util.List; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.blocking.BlockingCommandManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java index 5e443c4c7..61db7032b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java @@ -21,7 +21,9 @@ import java.util.List; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.blocking.element.BlockContactsIQ; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java index 520c22b52..f938d5c4e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java @@ -22,7 +22,9 @@ import java.util.List; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.blocking.element.BlockListIQ; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java index 5e7e39249..997bdb1d9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.blocking.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.blocking.element.BlockedErrorExtension; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java index 976236f13..df70037bf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java @@ -20,7 +20,9 @@ import java.util.ArrayList; import java.util.List; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.blocking.element.UnblockContactsIQ; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java index 74336ccf3..0c853a864 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java @@ -35,8 +35,10 @@ import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.SHA1; + import org.jivesoftware.smackx.bob.element.BoBIQ; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; + import org.jxmpp.jid.Jid; import org.jxmpp.util.cache.LruCache; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java index f10ed5489..d69296575 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.bob.element; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.bob.BoBHash; import org.jivesoftware.smackx.xhtmlim.XHTMLText; import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBIQ.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBIQ.java index c93e91b60..ce0ff8f2e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBIQ.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBIQ.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.bob.element; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bob.BoBData; import org.jivesoftware.smackx.bob.BoBHash; import org.jivesoftware.smackx.bob.BoBManager; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java index 699403c62..49ee017c1 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java @@ -18,9 +18,11 @@ package org.jivesoftware.smackx.bob.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.bob.BoBData; import org.jivesoftware.smackx.bob.BoBHash; import org.jivesoftware.smackx.bob.element.BoBIQ; + import org.xmlpull.v1.XmlPullParser; /** 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 dfbe62491..6346683c6 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 @@ -27,7 +27,9 @@ import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.iqprivate.PrivateDataManager; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.parts.Resourcepart; 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 c91db023b..f046be1b7 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 @@ -16,19 +16,21 @@ */ package org.jivesoftware.smackx.bookmarks; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.parts.Resourcepart; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - /** * Bookmarks is used for storing and retrieving URLS and Conference rooms. * Bookmark Storage (XEP-0048) defined a protocol for the storage of bookmarks to conference rooms and other entities diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java index cdd0adc85..08318c6b2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java @@ -20,8 +20,10 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPException; + import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; + import org.jxmpp.jid.Jid; /** 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 757141540..3edada382 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 @@ -20,8 +20,10 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java index 43a545578..b61aae330 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java index 6a4bcadc5..d266bcfd4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; 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 2a2b5d0c3..5e7f99d45 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 @@ -36,10 +36,12 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; + import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamManager; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.filetransfer.FileTransferManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java index e9b846326..bbc703121 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bytestreams.BytestreamRequest; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; + import org.jxmpp.jid.Jid; /** 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 b87443887..8b06f541f 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 @@ -25,8 +25,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.StanzaListener; +import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.filter.AndFilter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.filter.StanzaTypeFilter; @@ -35,11 +35,13 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.stringencoder.Base64; + import org.jivesoftware.smackx.bytestreams.BytestreamSession; import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java index 1a4f3686d..5a8c1121c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java @@ -25,6 +25,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.filetransfer.StreamNegotiator; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java index a334a89c6..11043dd3c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.bytestreams.ibb.packet; import java.util.Locale; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java index 24de1609e..a42233294 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.bytestreams.ibb.provider; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; + import org.xmlpull.v1.XmlPullParser; /** 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 bc8b947af..124652b4e 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 @@ -20,6 +20,7 @@ import java.io.IOException; import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; 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 f3053ce1c..1b68bd70c 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 @@ -20,8 +20,10 @@ import java.io.IOException; import java.util.Locale; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java index 60309be81..3b8de3941 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java @@ -25,6 +25,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.filetransfer.StreamNegotiator; 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 e4eeb8f63..38c0a6261 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 @@ -30,19 +30,20 @@ import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeoutException; +import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.FeatureNotSupportedException; +import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.XMPPError; + import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; @@ -53,6 +54,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item; import org.jivesoftware.smackx.filetransfer.FileTransferManager; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java index 84fb63a4a..3182bbda3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java @@ -27,9 +27,11 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; + import org.jivesoftware.smackx.bytestreams.BytestreamRequest; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost; + import org.jxmpp.jid.Jid; import org.jxmpp.util.cache.Cache; import org.jxmpp.util.cache.ExpirationCache; 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 91e2dbe31..1c7b43670 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 @@ -36,6 +36,7 @@ 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; /** 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 bb02f486a..53d744776 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 @@ -28,8 +28,10 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java index 26acd4be2..0053cf362 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.util.SHA1; + import org.jxmpp.jid.Jid; /** 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 70d333954..8b022d9fc 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 @@ -25,6 +25,7 @@ import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java index 84b8cd47d..a4569b0d8 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java @@ -20,8 +20,10 @@ import java.io.IOException; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.Mode; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; 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 319fc94e4..b28eb5ff4 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 @@ -16,42 +16,9 @@ */ package org.jivesoftware.smackx.caps; -import org.jivesoftware.smack.AbstractConnectionListener; -import org.jivesoftware.smack.SmackException.NoResponseException; -import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.StanzaListener; -import org.jivesoftware.smack.XMPPConnectionRegistry; -import org.jivesoftware.smack.XMPPException.XMPPErrorException; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.roster.AbstractPresenceEventListener; -import org.jivesoftware.smack.roster.Roster; -import org.jivesoftware.smack.packet.ExtensionElement; -import org.jivesoftware.smack.packet.Presence; -import org.jivesoftware.smack.filter.PresenceTypeFilter; -import org.jivesoftware.smack.filter.StanzaFilter; -import org.jivesoftware.smack.filter.AndFilter; -import org.jivesoftware.smack.filter.StanzaTypeFilter; -import org.jivesoftware.smack.filter.StanzaExtensionFilter; -import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smack.util.stringencoder.Base64; -import org.jivesoftware.smackx.caps.cache.EntityCapsPersistentCache; -import org.jivesoftware.smackx.caps.packet.CapsExtension; -import org.jivesoftware.smackx.disco.AbstractNodeInformationProvider; -import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Feature; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.xdata.FormField; -import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.DomainBareJid; -import org.jxmpp.jid.FullJid; -import org.jxmpp.jid.Jid; -import org.jxmpp.util.cache.LruCache; - +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.Comparator; import java.util.HashMap; import java.util.LinkedList; @@ -65,9 +32,44 @@ import java.util.WeakHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.logging.Level; import java.util.logging.Logger; -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; + +import org.jivesoftware.smack.AbstractConnectionListener; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPConnectionRegistry; +import org.jivesoftware.smack.XMPPException.XMPPErrorException; +import org.jivesoftware.smack.filter.AndFilter; +import org.jivesoftware.smack.filter.PresenceTypeFilter; +import org.jivesoftware.smack.filter.StanzaExtensionFilter; +import org.jivesoftware.smack.filter.StanzaFilter; +import org.jivesoftware.smack.filter.StanzaTypeFilter; +import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.roster.AbstractPresenceEventListener; +import org.jivesoftware.smack.roster.Roster; +import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smack.util.stringencoder.Base64; + +import org.jivesoftware.smackx.caps.cache.EntityCapsPersistentCache; +import org.jivesoftware.smackx.caps.packet.CapsExtension; +import org.jivesoftware.smackx.disco.AbstractNodeInformationProvider; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Feature; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; + +import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.FullJid; +import org.jxmpp.jid.Jid; +import org.jxmpp.util.cache.LruCache; /** * Keeps track of entity capabilities. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java index 5078dcc3e..4c555dae5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java @@ -28,6 +28,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smack.util.stringencoder.Base32; import org.jivesoftware.smack.util.stringencoder.StringEncoder; + import org.jivesoftware.smackx.disco.packet.DiscoverInfo; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java index b23b6de6e..8beec44b7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java @@ -16,8 +16,8 @@ */ package org.jivesoftware.smackx.caps.packet; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.XmlStringBuilder; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java index 55f4f616c..8aa027514 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java @@ -20,8 +20,10 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.caps.EntityCapsManager; import org.jivesoftware.smackx.caps.packet.CapsExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java index e013362ce..346911f40 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java @@ -20,17 +20,18 @@ package org.jivesoftware.smackx.chatstates; import java.util.Map; import java.util.WeakHashMap; +import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.MessageListener; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.chat.ChatManagerListener; import org.jivesoftware.smack.chat.ChatMessageListener; import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.StanzaFilter; -import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.chatstates.packet.ChatStateExtension; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java index ab0f0c772..ca8233bde 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java @@ -17,10 +17,11 @@ package org.jivesoftware.smackx.chatstates.packet; -import org.jivesoftware.smackx.chatstates.ChatState; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; +import org.jivesoftware.smackx.chatstates.ChatState; + /** * Represents a chat state which is an extension to message packets which is used to indicate * the current status of a chat participant. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java index 03506dbaa..7798a6c55 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java @@ -17,8 +17,10 @@ package org.jivesoftware.smackx.chatstates.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.chatstates.ChatState; import org.jivesoftware.smackx.chatstates.packet.ChatStateExtension; + import org.xmlpull.v1.XmlPullParser; public class ChatStateExtensionProvider extends ExtensionElementProvider { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java index 46c819ff6..f4d132ffe 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java @@ -16,15 +16,17 @@ */ package org.jivesoftware.smackx.commands; +import java.util.List; + import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.XMPPError; + import org.jivesoftware.smackx.commands.packet.AdHocCommandData; import org.jivesoftware.smackx.xdata.Form; -import org.jxmpp.jid.Jid; -import java.util.List; +import org.jxmpp.jid.Jid; /** * An ad-hoc command is responsible for executing the provided service and diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java index 8ddc1167d..80f6a2a02 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java @@ -41,6 +41,7 @@ import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.commands.AdHocCommand.Action; import org.jivesoftware.smackx.commands.AdHocCommand.Status; import org.jivesoftware.smackx.commands.packet.AdHocCommandData; @@ -49,6 +50,7 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.xdata.Form; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java index 7d0e86d5e..984623133 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.commands; import org.jivesoftware.smackx.commands.packet.AdHocCommandData; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java index 34a03ee6d..53494a99c 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java @@ -21,8 +21,10 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.commands.packet.AdHocCommandData; import org.jivesoftware.smackx.xdata.Form; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java index 80cd688ce..da2d59492 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java @@ -17,17 +17,19 @@ package org.jivesoftware.smackx.commands.packet; -import org.jivesoftware.smack.packet.IQ; +import java.util.ArrayList; +import java.util.List; + import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; + import org.jivesoftware.smackx.commands.AdHocCommand; import org.jivesoftware.smackx.commands.AdHocCommand.Action; import org.jivesoftware.smackx.commands.AdHocCommand.SpecificErrorCondition; import org.jivesoftware.smackx.commands.AdHocCommandNote; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.Jid; -import java.util.ArrayList; -import java.util.List; +import org.jxmpp.jid.Jid; /** * Represents the state and the request of the execution of an adhoc command. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java index 72b5389d3..050d31829 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java @@ -18,14 +18,16 @@ package org.jivesoftware.smackx.commands.provider; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.ExtensionElementProvider; +import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.commands.AdHocCommand; import org.jivesoftware.smackx.commands.AdHocCommand.Action; -import org.jivesoftware.smackx.commands.packet.AdHocCommandData; import org.jivesoftware.smackx.commands.AdHocCommandNote; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; import org.jivesoftware.smackx.xdata.provider.DataFormProvider; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/DelayInformationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/DelayInformationManager.java index 7da2f9270..220d3bbae 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/DelayInformationManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/DelayInformationManager.java @@ -18,8 +18,9 @@ package org.jivesoftware.smackx.delay; import java.util.Date; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.delay.packet.DelayInformation; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/filter/DelayedStanzaFilter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/filter/DelayedStanzaFilter.java index 2d17bda38..054ed42cf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/filter/DelayedStanzaFilter.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/filter/DelayedStanzaFilter.java @@ -19,6 +19,7 @@ package org.jivesoftware.smackx.delay.filter; import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.delay.DelayInformationManager; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java index 3133676bb..7b17b8c2c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java @@ -18,9 +18,10 @@ package org.jivesoftware.smackx.delay.packet; import java.util.Date; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.util.XmppDateTime; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java index 812a790d8..7f11c2657 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java @@ -22,7 +22,9 @@ import java.util.Date; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.delay.packet.DelayInformation; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/AbstractNodeInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/AbstractNodeInformationProvider.java index 6d64bc848..79b96a11b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/AbstractNodeInformationProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/AbstractNodeInformationProvider.java @@ -16,12 +16,13 @@ */ package org.jivesoftware.smackx.disco; +import java.util.List; + import org.jivesoftware.smack.packet.ExtensionElement; + import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverItems; -import java.util.List; - public abstract class AbstractNodeInformationProvider implements NodeInformationProvider { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java index 81fff9b47..207221ed3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java @@ -17,12 +17,13 @@ package org.jivesoftware.smackx.disco; +import java.util.List; + import org.jivesoftware.smack.packet.ExtensionElement; + import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverItems; -import java.util.List; - /** * The NodeInformationProvider is responsible for providing supported indentities, features diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java index 70a8286d9..f67f16a5c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java @@ -16,30 +16,6 @@ */ package org.jivesoftware.smackx.disco; -import org.jivesoftware.smack.SmackException.NoResponseException; -import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.XMPPConnectionRegistry; -import org.jivesoftware.smack.XMPPException.XMPPErrorException; -import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; -import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.ExtensionElement; -import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smack.util.Objects; -import org.jivesoftware.smackx.caps.EntityCapsManager; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo; -import org.jivesoftware.smackx.disco.packet.DiscoverItems; -import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.DomainBareJid; -import org.jxmpp.jid.Jid; -import org.jxmpp.util.cache.Cache; -import org.jxmpp.util.cache.ExpirationCache; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -54,6 +30,32 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPConnectionRegistry; +import org.jivesoftware.smack.XMPPException.XMPPErrorException; +import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; +import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; +import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.packet.XMPPError; +import org.jivesoftware.smack.util.Objects; + +import org.jivesoftware.smackx.caps.EntityCapsManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.xdata.packet.DataForm; + +import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.Jid; +import org.jxmpp.util.cache.Cache; +import org.jxmpp.util.cache.ExpirationCache; + /** * Manages discovery of services in XMPP entities. This class provides: *

    diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java index 93e19cbc5..8d07bd37f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java @@ -16,12 +16,6 @@ */ package org.jivesoftware.smackx.disco.packet; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smack.util.TypedCloneable; -import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jxmpp.util.XmppStringUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -30,6 +24,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smack.util.TypedCloneable; +import org.jivesoftware.smack.util.XmlStringBuilder; + +import org.jxmpp.util.XmppStringUtils; + /** * A DiscoverInfo IQ packet, which is used by XMPP clients to request and receive information * to/from other XMPP entities.

    diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java index a61aefddf..09f8f0b60 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java @@ -16,15 +16,16 @@ */ package org.jivesoftware.smackx.disco.packet; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jxmpp.jid.Jid; - import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.util.XmlStringBuilder; + +import org.jxmpp.jid.Jid; + /** * A DiscoverItems IQ packet, which is used by XMPP clients to request and receive items * associated with XMPP entities.

    diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java index 2a08d8cfc..85383e52b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.disco.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.disco.packet.DiscoverInfo; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java index 18ddf97a8..5e0031994 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java @@ -21,7 +21,9 @@ import java.io.IOException; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.disco.packet.DiscoverItems; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java index 125b2671a..2225788d1 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java @@ -25,9 +25,11 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.si.packet.StreamInitiation; + import org.jxmpp.jid.Jid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java index 78f397758..2c35d3f40 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java @@ -16,6 +16,11 @@ */ package org.jivesoftware.smackx.filetransfer; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; @@ -23,13 +28,10 @@ import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smackx.si.packet.StreamInitiation; -import org.jxmpp.jid.EntityFullJid; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.concurrent.CopyOnWriteArrayList; +import org.jivesoftware.smackx.si.packet.StreamInitiation; + +import org.jxmpp.jid.EntityFullJid; /** * The file transfer manager class handles the sending and recieving of files. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java index 63db8c996..4cbd8737a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java @@ -34,6 +34,7 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.XMPPError; + import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; @@ -42,6 +43,7 @@ import org.jivesoftware.smackx.filetransfer.FileTransferException.NoStreamMethod import org.jivesoftware.smackx.si.packet.StreamInitiation; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java index 61e4e3934..bed6804a1 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.filetransfer; import org.jivesoftware.smack.SmackException.NotConnectedException; + import org.jivesoftware.smackx.si.packet.StreamInitiation; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java index 17c46f515..3eaefe48c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java @@ -24,12 +24,14 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession; import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.si.packet.StreamInitiation; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java index 29422b5cb..6756a185b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java @@ -30,6 +30,7 @@ import org.jivesoftware.smack.SmackException.IllegalStateChangeException; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.XMPPError; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java index 828c1b366..79296a3af 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java @@ -27,11 +27,13 @@ import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.si.packet.StreamInitiation; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java index da43866c9..f3e537167 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java @@ -16,6 +16,9 @@ */ package org.jivesoftware.smackx.filetransfer; +import java.io.InputStream; +import java.io.OutputStream; + import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NoResponseException; @@ -27,13 +30,12 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.EventManger; import org.jivesoftware.smack.util.EventManger.Callback; + import org.jivesoftware.smackx.si.packet.StreamInitiation; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.Jid; -import java.io.InputStream; -import java.io.OutputStream; +import org.jxmpp.jid.Jid; /** * After the file transfer negotiation process is completed according to diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java index 3a33bafe8..c12f1edcf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java @@ -16,9 +16,10 @@ */ package org.jivesoftware.smackx.forward.packet; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.delay.packet.DelayInformation; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java index 03a59a93f..91c7c9b5e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java @@ -23,9 +23,11 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.jivesoftware.smackx.delay.provider.DelayInformationProvider; import org.jivesoftware.smackx.forward.packet.Forwarded; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java index 89021126c..2bdaef117 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java @@ -25,7 +25,9 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.geoloc.packet.GeoLocation; + import org.jxmpp.jid.Jid; public final class GeoLocationManager extends Manager { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java index 88215b363..a49c0e471 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java @@ -22,7 +22,9 @@ import java.text.ParseException; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.geoloc.packet.GeoLocation; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java index 0d9a11cfb..5ca15a378 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java @@ -20,12 +20,12 @@ package org.jivesoftware.smackx.iqlast; import java.util.Map; import java.util.WeakHashMap; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.StanzaListener; -import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.StanzaTypeFilter; @@ -34,11 +34,13 @@ import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.XMPPError.Condition; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.iqlast.packet.LastActivity; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java index 43e9de00e..7c404f3a4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java @@ -22,6 +22,7 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; + import org.jxmpp.jid.Jid; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java index 79c5c3839..0954b01cb 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java @@ -17,6 +17,11 @@ package org.jivesoftware.smackx.iqprivate; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Map; +import java.util.WeakHashMap; + import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NoResponseException; @@ -26,19 +31,16 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError.Condition; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData; import org.jivesoftware.smackx.iqprivate.packet.PrivateData; import org.jivesoftware.smackx.iqprivate.packet.PrivateDataIQ; import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; + import org.jxmpp.util.XmppStringUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Map; -import java.util.WeakHashMap; - /** * Manages private data, which is a mechanism to allow users to store arbitrary XML * data on an XMPP server. Each private data chunk is defined by a element name and diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java index 5e69e2201..c91457cde 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java @@ -19,10 +19,12 @@ package org.jivesoftware.smackx.iqprivate.provider; import java.io.IOException; +import org.jivesoftware.smack.SmackException; + +import org.jivesoftware.smackx.iqprivate.packet.PrivateData; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smackx.iqprivate.packet.PrivateData; /** * An interface for parsing custom private data. Each PrivateDataProvider must diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java index b10df9a81..259eecd1b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java @@ -24,19 +24,21 @@ import java.util.Set; import java.util.WeakHashMap; import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaCollector; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.StanzaIdFilter; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.iqregister.packet.Registration; + import org.jxmpp.jid.parts.Localpart; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java index 73baa79f4..10fff3c57 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java @@ -19,8 +19,8 @@ package org.jivesoftware.smackx.iqregister.packet; import java.util.Map; -import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; /** * Represents registration packets. An empty GET query will cause the server to return information diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java index f4063c5a8..578a7eb24 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java @@ -21,11 +21,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.iqregister.packet.Registration; + import org.xmlpull.v1.XmlPullParser; public class RegistrationProvider extends IQProvider { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java index c4b19f8e3..42cea1906 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.iqregister.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.iqregister.packet.Registration; + import org.xmlpull.v1.XmlPullParser; public class RegistrationStreamFeatureProvider extends ExtensionElementProvider { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java index a6797315a..57c8de381 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java @@ -20,20 +20,22 @@ package org.jivesoftware.smackx.iqversion; import java.util.Map; import java.util.WeakHashMap; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; -import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError.Condition; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.iqversion.packet.Version; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java index c257a758a..289064cff 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java @@ -17,10 +17,10 @@ package org.jivesoftware.smackx.iqversion.packet; - import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java index 52b550cce..36cd25925 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java @@ -21,7 +21,9 @@ import java.io.IOException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.iqversion.packet.Version; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java index e040e59b6..8282af33a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java @@ -27,9 +27,11 @@ import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; + import org.jivesoftware.smackx.jingle.element.Jingle; import org.jivesoftware.smackx.jingle.element.JingleContent; import org.jivesoftware.smackx.jingle.element.JingleContentDescription; + import org.jxmpp.jid.FullJid; import org.jxmpp.jid.Jid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java index 1738901d8..8e8b2f580 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/Jingle.java @@ -24,6 +24,7 @@ import java.util.List; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; + import org.jxmpp.jid.FullJid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java index ac69e7783..2b5f9c771 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.jingle.element.JingleContentDescription; + import org.xmlpull.v1.XmlPullParser; public abstract class JingleContentDescriptionProvider diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java index e9e1774f5..20c987f62 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.jingle.element.JingleContentTransport; + import org.xmlpull.v1.XmlPullParser; public abstract class JingleContentTransportProvider diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java index 12be5370d..14144ae0d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.jingle.element.JingleError; + import org.xmlpull.v1.XmlPullParser; public class JingleErrorProvider extends ExtensionElementProvider { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java index f00ebfc0b..374f05b3c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.jingle.element.Jingle; import org.jivesoftware.smackx.jingle.element.JingleAction; import org.jivesoftware.smackx.jingle.element.JingleContent; @@ -27,6 +28,7 @@ import org.jivesoftware.smackx.jingle.element.JingleContentDescription; import org.jivesoftware.smackx.jingle.element.JingleContentTransport; import org.jivesoftware.smackx.jingle.element.JingleReason; import org.jivesoftware.smackx.jingle.element.JingleReason.Reason; + import org.jxmpp.jid.FullJid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java index 89b9fef00..59afc8d58 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingle.transports.jingle_ibb.element; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.jingle.element.JingleContentTransport; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java index e4b2121e6..73b027748 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingle.transports.jingle_ibb.provider; import org.jivesoftware.smackx.jingle.provider.JingleContentTransportProvider; import org.jivesoftware.smackx.jingle.transports.jingle_ibb.element.JingleIBBTransport; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java index c26d84ef6..63123db1c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.Map; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension; public class JivePropertiesManager { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java index 00ee4ab73..822a74f0e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java @@ -26,8 +26,10 @@ import java.util.logging.Logger; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.stringencoder.Base64; + import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager; import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java index c0df1739c..87d0af8ed 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java @@ -20,7 +20,9 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.jivesoftware.smackx.message_correct.element.MessageCorrectExtension; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java index 1a41c59e5..3e3648f26 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.muc; import org.jivesoftware.smackx.muc.packet.MUCItem; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java index 3f97eed23..6c52e4c7a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java @@ -17,7 +17,9 @@ package org.jivesoftware.smackx.muc; import org.jivesoftware.smack.util.Objects; + import org.jivesoftware.smackx.disco.packet.DiscoverItems; + import org.jxmpp.jid.EntityBareJid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java index 8b1ead939..fb380d7d3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.muc; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.muc.packet.MUCUser; + import org.jxmpp.jid.EntityJid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java index 622b3f201..2c6e95619 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.muc; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.muc.packet.MUCUser; + import org.jxmpp.jid.EntityBareJid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucConfigFormManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucConfigFormManager.java index 1688cacb5..26c1c4efa 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucConfigFormManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucConfigFormManager.java @@ -24,9 +24,11 @@ import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.muc.MultiUserChatException.MucConfigurationNotSupportedException; import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smackx.xdata.FormField; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.util.JidUtil; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java index a08604a4f..a430bd1e0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java @@ -20,7 +20,9 @@ import java.util.Date; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.util.Objects; + import org.jivesoftware.smackx.muc.packet.MUCInitialPresence; + import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java index fb1c89c51..11ff6ac83 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -28,12 +28,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.MessageListener; -import org.jivesoftware.smack.StanzaCollector; -import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.PresenceListener; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaCollector; +import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; @@ -47,22 +47,23 @@ import org.jivesoftware.smack.filter.MessageWithThreadFilter; import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.OrFilter; import org.jivesoftware.smack.filter.PresenceTypeFilter; +import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.filter.StanzaIdFilter; -import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.StanzaTypeFilter; import org.jivesoftware.smack.filter.ToMatchesFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.Presence; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.iqregister.packet.Registration; +import org.jivesoftware.smackx.muc.MultiUserChatException.MissingMucCreationAcknowledgeException; import org.jivesoftware.smackx.muc.MultiUserChatException.MucAlreadyJoinedException; import org.jivesoftware.smackx.muc.MultiUserChatException.MucNotJoinedException; -import org.jivesoftware.smackx.muc.MultiUserChatException.MissingMucCreationAcknowledgeException; import org.jivesoftware.smackx.muc.MultiUserChatException.NotAMucServiceException; import org.jivesoftware.smackx.muc.filter.MUCUserStatusCodeFilter; import org.jivesoftware.smackx.muc.packet.Destroy; @@ -75,11 +76,12 @@ import org.jivesoftware.smackx.muc.packet.MUCUser.Status; import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; -import org.jxmpp.jid.EntityBareJid; + import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; -import org.jxmpp.jid.Jid; import org.jxmpp.jid.EntityJid; +import org.jxmpp.jid.Jid; import org.jxmpp.jid.impl.JidCreate; import org.jxmpp.jid.parts.Resourcepart; import org.jxmpp.util.cache.ExpirationCache; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatException.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatException.java index dbf9c277f..46c990845 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatException.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatException.java @@ -17,6 +17,7 @@ package org.jivesoftware.smackx.muc; import org.jivesoftware.smack.SmackException; + import org.jxmpp.jid.DomainBareJid; public abstract class MultiUserChatException extends SmackException { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java index 8a8b5e069..79905541f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java @@ -32,21 +32,22 @@ import java.util.logging.Logger; import org.jivesoftware.smack.AbstractConnectionListener; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.Manager; +import org.jivesoftware.smack.SmackException.NoResponseException; +import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; -import org.jivesoftware.smack.SmackException.NoResponseException; -import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.AndFilter; import org.jivesoftware.smack.filter.MessageTypeFilter; +import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.StanzaFilter; -import org.jivesoftware.smack.filter.NotFilter; import org.jivesoftware.smack.filter.StanzaTypeFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.Async; + import org.jivesoftware.smackx.disco.AbstractNodeInformationProvider; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; @@ -54,11 +55,12 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.muc.MultiUserChatException.NotAMucServiceException; import org.jivesoftware.smackx.muc.packet.MUCInitialPresence; import org.jivesoftware.smackx.muc.packet.MUCUser; -import org.jxmpp.jid.EntityBareJid; + import org.jxmpp.jid.DomainBareJid; +import org.jxmpp.jid.EntityBareJid; +import org.jxmpp.jid.EntityJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; -import org.jxmpp.jid.EntityJid; /** * A manager for Multi-User Chat rooms. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java index ec4c8ce15..8fb3ae151 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java @@ -19,9 +19,11 @@ package org.jivesoftware.smackx.muc; import java.util.logging.Logger; +import org.jivesoftware.smack.packet.Presence; + import org.jivesoftware.smackx.muc.packet.MUCItem; import org.jivesoftware.smackx.muc.packet.MUCUser; -import org.jivesoftware.smack.packet.Presence; + import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java index ed13e5c5d..8f73c8028 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java @@ -26,6 +26,7 @@ import java.util.logging.Logger; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smackx.xdata.FormField; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/bookmarkautojoin/MucBookmarkAutojoinManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/bookmarkautojoin/MucBookmarkAutojoinManager.java index d2f6a476c..fa4abeb09 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/bookmarkautojoin/MucBookmarkAutojoinManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/bookmarkautojoin/MucBookmarkAutojoinManager.java @@ -30,12 +30,14 @@ import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; + import org.jivesoftware.smackx.bookmarks.BookmarkManager; import org.jivesoftware.smackx.bookmarks.BookmarkedConference; import org.jivesoftware.smackx.muc.MultiUserChat; import org.jivesoftware.smackx.muc.MultiUserChat.MucCreateConfigFormHandle; import org.jivesoftware.smackx.muc.MultiUserChatException.NotAMucServiceException; import org.jivesoftware.smackx.muc.MultiUserChatManager; + import org.jxmpp.jid.parts.Resourcepart; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/filter/MUCUserStatusCodeFilter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/filter/MUCUserStatusCodeFilter.java index ac6a2d50a..8cc064525 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/filter/MUCUserStatusCodeFilter.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/filter/MUCUserStatusCodeFilter.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.muc.filter; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.muc.packet.MUCUser; public class MUCUserStatusCodeFilter implements StanzaFilter { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java index 594fa4d5a..ef63eaf40 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java @@ -20,6 +20,7 @@ import java.io.Serializable; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.EntityBareJid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java index d445769cc..774482127 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java @@ -19,10 +19,11 @@ package org.jivesoftware.smackx.muc.packet; import java.io.IOException; -import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java index e6510987c..8eba16597 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java @@ -17,13 +17,14 @@ package org.jivesoftware.smackx.muc.packet; +import java.util.Date; + +import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jxmpp.util.XmppDateTime; -import java.util.Date; +import org.jxmpp.util.XmppDateTime; /** * Represents extended presence information whose sole purpose is to signal the ability of diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java index 05ef5aea9..662dc842c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java @@ -19,8 +19,10 @@ package org.jivesoftware.smackx.muc.packet; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jivesoftware.smackx.muc.MUCAffiliation; import org.jivesoftware.smackx.muc.MUCRole; + import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java index 721c0e01c..2a7dd19be 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.muc.packet; -import org.jivesoftware.smack.packet.IQ; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.jivesoftware.smack.packet.IQ; + /** * IQ stanza(/packet) that serves for granting and revoking ownership privileges, granting * and revoking administrative privileges and destroying a room. All these operations diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java index ac6b72bcc..61a5c0412 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java @@ -17,16 +17,16 @@ package org.jivesoftware.smackx.muc.packet; -import org.jivesoftware.smack.packet.NamedElement; -import org.jivesoftware.smack.packet.Stanza; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import org.jivesoftware.smack.packet.ExtensionElement; +import org.jivesoftware.smack.packet.NamedElement; +import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.XmlStringBuilder; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.EntityJid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java index 4aba2be68..a14576de1 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java @@ -20,7 +20,9 @@ package org.jivesoftware.smackx.muc.provider; import java.io.IOException; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.muc.packet.MUCAdmin; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java index d565dd582..92202054c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.muc.provider; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; + import org.jivesoftware.smackx.muc.packet.MUCOwner; + import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java index 67f4dd77d..4dff7f255 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java @@ -19,10 +19,12 @@ package org.jivesoftware.smackx.muc.provider; import java.io.IOException; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.muc.MUCAffiliation; import org.jivesoftware.smackx.muc.MUCRole; import org.jivesoftware.smackx.muc.packet.Destroy; import org.jivesoftware.smackx.muc.packet.MUCItem; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.Jid; import org.jxmpp.jid.parts.Resourcepart; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java index 787be13b6..4aa488d87 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java @@ -17,12 +17,13 @@ package org.jivesoftware.smackx.muc.provider; - import java.io.IOException; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; + import org.jivesoftware.smackx.muc.packet.MUCUser; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.EntityJid; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java index a88d54d5c..e9a33bd4d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java index e604e376d..57068a384 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.offline; import org.jivesoftware.smackx.disco.packet.DiscoverItems; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java index 6b83128a7..2529004f7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java @@ -17,9 +17,12 @@ package org.jivesoftware.smackx.offline; -import org.jivesoftware.smack.StanzaCollector; +import java.util.ArrayList; +import java.util.List; + import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.AndFilter; @@ -29,6 +32,7 @@ import org.jivesoftware.smack.filter.StanzaTypeFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.disco.packet.DiscoverItems; @@ -36,9 +40,6 @@ import org.jivesoftware.smackx.offline.packet.OfflineMessageInfo; import org.jivesoftware.smackx.offline.packet.OfflineMessageRequest; import org.jivesoftware.smackx.xdata.Form; -import java.util.ArrayList; -import java.util.List; - /** * The OfflineMessageManager helps manage offline messages even before the user has sent an * available presence. When a user asks for his offline messages before sending an available diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java index c121d8b60..f288c6ec3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java @@ -21,6 +21,7 @@ import java.io.IOException; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.provider.ExtensionElementProvider; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java index 13e6b04dc..96cbcb2be 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java @@ -17,16 +17,17 @@ package org.jivesoftware.smackx.offline.packet; -import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smack.provider.IQProvider; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.jivesoftware.smack.packet.IQ; +import org.jivesoftware.smack.provider.IQProvider; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + /** * Represents a request to get some or all the offline messages of a user. This class can also * be used for deleting some or all the offline messages of a user. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java index e43059b95..da183c0de 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java @@ -18,7 +18,9 @@ package org.jivesoftware.smackx.pep; import org.jivesoftware.smack.packet.Message; + import org.jivesoftware.smackx.pubsub.EventElement; + import org.jxmpp.jid.EntityBareJid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java index 2b3ee1b6e..ca5bb629d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java @@ -24,16 +24,17 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException.NoResponseException; -import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.SmackException.NotConnectedException; +import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.filter.AndFilter; import org.jivesoftware.smack.filter.StanzaFilter; -import org.jivesoftware.smack.filter.jidtype.FromJidTypeFilter; import org.jivesoftware.smack.filter.jidtype.AbstractJidTypeFilter.JidType; +import org.jivesoftware.smack.filter.jidtype.FromJidTypeFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Stanza; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.pubsub.EventElement; import org.jivesoftware.smackx.pubsub.Item; @@ -41,6 +42,7 @@ import org.jivesoftware.smackx.pubsub.LeafNode; import org.jivesoftware.smackx.pubsub.PubSubFeature; import org.jivesoftware.smackx.pubsub.PubSubManager; import org.jivesoftware.smackx.pubsub.filter.EventExtensionFilter; + import org.jxmpp.jid.BareJid; import org.jxmpp.jid.EntityBareJid; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java index fe329b9f7..79dca32bf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java @@ -28,6 +28,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.AbstractConnectionClosedListener; +import org.jivesoftware.smack.ConnectionCreationListener; +import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; @@ -35,19 +37,19 @@ import org.jivesoftware.smack.SmackException.NotLoggedInException; import org.jivesoftware.smack.SmackFuture; import org.jivesoftware.smack.SmackFuture.InternalSmackFuture; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnectionRegistry; import org.jivesoftware.smack.XMPPException.XMPPErrorException; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; -import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.Stanza; +import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.SmackExecutorThreadFactory; + import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.ping.packet.Ping; + import org.jxmpp.jid.Jid; /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java index 8727ad704..e59c73083 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java @@ -18,6 +18,7 @@ package org.jivesoftware.smackx.ping.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.SimpleIQ; + import org.jxmpp.jid.Jid; public class Ping extends SimpleIQ { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java index c1e46dfa9..bc91a4fbe 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java @@ -19,7 +19,9 @@ package org.jivesoftware.smackx.ping.provider; import java.io.IOException; import org.jivesoftware.smack.provider.IQProvider; + import org.jivesoftware.smackx.ping.packet.Ping; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java index cde98cdec..eee6de877 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java @@ -16,10 +16,10 @@ */ package org.jivesoftware.smackx.privacy; -import org.jivesoftware.smackx.privacy.packet.PrivacyItem; - import java.util.List; +import org.jivesoftware.smackx.privacy.packet.PrivacyItem; + /** * A privacy list represents a list of contacts that is a read only class used to represent a set of allowed or blocked communications. * Basically it can: