mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-09 09:09:38 +02:00
Fix minor codestyle issues
This commit is contained in:
Florian Schmaus
parent
200f90ffdc
commit
cb18056613
422 changed files with 1404 additions and 1444 deletions
|
|
@ -341,7 +341,7 @@ public abstract class ConnectionConfiguration {
|
|||
* An enumeration for TLS security modes that are available when making a connection
|
||||
* to the XMPP server.
|
||||
*/
|
||||
public static enum SecurityMode {
|
||||
public enum SecurityMode {
|
||||
|
||||
/**
|
||||
* Security via TLS encryption is required in order to connect. If the server
|
||||
|
|
@ -492,7 +492,7 @@ public abstract class ConnectionConfiguration {
|
|||
* <p>
|
||||
* This is an abstract class that uses the builder design pattern and the "getThis() trick" to recover the type of
|
||||
* the builder in a class hierarchies with a self-referential generic supertype. Otherwise chaining of build
|
||||
* instructions from the superclasses followed by build instructions of a sublcass would not be possible, because
|
||||
* instructions from the superclasses followed by build instructions of a subclass would not be possible, because
|
||||
* the superclass build instructions would return the builder of the superclass and not the one of the subclass. You
|
||||
* can read more about it a Angelika Langer's Generics FAQ, especially the entry <a
|
||||
* href="http://www.angelikalanger.com/GenericsFAQ/FAQSections/ProgrammingIdioms.html#FAQ206">What is the
|
||||
|
|
@ -646,7 +646,7 @@ public abstract class ConnectionConfiguration {
|
|||
public B setPort(int port) {
|
||||
if (port < 0 || port > 65535) {
|
||||
throw new IllegalArgumentException(
|
||||
"Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
|
||||
"Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
|
||||
}
|
||||
this.port = port;
|
||||
return getThis();
|
||||
|
|
@ -930,7 +930,7 @@ public abstract class ConnectionConfiguration {
|
|||
Set<String> blacklistedMechanisms = SASLAuthentication.getBlacklistedSASLMechanisms();
|
||||
for (String mechanism : saslMechanisms) {
|
||||
if (!SASLAuthentication.isSaslMechanismRegistered(mechanism)) {
|
||||
throw new IllegalArgumentException("SASL " + mechanism + " is not avaiable. Consider registering it with Smack");
|
||||
throw new IllegalArgumentException("SASL " + mechanism + " is not available. Consider registering it with Smack");
|
||||
}
|
||||
if (blacklistedMechanisms.contains(mechanism)) {
|
||||
throw new IllegalArgumentException("SALS " + mechanism + " is blacklisted.");
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ public interface ConnectionCreationListener {
|
|||
*
|
||||
* @param connection the newly created connection.
|
||||
*/
|
||||
public void connectionCreated(XMPPConnection connection);
|
||||
void connectionCreated(XMPPConnection connection);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public interface ConnectionListener {
|
|||
*
|
||||
* @param connection the XMPPConnection which successfully connected to its endpoint.
|
||||
*/
|
||||
public void connected(XMPPConnection connection);
|
||||
void connected(XMPPConnection connection);
|
||||
|
||||
/**
|
||||
* Notification that the connection has been authenticated.
|
||||
|
|
@ -45,12 +45,12 @@ public interface ConnectionListener {
|
|||
* @param connection the XMPPConnection which successfully authenticated.
|
||||
* @param resumed true if a previous XMPP session's stream was resumed.
|
||||
*/
|
||||
public void authenticated(XMPPConnection connection, boolean resumed);
|
||||
void authenticated(XMPPConnection connection, boolean resumed);
|
||||
|
||||
/**
|
||||
* Notification that the connection was closed normally.
|
||||
*/
|
||||
public void connectionClosed();
|
||||
void connectionClosed();
|
||||
|
||||
/**
|
||||
* Notification that the connection was closed due to an exception. When
|
||||
|
|
@ -59,7 +59,7 @@ public interface ConnectionListener {
|
|||
*
|
||||
* @param e the exception.
|
||||
*/
|
||||
public void connectionClosedOnError(Exception e);
|
||||
void connectionClosedOnError(Exception e);
|
||||
|
||||
/**
|
||||
* The connection has reconnected successfully to the server. Connections will
|
||||
|
|
@ -68,7 +68,7 @@ public interface ConnectionListener {
|
|||
*/
|
||||
// TODO: Remove in Smack 4.3
|
||||
@Deprecated
|
||||
public void reconnectionSuccessful();
|
||||
void reconnectionSuccessful();
|
||||
|
||||
// The next two methods *must* only be invoked by ReconnectionManager
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ public interface ConnectionListener {
|
|||
*/
|
||||
// TODO: Remove in Smack 4.3
|
||||
@Deprecated
|
||||
public void reconnectingIn(int seconds);
|
||||
void reconnectingIn(int seconds);
|
||||
|
||||
/**
|
||||
* An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
|
||||
|
|
@ -97,5 +97,5 @@ public interface ConnectionListener {
|
|||
*/
|
||||
// TODO: Remove in Smack 4.3
|
||||
@Deprecated
|
||||
public void reconnectionFailed(Exception e);
|
||||
void reconnectionFailed(Exception e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ package org.jivesoftware.smack;
|
|||
|
||||
public interface ExceptionCallback {
|
||||
|
||||
public void processException(Exception exception);
|
||||
void processException(Exception exception);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public abstract class Manager {
|
|||
public Manager(XMPPConnection connection) {
|
||||
Objects.requireNonNull(connection, "XMPPConnection must not be null");
|
||||
|
||||
weakConnection = new WeakReference<XMPPConnection>(connection);
|
||||
weakConnection = new WeakReference<>(connection);
|
||||
}
|
||||
|
||||
protected final XMPPConnection connection() {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public interface ReconnectionListener {
|
|||
*
|
||||
* @param seconds remaining seconds before attempting a reconnection.
|
||||
*/
|
||||
public void reconnectingIn(int seconds);
|
||||
void reconnectingIn(int seconds);
|
||||
|
||||
/**
|
||||
* An attempt to connect to the server has failed. The connection will keep trying reconnecting to the server in a
|
||||
|
|
@ -46,5 +46,5 @@ public interface ReconnectionListener {
|
|||
*
|
||||
* @param e the exception that caused the reconnection to fail.
|
||||
*/
|
||||
public void reconnectionFailed(Exception e);
|
||||
void reconnectionFailed(Exception e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ public final class ReconnectionManager {
|
|||
private Thread reconnectionThread;
|
||||
|
||||
private ReconnectionManager(AbstractXMPPConnection connection) {
|
||||
weakRefConnection = new WeakReference<AbstractXMPPConnection>(connection);
|
||||
weakRefConnection = new WeakReference<>(connection);
|
||||
|
||||
reconnectionRunnable = new Runnable() {
|
||||
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ public final class SASLAuthentication {
|
|||
|
||||
private static final Logger LOGGER = Logger.getLogger(SASLAuthentication.class.getName());
|
||||
|
||||
private static final List<SASLMechanism> REGISTERED_MECHANISMS = new ArrayList<SASLMechanism>();
|
||||
private static final List<SASLMechanism> REGISTERED_MECHANISMS = new ArrayList<>();
|
||||
|
||||
private static final Set<String> BLACKLISTED_MECHANISMS = new HashSet<String>();
|
||||
private static final Set<String> BLACKLISTED_MECHANISMS = new HashSet<>();
|
||||
|
||||
static {
|
||||
// Blacklist SCRAM-SHA-1-PLUS for now.
|
||||
|
|
@ -91,7 +91,7 @@ public final class SASLAuthentication {
|
|||
* @return the registered SASLMechanism sorted by the level of preference.
|
||||
*/
|
||||
public static Map<String, String> getRegisterdSASLMechanisms() {
|
||||
Map<String, String> answer = new LinkedHashMap<String, String>();
|
||||
Map<String, String> answer = new LinkedHashMap<>();
|
||||
synchronized (REGISTERED_MECHANISMS) {
|
||||
for (SASLMechanism mechanism : REGISTERED_MECHANISMS) {
|
||||
answer.put(mechanism.getClass().getName(), mechanism.toString());
|
||||
|
|
@ -132,9 +132,9 @@ public final class SASLAuthentication {
|
|||
return false;
|
||||
}
|
||||
|
||||
public static boolean blacklistSASLMechanism(String mechansim) {
|
||||
public static boolean blacklistSASLMechanism(String mechanism) {
|
||||
synchronized (BLACKLISTED_MECHANISMS) {
|
||||
return BLACKLISTED_MECHANISMS.add(mechansim);
|
||||
return BLACKLISTED_MECHANISMS.add(mechanism);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -356,8 +356,8 @@ public final class SASLAuthentication {
|
|||
throw new SmackException(
|
||||
"No supported and enabled SASL Mechanism provided by server. " +
|
||||
"Server announced mechanisms: " + serverMechanisms + ". " +
|
||||
"Registerd SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
|
||||
"Enabled SASL mechansisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
|
||||
"Registered SASL mechanisms with Smack: " + REGISTERED_MECHANISMS + ". " +
|
||||
"Enabled SASL mechanisms for this connection: " + configuration.getEnabledSaslMechanisms() + ". " +
|
||||
"Blacklisted SASL mechanisms: " + BLACKLISTED_MECHANISMS + '.'
|
||||
);
|
||||
// @formatter;on
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@ public final class SmackConfiguration {
|
|||
private static int defaultPacketReplyTimeout = 5000;
|
||||
private static int packetCollectorSize = 5000;
|
||||
|
||||
private static List<String> defaultMechs = new ArrayList<String>();
|
||||
private static List<String> defaultMechs = new ArrayList<>();
|
||||
|
||||
static Set<String> disabledSmackClasses = new HashSet<String>();
|
||||
static Set<String> disabledSmackClasses = new HashSet<>();
|
||||
|
||||
final static List<XMPPInputOutputStream> compressionHandlers = new ArrayList<XMPPInputOutputStream>(2);
|
||||
final static List<XMPPInputOutputStream> compressionHandlers = new ArrayList<>(2);
|
||||
|
||||
static boolean smackInitialized = false;
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ public final class SmackConfiguration {
|
|||
|
||||
/**
|
||||
* Value that indicates whether debugging is enabled. When enabled, a debug
|
||||
* window will apear for each new connection that will contain the following
|
||||
* window will appear for each new connection that will contain the following
|
||||
* information:<ul>
|
||||
* <li> Client Traffic -- raw XML traffic generated by Smack and sent to the server.
|
||||
* <li> Server Traffic -- raw XML traffic sent by the server to the client.
|
||||
|
|
@ -280,8 +280,8 @@ public final class SmackConfiguration {
|
|||
compressionHandlers.add(xmppInputOutputStream);
|
||||
}
|
||||
|
||||
public static List<XMPPInputOutputStream> getCompresionHandlers() {
|
||||
List<XMPPInputOutputStream> res = new ArrayList<XMPPInputOutputStream>(compressionHandlers.size());
|
||||
public static List<XMPPInputOutputStream> getCompressionHandlers() {
|
||||
List<XMPPInputOutputStream> res = new ArrayList<>(compressionHandlers.size());
|
||||
for (XMPPInputOutputStream ios : compressionHandlers) {
|
||||
if (ios.isSupported()) {
|
||||
res.add(ios);
|
||||
|
|
@ -293,7 +293,7 @@ public final class SmackConfiguration {
|
|||
/**
|
||||
* Set the default HostnameVerifier that will be used by XMPP connections to verify the hostname
|
||||
* of a TLS certificate. XMPP connections are able to overwrite this settings by supplying a
|
||||
* HostnameVerifier in their ConnecitonConfiguration with
|
||||
* HostnameVerifier in their ConnectionConfiguration with
|
||||
* {@link ConnectionConfiguration.Builder#setHostnameVerifier(HostnameVerifier)}.
|
||||
*/
|
||||
public static void setDefaultHostnameVerifier(HostnameVerifier verifier) {
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ public class SmackException extends Exception {
|
|||
|
||||
public ConnectionException(Throwable wrappedThrowable) {
|
||||
super(wrappedThrowable);
|
||||
failedAddresses = new ArrayList<HostAddress>(0);
|
||||
failedAddresses = new ArrayList<>(0);
|
||||
}
|
||||
|
||||
private ConnectionException(String message, List<HostAddress> failedAddresses) {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ import org.jivesoftware.smack.util.FileUtils;
|
|||
import org.jivesoftware.smack.util.StringUtils;
|
||||
|
||||
import org.xmlpull.v1.XmlPullParser;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
import org.xmlpull.v1.XmlPullParserFactory;
|
||||
|
||||
|
||||
|
|
@ -71,7 +70,7 @@ public final class SmackInitialization {
|
|||
}
|
||||
} catch (Exception e) {
|
||||
LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
|
||||
smackVersion = "unkown";
|
||||
smackVersion = "unknown";
|
||||
}
|
||||
SMACK_VERSION = smackVersion;
|
||||
|
||||
|
|
@ -182,7 +181,7 @@ public final class SmackInitialization {
|
|||
|
||||
private static void parseClassesToLoad(XmlPullParser parser, boolean optional,
|
||||
Collection<Exception> exceptions, ClassLoader classLoader)
|
||||
throws XmlPullParserException, IOException, Exception {
|
||||
throws Exception {
|
||||
final String startName = parser.getName();
|
||||
int eventType;
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ public class StanzaCollector {
|
|||
}
|
||||
}
|
||||
|
||||
private final void throwIfCancelled() {
|
||||
private void throwIfCancelled() {
|
||||
if (cancelled) {
|
||||
throw new IllegalStateException("Packet collector already cancelled");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ public interface StanzaListener {
|
|||
* @throws InterruptedException
|
||||
* @throws NotLoggedInException
|
||||
*/
|
||||
public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
|
||||
void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ package org.jivesoftware.smack;
|
|||
|
||||
public interface SuccessCallback<T> {
|
||||
|
||||
public void onSuccess(T result);
|
||||
void onSuccess(T result);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class XMPPConnectionRegistry {
|
|||
* A set of listeners which will be invoked if a new connection is created.
|
||||
*/
|
||||
private final static Set<ConnectionCreationListener> connectionEstablishedListeners =
|
||||
new CopyOnWriteArraySet<ConnectionCreationListener>();
|
||||
new CopyOnWriteArraySet<>();
|
||||
|
||||
/**
|
||||
* Adds a new listener that will be notified when new Connections are created. Note
|
||||
|
|
|
|||
|
|
@ -30,10 +30,7 @@ public final class EmptyToMatcher implements StanzaFilter {
|
|||
@Override
|
||||
public boolean accept(Stanza packet) {
|
||||
Jid packetTo = packet.getTo();
|
||||
if (packetTo == null) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return packetTo == null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -54,5 +54,5 @@ public interface StanzaFilter {
|
|||
* @param stanza the stanza(/packet) to test.
|
||||
* @return true if and only if <tt>stanza</tt> passes the filter.
|
||||
*/
|
||||
public boolean accept(Stanza stanza);
|
||||
boolean accept(Stanza stanza);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,5 +30,5 @@ import org.jivesoftware.smack.SmackConfiguration;
|
|||
*
|
||||
*/
|
||||
public interface SmackInitializer {
|
||||
public List<Exception> initialize();
|
||||
List<Exception> initialize();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.IQ;
|
|||
*/
|
||||
public interface IQRequestHandler {
|
||||
|
||||
public enum Mode {
|
||||
enum Mode {
|
||||
/**
|
||||
* Process requests synchronously, i.e. in the order they arrive. Uses a single thread, which means that the other
|
||||
* requests have to wait until all previous synchronous requests have been handled. Use {@link #async} if
|
||||
|
|
@ -41,13 +41,13 @@ public interface IQRequestHandler {
|
|||
async,
|
||||
}
|
||||
|
||||
public IQ handleIQRequest(IQ iqRequest);
|
||||
IQ handleIQRequest(IQ iqRequest);
|
||||
|
||||
public Mode getMode();
|
||||
Mode getMode();
|
||||
|
||||
public IQ.Type getType();
|
||||
IQ.Type getType();
|
||||
|
||||
public String getElement();
|
||||
String getElement();
|
||||
|
||||
public String getNamespace();
|
||||
String getNamespace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,5 +28,5 @@ public interface Element {
|
|||
*
|
||||
* @return the stanza(/packet) extension as XML.
|
||||
*/
|
||||
public CharSequence toXML();
|
||||
CharSequence toXML();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class EmptyResultIQ extends IQ {
|
|||
|
||||
public EmptyResultIQ(IQ request) {
|
||||
this();
|
||||
initialzeAsResultFor(request);
|
||||
initializeAsResultFor(request);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ public interface ExtensionElement extends NamedElement {
|
|||
*
|
||||
* @return the namespace.
|
||||
*/
|
||||
public String getNamespace();
|
||||
String getNamespace();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ public abstract class IQ extends Stanza {
|
|||
*/
|
||||
protected abstract IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml);
|
||||
|
||||
protected final void initialzeAsResultFor(IQ request) {
|
||||
protected final void initializeAsResultFor(IQ request) {
|
||||
if (!(request.getType() == Type.get || request.getType() == Type.set)) {
|
||||
throw new IllegalArgumentException(
|
||||
"IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML());
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ public interface NamedElement extends Element {
|
|||
*
|
||||
* @return the element name.
|
||||
*/
|
||||
public String getElementName();
|
||||
String getElementName();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ import java.util.Set;
|
|||
@Deprecated
|
||||
public interface Packet extends TopLevelStreamElement {
|
||||
|
||||
public static final String TEXT = "text";
|
||||
public static final String ITEM = "item";
|
||||
String TEXT = "text";
|
||||
String ITEM = "item";
|
||||
|
||||
/**
|
||||
* Returns the unique ID of the stanza. The returned value could be <code>null</code>.
|
||||
*
|
||||
* @return the packet's unique ID or <code>null</code> if the id is not available.
|
||||
*/
|
||||
public String getStanzaId();
|
||||
String getStanzaId();
|
||||
|
||||
/**
|
||||
* Get the stanza id.
|
||||
|
|
@ -44,7 +44,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @deprecated use {@link #getStanzaId()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public String getPacketID();
|
||||
String getPacketID();
|
||||
|
||||
/**
|
||||
* Sets the unique ID of the packet. To indicate that a stanza(/packet) has no id
|
||||
|
|
@ -52,7 +52,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
*
|
||||
* @param id the unique ID for the packet.
|
||||
*/
|
||||
public void setStanzaId(String id);
|
||||
void setStanzaId(String id);
|
||||
|
||||
/**
|
||||
* Set the stanza ID.
|
||||
|
|
@ -60,7 +60,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @deprecated use {@link #setStanzaId(String)} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public void setPacketID(String packetID);
|
||||
void setPacketID(String packetID);
|
||||
|
||||
/**
|
||||
* Returns who the stanza(/packet) is being sent "to", or <tt>null</tt> if
|
||||
|
|
@ -70,7 +70,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @return who the stanza(/packet) is being sent to, or <tt>null</tt> if the
|
||||
* value has not been set.
|
||||
*/
|
||||
public String getTo();
|
||||
String getTo();
|
||||
|
||||
/**
|
||||
* Sets who the stanza(/packet) is being sent "to". The XMPP protocol often makes
|
||||
|
|
@ -78,7 +78,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
*
|
||||
* @param to who the stanza(/packet) is being sent to.
|
||||
*/
|
||||
public void setTo(String to);
|
||||
void setTo(String to);
|
||||
|
||||
/**
|
||||
* Returns who the stanza(/packet) is being sent "from" or <tt>null</tt> if
|
||||
|
|
@ -88,7 +88,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @return who the stanza(/packet) is being sent from, or <tt>null</tt> if the
|
||||
* value has not been set.
|
||||
*/
|
||||
public String getFrom();
|
||||
String getFrom();
|
||||
|
||||
/**
|
||||
* Sets who the stanza(/packet) is being sent "from". The XMPP protocol often
|
||||
|
|
@ -97,7 +97,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
*
|
||||
* @param from who the stanza(/packet) is being sent to.
|
||||
*/
|
||||
public void setFrom(String from);
|
||||
void setFrom(String from);
|
||||
|
||||
/**
|
||||
* Returns the error associated with this packet, or <tt>null</tt> if there are
|
||||
|
|
@ -105,34 +105,34 @@ public interface Packet extends TopLevelStreamElement {
|
|||
*
|
||||
* @return the error sub-packet or <tt>null</tt> if there isn't an error.
|
||||
*/
|
||||
public XMPPError getError();
|
||||
XMPPError getError();
|
||||
/**
|
||||
* Sets the error for this packet.
|
||||
*
|
||||
* @param error the error to associate with this packet.
|
||||
*/
|
||||
public void setError(XMPPError error);
|
||||
void setError(XMPPError error);
|
||||
|
||||
/**
|
||||
* Returns the xml:lang of this Stanza, or null if one has not been set.
|
||||
*
|
||||
* @return the xml:lang of this Stanza, or null.
|
||||
*/
|
||||
public String getLanguage();
|
||||
String getLanguage();
|
||||
|
||||
/**
|
||||
* Sets the xml:lang of this Stanza.
|
||||
*
|
||||
* @param language the xml:lang of this Stanza.
|
||||
*/
|
||||
public void setLanguage(String language);
|
||||
void setLanguage(String language);
|
||||
|
||||
/**
|
||||
* Returns a copy of the stanza(/packet) extensions attached to the packet.
|
||||
*
|
||||
* @return the stanza(/packet) extensions.
|
||||
*/
|
||||
public List<ExtensionElement> getExtensions();
|
||||
List<ExtensionElement> getExtensions();
|
||||
|
||||
/**
|
||||
* Return a set of all extensions with the given element name <emph>and</emph> namespace.
|
||||
|
|
@ -145,7 +145,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @return a set of all matching extensions.
|
||||
* @since 4.1
|
||||
*/
|
||||
public Set<ExtensionElement> getExtensions(String elementName, String namespace);
|
||||
Set<ExtensionElement> getExtensions(String elementName, String namespace);
|
||||
|
||||
/**
|
||||
* Returns the first extension of this stanza(/packet) that has the given namespace.
|
||||
|
|
@ -156,7 +156,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param namespace the namespace of the extension that is desired.
|
||||
* @return the stanza(/packet) extension with the given namespace.
|
||||
*/
|
||||
public ExtensionElement getExtension(String namespace);
|
||||
ExtensionElement getExtension(String namespace);
|
||||
|
||||
/**
|
||||
* Returns the first stanza(/packet) extension that matches the specified element name and
|
||||
|
|
@ -173,20 +173,20 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param namespace the XML element namespace of the stanza(/packet) extension.
|
||||
* @return the extension, or <tt>null</tt> if it doesn't exist.
|
||||
*/
|
||||
public <PE extends ExtensionElement> PE getExtension(String elementName, String namespace);
|
||||
<PE extends ExtensionElement> PE getExtension(String elementName, String namespace);
|
||||
/**
|
||||
* Adds a stanza(/packet) extension to the packet. Does nothing if extension is null.
|
||||
*
|
||||
* @param extension a stanza(/packet) extension.
|
||||
*/
|
||||
public void addExtension(ExtensionElement extension);
|
||||
void addExtension(ExtensionElement extension);
|
||||
|
||||
/**
|
||||
* Adds a collection of stanza(/packet) extensions to the packet. Does nothing if extensions is null.
|
||||
*
|
||||
* @param extensions a collection of stanza(/packet) extensions
|
||||
*/
|
||||
public void addExtensions(Collection<ExtensionElement> extensions);
|
||||
void addExtensions(Collection<ExtensionElement> extensions);
|
||||
|
||||
/**
|
||||
* Check if a stanza(/packet) extension with the given element and namespace exists.
|
||||
|
|
@ -198,7 +198,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param namespace
|
||||
* @return true if a stanza(/packet) extension exists, false otherwise.
|
||||
*/
|
||||
public boolean hasExtension(String elementName, String namespace);
|
||||
boolean hasExtension(String elementName, String namespace);
|
||||
|
||||
/**
|
||||
* Check if a stanza(/packet) extension with the given namespace exists.
|
||||
|
|
@ -206,7 +206,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param namespace
|
||||
* @return true if a stanza(/packet) extension exists, false otherwise.
|
||||
*/
|
||||
public boolean hasExtension(String namespace);
|
||||
boolean hasExtension(String namespace);
|
||||
|
||||
/**
|
||||
* Remove the stanza(/packet) extension with the given elementName and namespace.
|
||||
|
|
@ -215,7 +215,7 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param namespace
|
||||
* @return the removed stanza(/packet) extension or null.
|
||||
*/
|
||||
public ExtensionElement removeExtension(String elementName, String namespace);
|
||||
ExtensionElement removeExtension(String elementName, String namespace);
|
||||
|
||||
/**
|
||||
* Removes a stanza(/packet) extension from the packet.
|
||||
|
|
@ -223,10 +223,10 @@ public interface Packet extends TopLevelStreamElement {
|
|||
* @param extension the stanza(/packet) extension to remove.
|
||||
* @return the removed stanza(/packet) extension or null.
|
||||
*/
|
||||
public ExtensionElement removeExtension(ExtensionElement extension);
|
||||
ExtensionElement removeExtension(ExtensionElement extension);
|
||||
|
||||
@Override
|
||||
// NOTE When Smack is using Java 8, then this method should be moved in Element as "Default Method".
|
||||
public String toString();
|
||||
String toString();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
|
|||
|
||||
/**
|
||||
* Represents a stream error packet. Stream errors are unrecoverable errors where the server
|
||||
* will close the unrelying TCP connection after the stream error was sent to the client.
|
||||
* will close the underlying TCP connection after the stream error was sent to the client.
|
||||
* These is the list of stream errors as defined in the XMPP spec:<p>
|
||||
*
|
||||
* <table border=1>
|
||||
|
|
@ -174,7 +174,7 @@ public class StreamError extends AbstractError implements Nonza {
|
|||
restricted_xml,
|
||||
see_other_host,
|
||||
system_shutdown,
|
||||
undeficed_condition,
|
||||
undefined_condition,
|
||||
unsupported_encoding,
|
||||
unsupported_feature,
|
||||
unsupported_stanza_type,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ public interface ParsingExceptionCallback {
|
|||
* @param stanzaData the raw stanza data that caused the exception
|
||||
* @throws Exception
|
||||
*/
|
||||
public void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
|
||||
void handleUnparsableStanza(UnparseableStanza stanzaData) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ import org.jxmpp.util.XmppStringUtils;
|
|||
* <li>jabber:iq:register</ul>
|
||||
*
|
||||
* Because many more IQ types are part of XMPP and its extensions, a pluggable IQ parsing
|
||||
* mechanism is provided. IQ providers are registered programatically or by creating a
|
||||
* mechanism is provided. IQ providers are registered programmatically or by creating a
|
||||
* providers file. The file is an XML
|
||||
* document that contains one or more iqProvider entries, as in the following example:
|
||||
*
|
||||
|
|
@ -100,7 +100,7 @@ import org.jxmpp.util.XmppStringUtils;
|
|||
* is found in a packet, parsing will be passed to the correct provider. Each provider
|
||||
* can either implement the PacketExtensionProvider interface or be a standard Java Bean. In
|
||||
* the former case, each extension provider is responsible for parsing the raw XML stream to
|
||||
* contruct an object. In the latter case, bean introspection is used to try to automatically
|
||||
* construct an object. In the latter case, bean introspection is used to try to automatically
|
||||
* set the properties of th class using the values in the stanza(/packet) extension sub-element. When an
|
||||
* extension provider is not registered for an element name and namespace combination, Smack will
|
||||
* store all top-level elements of the sub-packet in DefaultPacketExtension object and then
|
||||
|
|
@ -207,7 +207,7 @@ public final class ProviderManager {
|
|||
|
||||
/**
|
||||
* Removes an IQ provider with the specified element name and namespace. This
|
||||
* method is typically called to cleanup providers that are programatically added
|
||||
* method is typically called to cleanup providers that are programmatically added
|
||||
* using the {@link #addIQProvider(String, String, Object) addIQProvider} method.
|
||||
*
|
||||
* @param elementName the XML element name.
|
||||
|
|
@ -237,7 +237,7 @@ public final class ProviderManager {
|
|||
*
|
||||
* @param elementName element name associated with extension provider.
|
||||
* @param namespace namespace associated with extension provider.
|
||||
* @return the extenion provider.
|
||||
* @return the extension provider.
|
||||
*/
|
||||
public static ExtensionElementProvider<ExtensionElement> getExtensionProvider(String elementName, String namespace) {
|
||||
String key = getKey(elementName, namespace);
|
||||
|
|
@ -269,7 +269,7 @@ public final class ProviderManager {
|
|||
|
||||
/**
|
||||
* Removes an extension provider with the specified element name and namespace. This
|
||||
* method is typically called to cleanup providers that are programatically added
|
||||
* method is typically called to cleanup providers that are programmatically added
|
||||
* using the {@link #addExtensionProvider(String, String, Object) addExtensionProvider} method.
|
||||
*
|
||||
* @param elementName the XML element name.
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class HTTPProxySocketConnection implements ProxySocketConnection {
|
|||
got.append(c);
|
||||
if (got.length() > 1024)
|
||||
{
|
||||
throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Recieved " +
|
||||
throw new ProxyException(ProxyInfo.ProxyType.HTTP, "Received " +
|
||||
"header of >1024 characters from "
|
||||
+ proxyhost + ", cancelling connection");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ package org.jivesoftware.smack.proxy;
|
|||
|
||||
public class ProxyInfo
|
||||
{
|
||||
public static enum ProxyType
|
||||
public enum ProxyType
|
||||
{
|
||||
HTTP,
|
||||
SOCKS4,
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import java.net.Socket;
|
|||
|
||||
public interface ProxySocketConnection {
|
||||
|
||||
public void connect(Socket socket, String host, int port, int timeout)
|
||||
void connect(Socket socket, String host, int port, int timeout)
|
||||
throws IOException;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
|
|||
|
||||
90: request granted
|
||||
91: request rejected or failed
|
||||
92: request rejected becasue SOCKS server cannot connect to
|
||||
92: request rejected because SOCKS server cannot connect to
|
||||
identd on the client
|
||||
93: request rejected because the client program and identd
|
||||
report different user-ids
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ public abstract class ScramMechanism extends SASLMechanism {
|
|||
return gs2Header;
|
||||
}
|
||||
|
||||
return ByteUtils.concact(gs2Header, cbindData);
|
||||
return ByteUtils.concat(gs2Header, cbindData);
|
||||
}
|
||||
|
||||
protected String getChannelBindingName() {
|
||||
|
|
@ -394,7 +394,7 @@ public abstract class ScramMechanism extends SASLMechanism {
|
|||
throw new AssertionError();
|
||||
}
|
||||
// U1 := HMAC(str, salt + INT(1))
|
||||
byte[] u = hmac(key, ByteUtils.concact(salt, ONE));
|
||||
byte[] u = hmac(key, ByteUtils.concat(salt, ONE));
|
||||
byte[] res = u.clone();
|
||||
for (int i = 1; i < iterations; i++) {
|
||||
u = hmac(key, u);
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ public class Async {
|
|||
if (e instanceof RuntimeException) {
|
||||
throw (RuntimeException) e;
|
||||
}
|
||||
LOGGER.log(Level.WARNING, "Catched Exception", e);
|
||||
LOGGER.log(Level.WARNING, "Caught Exception", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
package org.jivesoftware.smack.util;
|
||||
|
||||
public class ByteUtils {
|
||||
public static byte[] concact(byte[] arrayOne, byte[] arrayTwo) {
|
||||
public static byte[] concat(byte[] arrayOne, byte[] arrayTwo) {
|
||||
int combinedLength = arrayOne.length + arrayTwo.length;
|
||||
byte[] res = new byte[combinedLength];
|
||||
System.arraycopy(arrayOne, 0, res, 0, arrayOne.length);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public class LazyStringBuilder implements Appendable, CharSequence {
|
|||
}
|
||||
|
||||
public LazyStringBuilder() {
|
||||
list = new ArrayList<CharSequence>(20);
|
||||
list = new ArrayList<>(20);
|
||||
}
|
||||
|
||||
public LazyStringBuilder append(LazyStringBuilder lsb) {
|
||||
|
|
|
|||
|
|
@ -90,19 +90,17 @@ public class ObservableWriter extends Writer {
|
|||
|
||||
/**
|
||||
* Notify that a new string has been written.
|
||||
*
|
||||
* @param str the written String to notify
|
||||
*/
|
||||
private void notifyListeners() {
|
||||
WriterListener[] writerListeners = null;
|
||||
WriterListener[] writerListeners;
|
||||
synchronized (listeners) {
|
||||
writerListeners = new WriterListener[listeners.size()];
|
||||
listeners.toArray(writerListeners);
|
||||
}
|
||||
String str = stringBuilder.toString();
|
||||
stringBuilder.setLength(0);
|
||||
for (int i = 0; i < writerListeners.length; i++) {
|
||||
writerListeners[i].write(str);
|
||||
for (WriterListener writerListener : writerListeners) {
|
||||
writerListener.write(str);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ public class PacketParserUtils {
|
|||
String language = getLanguageAttribute(parser);
|
||||
|
||||
// determine message's default language
|
||||
String defaultLanguage = null;
|
||||
String defaultLanguage;
|
||||
if (language != null && !"".equals(language.trim())) {
|
||||
message.setLanguage(language);
|
||||
defaultLanguage = language;
|
||||
|
|
@ -746,7 +746,7 @@ public class PacketParserUtils {
|
|||
public static Map<String, String> parseDescriptiveTexts(XmlPullParser parser, Map<String, String> descriptiveTexts)
|
||||
throws XmlPullParserException, IOException {
|
||||
if (descriptiveTexts == null) {
|
||||
descriptiveTexts = new HashMap<String, String>();
|
||||
descriptiveTexts = new HashMap<>();
|
||||
}
|
||||
String xmllang = getLanguageAttribute(parser);
|
||||
if (xmllang == null) {
|
||||
|
|
@ -805,7 +805,7 @@ public class PacketParserUtils {
|
|||
*/
|
||||
public static StreamError parseStreamError(XmlPullParser parser) throws Exception {
|
||||
final int initialDepth = parser.getDepth();
|
||||
List<ExtensionElement> extensions = new ArrayList<ExtensionElement>();
|
||||
List<ExtensionElement> extensions = new ArrayList<>();
|
||||
Map<String, String> descriptiveTexts = null;
|
||||
StreamError.Condition condition = null;
|
||||
String conditionText = null;
|
||||
|
|
@ -857,7 +857,7 @@ public class PacketParserUtils {
|
|||
throws Exception {
|
||||
final int initialDepth = parser.getDepth();
|
||||
Map<String, String> descriptiveTexts = null;
|
||||
List<ExtensionElement> extensions = new ArrayList<ExtensionElement>();
|
||||
List<ExtensionElement> extensions = new ArrayList<>();
|
||||
XMPPError.Builder builder = XMPPError.getBuilder();
|
||||
|
||||
// Parse the error header
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class PacketUtil {
|
|||
* @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public static <PE extends ExtensionElement> PE packetExtensionfromCollection(
|
||||
public static <PE extends ExtensionElement> PE packetExtensionFromCollection(
|
||||
Collection<ExtensionElement> collection, String element,
|
||||
String namespace) {
|
||||
return extensionElementFrom(collection, element, namespace);
|
||||
|
|
|
|||
|
|
@ -138,11 +138,7 @@ public class ParserUtils {
|
|||
if (valueString == null)
|
||||
return null;
|
||||
valueString = valueString.toLowerCase(Locale.US);
|
||||
if (valueString.equals("true") || valueString.equals("0")) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return valueString.equals("true") || valueString.equals("0");
|
||||
}
|
||||
|
||||
public static boolean getBooleanAttribute(XmlPullParser parser, String name,
|
||||
|
|
@ -232,8 +228,7 @@ public class ParserUtils {
|
|||
|
||||
public static URI getUriFromNextText(XmlPullParser parser) throws XmlPullParserException, IOException, URISyntaxException {
|
||||
String uriString = parser.nextText();
|
||||
URI uri = new URI(uriString);
|
||||
return uri;
|
||||
return new URI(uriString);
|
||||
}
|
||||
|
||||
public static String getRequiredAttribute(XmlPullParser parser, String name) throws IOException {
|
||||
|
|
@ -253,7 +248,6 @@ public class ParserUtils {
|
|||
}
|
||||
|
||||
public static String getXmlLang(XmlPullParser parser) {
|
||||
String langString = parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
|
||||
return langString;
|
||||
return parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ public interface ReaderListener {
|
|||
*
|
||||
* @param str the read String
|
||||
*/
|
||||
public abstract void read(String str);
|
||||
void read(String str);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ package org.jivesoftware.smack.util;
|
|||
|
||||
public interface StringTransformer {
|
||||
|
||||
public String transform(String string);
|
||||
String transform(String string);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -444,10 +444,10 @@ public class StringUtils {
|
|||
}
|
||||
|
||||
public static boolean nullSafeCharSequenceEquals(CharSequence csOne, CharSequence csTwo) {
|
||||
return nullSafeCharSequenceComperator(csOne, csTwo) == 0;
|
||||
return nullSafeCharSequenceComparator(csOne, csTwo) == 0;
|
||||
}
|
||||
|
||||
public static int nullSafeCharSequenceComperator(CharSequence csOne, CharSequence csTwo) {
|
||||
public static int nullSafeCharSequenceComparator(CharSequence csOne, CharSequence csTwo) {
|
||||
if (csOne == null ^ csTwo == null) {
|
||||
return (csOne == null) ? -1 : 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public class TLSUtils {
|
|||
* According to the <a
|
||||
* href="https://raw.githubusercontent.com/stpeter/manifesto/master/manifesto.txt">Encrypted
|
||||
* XMPP Manifesto</a>, TLSv1.2 shall be deployed, providing fallback support for SSLv3 and
|
||||
* TLSv1.1. This method goes one step boyond and upgrades the handshake to use TLSv1 or better.
|
||||
* TLSv1.1. This method goes one step beyond and upgrades the handshake to use TLSv1 or better.
|
||||
* This method requires the underlying OS to support all of TLSv1.2 , 1.1 and 1.0.
|
||||
* </p>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -29,6 +29,6 @@ public interface TypedCloneable<T> extends Cloneable {
|
|||
*
|
||||
* @return a cloned version of this instance.
|
||||
*/
|
||||
public T clone();
|
||||
T clone();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,6 @@ public interface WriterListener {
|
|||
*
|
||||
* @param str the written string
|
||||
*/
|
||||
public abstract void write(String str);
|
||||
void write(String str);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
|
|||
|
||||
/**
|
||||
* Add a new element to this builder, with the {@link java.util.Date} instance as its content,
|
||||
* which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
|
||||
* which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
|
||||
*
|
||||
* @param name element name
|
||||
* @param content content of element
|
||||
|
|
@ -123,7 +123,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
|
|||
|
||||
/**
|
||||
* Add a new element to this builder, with the {@link java.util.Date} instance as its content,
|
||||
* which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
|
||||
* which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
|
||||
* if {@link java.util.Date} instance is not <code>null</code>.
|
||||
*
|
||||
* @param name element name
|
||||
|
|
@ -245,7 +245,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
|
|||
|
||||
/**
|
||||
* Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
|
||||
* which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}.
|
||||
* which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}.
|
||||
*
|
||||
* @param name name of attribute
|
||||
* @param value value of attribute
|
||||
|
|
@ -280,7 +280,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
|
|||
|
||||
/**
|
||||
* Add a new attribute to this builder, with the {@link java.util.Date} instance as its value,
|
||||
* which will get formated with {@link XmppDateTime#formatXEP0082Date(Date)}
|
||||
* which will get formatted with {@link XmppDateTime#formatXEP0082Date(Date)}
|
||||
* if {@link java.util.Date} instance is not <code>null</code>.
|
||||
*
|
||||
* @param name attribute name
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public class HostAddress {
|
|||
public HostAddress(String fqdn, int port, List<InetAddress> inetAddresses) {
|
||||
if (port < 0 || port > 65535)
|
||||
throw new IllegalArgumentException(
|
||||
"Port must be a 16-bit unsiged integer (i.e. between 0-65535. Port was: " + port);
|
||||
"Port must be a 16-bit unsigned integer (i.e. between 0-65535. Port was: " + port);
|
||||
if (StringUtils.isNotEmpty(fqdn) && fqdn.charAt(fqdn.length() - 1) == '.') {
|
||||
this.fqdn = fqdn.substring(0, fqdn.length() - 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@ public class SRVRecord extends HostAddress implements Comparable<SRVRecord> {
|
|||
StringUtils.requireNotNullOrEmpty(fqdn, "The FQDN must not be null");
|
||||
if (weight < 0 || weight > 65535)
|
||||
throw new IllegalArgumentException(
|
||||
"DNS SRV records weight must be a 16-bit unsiged integer (i.e. between 0-65535. Weight was: "
|
||||
"DNS SRV records weight must be a 16-bit unsigned integer (i.e. between 0-65535. Weight was: "
|
||||
+ weight);
|
||||
|
||||
if (priority < 0 || priority > 65535)
|
||||
throw new IllegalArgumentException(
|
||||
"DNS SRV records priority must be a 16-bit unsiged integer (i.e. between 0-65535. Priority was: "
|
||||
"DNS SRV records priority must be a 16-bit unsigned integer (i.e. between 0-65535. Priority was: "
|
||||
+ priority);
|
||||
|
||||
this.priority = priority;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public class StanzaCollectorTest
|
|||
@Override
|
||||
public void run()
|
||||
{
|
||||
Stanza p = null;
|
||||
Stanza p;
|
||||
|
||||
do
|
||||
{
|
||||
|
|
@ -134,7 +134,7 @@ public class StanzaCollectorTest
|
|||
@Override
|
||||
public void run()
|
||||
{
|
||||
Stanza p = null;
|
||||
Stanza p;
|
||||
|
||||
do
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ import org.jivesoftware.smack.packet.Stanza;
|
|||
public class ThreadedDummyConnection extends DummyConnection {
|
||||
private static final Logger LOGGER = Logger.getLogger(ThreadedDummyConnection.class.getName());
|
||||
|
||||
private BlockingQueue<IQ> replyQ = new ArrayBlockingQueue<IQ>(1);
|
||||
private BlockingQueue<Stanza> messageQ = new LinkedBlockingQueue<Stanza>(5);
|
||||
private final BlockingQueue<IQ> replyQ = new ArrayBlockingQueue<>(1);
|
||||
private final BlockingQueue<Stanza> messageQ = new LinkedBlockingQueue<>(5);
|
||||
private volatile boolean timeout = false;
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ public class MessageTest {
|
|||
XmlUnitUtils.assertSimilar(control, message.toXML());
|
||||
|
||||
Collection<String> languages = message.getBodyLanguages();
|
||||
List<String> controlLanguages = new ArrayList<String>();
|
||||
List<String> controlLanguages = new ArrayList<>();
|
||||
controlLanguages.add(lang2);
|
||||
controlLanguages.add(lang3);
|
||||
controlLanguages.removeAll(languages);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
*/
|
||||
package org.jivesoftware.smack.parsing;
|
||||
|
||||
import static org.jivesoftware.smack.test.util.CharsequenceEquals.equalsCharSequence;
|
||||
import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
|
||||
import static org.junit.Assert.assertThat;
|
||||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import java.util.HashMap;
|
|||
import java.util.Map;
|
||||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
||||
import org.jivesoftware.smack.util.StringUtils;
|
||||
|
||||
import org.jxmpp.jid.EntityBareJid;
|
||||
|
|
@ -40,7 +39,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
|
|||
super(saslMechanism);
|
||||
}
|
||||
|
||||
protected void runTest(boolean useAuthzid) throws NotConnectedException, SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
|
||||
protected void runTest(boolean useAuthzid) throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
|
||||
EntityBareJid authzid = null;
|
||||
if (useAuthzid) {
|
||||
authzid = JidCreate.entityBareFrom("shazbat@xmpp.org");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
/**
|
||||
*
|
||||
* Copyright © 2014 Florian Schmaus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.jivesoftware.smack.test.util;
|
||||
|
||||
import org.hamcrest.Description;
|
||||
import org.hamcrest.Factory;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.hamcrest.TypeSafeMatcher;
|
||||
|
||||
public class CharSequenceEquals extends TypeSafeMatcher<CharSequence> {
|
||||
|
||||
private final String charSequenceString;
|
||||
|
||||
public CharSequenceEquals(CharSequence charSequence) {
|
||||
charSequenceString = charSequence.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void describeTo(Description description) {
|
||||
description.appendText("Does not match CharSequence ").appendValue(charSequenceString);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean matchesSafely(CharSequence item) {
|
||||
String itemString = item.toString();
|
||||
return charSequenceString.equals(itemString);
|
||||
}
|
||||
|
||||
@Factory
|
||||
public static Matcher<CharSequence> equalsCharSequence(CharSequence charSequence) {
|
||||
return new CharSequenceEquals(charSequence);
|
||||
}
|
||||
}
|
||||
|
|
@ -809,7 +809,7 @@ public class PacketParserUtilsTest {
|
|||
IOException, TransformerException, SAXException {
|
||||
// @formatter:off
|
||||
final String stanza = XMLBuilder.create("outer", "outerNamespace").a("outerAttribute", "outerValue")
|
||||
.element("inner", "innerNamespace").a("innverAttribute", "innerValue")
|
||||
.element("inner", "innerNamespace").a("innerAttribute", "innerValue")
|
||||
.element("innermost")
|
||||
.t("some text")
|
||||
.asString();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue