diff --git a/build.gradle b/build.gradle
index 4601e9c44..cf6b98240 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,6 +267,7 @@ subprojects {
checkstyle {
configFile = new File(rootConfigDir, 'checkstyle.xml')
+ toolVersion = '7.7'
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index ce2345c20..d5ce5464e 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -117,5 +117,75 @@
, INDEX_OP
"/>
+
+
+
+
+
+
+
+
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 b91bb5a40..32edb865f 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
@@ -325,7 +325,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
writer = new Writer() {
@Override
public void write(char[] cbuf, int off, int len) {
- /* ignore */}
+ /* ignore */ }
@Override
public void close() {
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 96012c3e6..762ccf053 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -627,7 +627,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
hostAddresses = DNSUtil.resolveXMPPServiceDomain(config.getXMPPServiceDomain().toString(), failedAddresses, config.getDnssecMode());
}
// Either the populated host addresses are not empty *or* there must be at least one failed address.
- assert(!hostAddresses.isEmpty() || !failedAddresses.isEmpty());
+ assert (!hostAddresses.isEmpty() || !failedAddresses.isEmpty());
return failedAddresses;
}
@@ -666,7 +666,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
@Override
public void sendStanza(Stanza stanza) throws NotConnectedException, InterruptedException {
Objects.requireNonNull(stanza, "Stanza must not be null");
- assert(stanza instanceof Message || stanza instanceof Presence || stanza instanceof IQ);
+ assert (stanza instanceof Message || stanza instanceof Presence || stanza instanceof IQ);
throwNotConnectedExceptionIfAppropriate();
switch (fromMode) {
@@ -895,7 +895,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
continue;
}
}
- }});
+ }
+ });
}
@Override
@@ -1069,7 +1070,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
* @throws InterruptedException
*/
protected void processStanza(final Stanza stanza) throws InterruptedException {
- assert(stanza != null);
+ assert (stanza != null);
lastStanzaReceived = System.currentTimeMillis();
// Deliver the incoming packet to listeners.
executorService.executeBlocking(new Runnable() {
@@ -1202,7 +1203,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
}
// Loop through all collectors and notify the appropriate ones.
- for (StanzaCollector collector: collectors) {
+ for (StanzaCollector collector : collectors) {
collector.processStanza(packet);
}
@@ -1224,7 +1225,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
for (StanzaListener listener : listenersToNotify) {
try {
listener.processStanza(packet);
- } catch(NotConnectedException e) {
+ } catch (NotConnectedException e) {
LOGGER.log(Level.WARNING, "Got not connected exception, aborting", e);
break;
} catch (Exception e) {
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 55f76798a..ff35a6968 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -162,7 +162,7 @@ public abstract class ConnectionConfiguration {
enabledSaslMechanisms = builder.enabledSaslMechanisms;
// If the enabledSaslmechanisms are set, then they must not be empty
- assert(enabledSaslMechanisms != null ? !enabledSaslMechanisms.isEmpty() : true);
+ assert (enabledSaslMechanisms != null ? !enabledSaslMechanisms.isEmpty() : true);
if (dnssecMode != DnssecMode.disabled && customSSLContext != null) {
throw new IllegalStateException("You can not use a custom SSL context with DNSSEC enabled");
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 2a0f76119..137e07110 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
@@ -132,13 +132,13 @@ public final class SASLAuthentication {
}
public static boolean blacklistSASLMechanism(String mechansim) {
- synchronized(BLACKLISTED_MECHANISMS) {
+ synchronized (BLACKLISTED_MECHANISMS) {
return BLACKLISTED_MECHANISMS.add(mechansim);
}
}
public static boolean unBlacklistSASLMechanism(String mechanism) {
- synchronized(BLACKLISTED_MECHANISMS) {
+ synchronized (BLACKLISTED_MECHANISMS) {
return BLACKLISTED_MECHANISMS.remove(mechanism);
}
}
@@ -209,7 +209,7 @@ public final class SASLAuthentication {
}
}
- if (saslException != null){
+ if (saslException != null) {
if (saslException instanceof SmackException) {
throw (SmackException) saslException;
} else if (saslException instanceof SASLErrorException) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index dafd97810..245e8f0e9 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -174,7 +174,7 @@ public final class SmackConfiguration {
* @param mech the SASL mechanism to be added
*/
public static void addSaslMech(String mech) {
- if(!defaultMechs.contains(mech)) {
+ if (!defaultMechs.contains(mech)) {
defaultMechs.add(mech);
}
}
@@ -185,7 +185,7 @@ public final class SmackConfiguration {
* @param mechs the Collection of SASL mechanisms to be added
*/
public static void addSaslMechs(Collection mechs) {
- for(String mech : mechs) {
+ for (String mech : mechs) {
addSaslMech(mech);
}
}
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 7bdb8e18a..d7ac9410a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
@@ -68,7 +68,7 @@ public final class SmackInitialization {
} catch (IOException e) {
LOGGER.log(Level.WARNING, "IOException closing stream", e);
}
- } catch(Exception e) {
+ } catch (Exception e) {
LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
smackVersion = "unkown";
}
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 bb1984a1f..8906fc65e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java
@@ -79,7 +79,7 @@ public class SynchronizationPoint {
if (request instanceof Stanza) {
connection.sendStanza((Stanza) request);
}
- else if (request instanceof Nonza){
+ else if (request instanceof Nonza) {
connection.sendNonza((Nonza) request);
} else {
throw new IllegalStateException("Unsupported element type");
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java
index 708d7b52f..d06ddad47 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java
@@ -45,7 +45,7 @@ public abstract class AbstractListFilter implements StanzaFilter {
*/
protected AbstractListFilter(StanzaFilter... filters) {
Objects.requireNonNull(filters, "Parameter must not be null.");
- for(StanzaFilter filter : filters) {
+ for (StanzaFilter filter : filters) {
Objects.requireNonNull(filter, "Parameter must not be null.");
}
this.filters = new ArrayList(Arrays.asList(filters));
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
index df7790919..d04c41ad3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
@@ -68,7 +68,7 @@ public class AbstractError {
String descriptiveText = getDescriptiveText(defaultLocale);
if (descriptiveText == null) {
descriptiveText = getDescriptiveText("en");
- if(descriptiveText == null) {
+ if (descriptiveText == null) {
descriptiveText = getDescriptiveText("");
}
}
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 ebf18faef..21ea50dd8 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
@@ -488,7 +488,7 @@ public final class Message extends Stanza implements TypedCloneable {
// Add the subject in other languages
for (Subject subject : getSubjects()) {
// Skip the default language
- if(subject.equals(defaultSubject))
+ if (subject.equals(defaultSubject))
continue;
buf.halfOpenElement("subject").xmllangAttribute(subject.language).rightAngleBracket();
buf.escape(subject.subject);
@@ -502,7 +502,7 @@ public final class Message extends Stanza implements TypedCloneable {
// Add the bodies in other languages
for (Body body : getBodies()) {
// Skip the default language
- if(body.equals(defaultBody))
+ if (body.equals(defaultBody))
continue;
buf.halfOpenElement(BODY).xmllangAttribute(body.getLanguage()).rightAngleBracket();
buf.escape(body.getMessage());
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 a7d98a3e7..35d904f20 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
@@ -120,7 +120,7 @@ public final class StandardExtensionElement implements ExtensionElement {
}
public List getElements() {
- if (elements == null){
+ if (elements == null) {
return Collections.emptyList();
}
return elements.values();
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 7b4a659eb..b9d64e7aa 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
@@ -23,7 +23,7 @@ import org.xmlpull.v1.XmlPullParser;
public abstract class Provider {
- public final E parse(XmlPullParser parser) throws Exception{
+ public final E parse(XmlPullParser parser) throws Exception {
// XPP3 calling convention assert: Parser should be at start tag
ParserUtils.assertAtStartTag(parser);
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 bee798fb0..4fa884d39 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
@@ -135,7 +135,7 @@ public class ProviderFileLoader implements ProviderLoader {
}
while (eventType != XmlPullParser.END_DOCUMENT);
}
- catch (Exception e){
+ catch (Exception e) {
LOGGER.log(Level.SEVERE, "Unknown error occurred while parsing provider file", e);
exceptions.add(e);
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java
index ccf0f9b25..551b06876 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java
@@ -31,7 +31,7 @@ public class ProxyException extends IOException {
public ProxyException(ProxyInfo.ProxyType type, String ex)
{
- super("Proxy Exception " + type.toString() + " : "+ex);
+ super("Proxy Exception " + type.toString() + " : " + ex);
}
public ProxyException(ProxyInfo.ProxyType type)
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
index 65a54059a..b416319d0 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
@@ -50,12 +50,12 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
try
{
socket.connect(new InetSocketAddress(proxy_host, proxy_port), timeout);
- in=socket.getInputStream();
- out=socket.getOutputStream();
+ in = socket.getInputStream();
+ out = socket.getOutputStream();
socket.setTcpNoDelay(true);
- byte[] buf=new byte[1024];
- int index=0;
+ byte[] buf = new byte[1024];
+ int index = 0;
/*
1) CONNECT
@@ -75,27 +75,27 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
of all zero bits.
*/
- index=0;
- buf[index++]=4;
- buf[index++]=1;
+ index = 0;
+ buf[index++] = 4;
+ buf[index++] = 1;
- buf[index++]=(byte)(port>>>8);
- buf[index++]=(byte)(port&0xff);
+ buf[index++] = (byte) (port >>> 8);
+ buf[index++] = (byte) (port & 0xff);
InetAddress inetAddress = InetAddress.getByName(proxy_host);
byte[] byteAddress = inetAddress.getAddress();
for (int i = 0; i < byteAddress.length; i++)
{
- buf[index++]=byteAddress[i];
+ buf[index++] = byteAddress[i];
}
- if(user!=null)
+ if (user != null)
{
byte[] userBytes = user.getBytes(StringUtils.UTF8);
System.arraycopy(userBytes, 0, buf, index, user.length());
- index+=user.length();
+ index += user.length();
}
- buf[index++]=0;
+ buf[index++] = 0;
out.write(buf, 0, index);
/*
@@ -125,49 +125,49 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
The remaining fields are ignored.
*/
- int len=6;
- int s=0;
- while(s>>8);
- buf[index++]=(byte)(port&0xff);
+ index += len;
+ buf[index++] = (byte) (port >>> 8);
+ buf[index++] = (byte) (port & 0xff);
out.write(buf, 0, index);
@@ -263,20 +263,20 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
//in.read(buf, 0, 4);
fill(in, buf, 4);
- if(buf[1]!=0)
+ if (buf[1] != 0)
{
try
{
socket.close();
}
- catch(Exception eee)
+ catch (Exception eee)
{
}
throw new ProxyException(ProxyInfo.ProxyType.SOCKS5,
- "server returns "+buf[1]);
+ "server returns " + buf[1]);
}
- switch(buf[3]&0xff)
+ switch (buf[3] & 0xff)
{
case 1:
//in.read(buf, 0, 6);
@@ -286,7 +286,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
//in.read(buf, 0, 1);
fill(in, buf, 1);
//in.read(buf, 0, buf[0]+2);
- fill(in, buf, (buf[0]&0xff)+2);
+ fill(in, buf, (buf[0] & 0xff) + 2);
break;
case 4:
//in.read(buf, 0, 18);
@@ -295,17 +295,17 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
default:
}
}
- catch(RuntimeException e)
+ catch (RuntimeException e)
{
throw e;
}
- catch(Exception e)
+ catch (Exception e)
{
try
{
socket.close();
}
- catch(Exception eee)
+ catch (Exception eee)
{
}
// TODO convert to IOException(e) when minimum Android API level is 9 or higher
@@ -316,16 +316,16 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
private static void fill(InputStream in, byte[] buf, int len)
throws IOException
{
- int s=0;
- while(s {
this.password = password;
this.authorizationId = authzid;
this.sslSession = sslSession;
- assert(authorizationId == null || authzidSupported());
+ assert (authorizationId == null || authzidSupported());
authenticateInternal();
authenticate();
}
@@ -194,7 +194,7 @@ public abstract class SASLMechanism implements Comparable {
this.serviceName = serviceName;
this.authorizationId = authzid;
this.sslSession = sslSession;
- assert(authorizationId == null || authzidSupported());
+ assert (authorizationId == null || authzidSupported());
authenticateInternal(cbh);
authenticate();
}
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 4209083c1..8ce0e8b36 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
@@ -232,7 +232,7 @@ public abstract class ScramMechanism extends SASLMechanism {
}
String cbName = getChannelBindingName();
- assert(StringUtils.isNotEmpty(cbName));
+ assert (StringUtils.isNotEmpty(cbName));
return cbName + ',' + authzidPortion + ",";
}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
index 69ca3d6eb..c778fcdf3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
@@ -81,7 +81,7 @@ public class EventManger {
return false;
}
reference.eventResult = eventResult;
- synchronized(reference) {
+ synchronized (reference) {
reference.notifyAll();
}
return true;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
index 479b8c395..1a6401e05 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
@@ -143,7 +143,7 @@ public class MultiMap {
if (res == null) {
return null;
}
- assert(!res.isEmpty());
+ assert (!res.isEmpty());
return res.iterator().next();
}
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 4c9ce0699..498344bb8 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
@@ -214,7 +214,7 @@ public class PacketParserUtils {
public static Message parseMessage(XmlPullParser parser)
throws Exception {
ParserUtils.assertAtStartTag(parser);
- assert(parser.getName().equals(Message.ELEMENT));
+ assert (parser.getName().equals(Message.ELEMENT));
final int initialDepth = parser.getDepth();
Message message = new Message();
@@ -247,7 +247,7 @@ public class PacketParserUtils {
case XmlPullParser.START_TAG:
String elementName = parser.getName();
String namespace = parser.getNamespace();
- switch(elementName) {
+ switch (elementName) {
case "subject":
String xmlLangSubject = getLanguageAttribute(parser);
if (xmlLangSubject == null) {
@@ -385,7 +385,7 @@ public class PacketParserUtils {
*/
public static CharSequence parseContent(XmlPullParser parser)
throws XmlPullParserException, IOException {
- assert(parser.getEventType() == XmlPullParser.START_TAG);
+ assert (parser.getEventType() == XmlPullParser.START_TAG);
if (parser.isEmptyElementTag()) {
return "";
}
@@ -546,7 +546,7 @@ public class PacketParserUtils {
case XmlPullParser.START_TAG:
String elementName = parser.getName();
String namespace = parser.getNamespace();
- switch(elementName) {
+ switch (elementName) {
case "status":
presence.setStatus(parser.nextText());
break;
@@ -620,7 +620,7 @@ public class PacketParserUtils {
case XmlPullParser.START_TAG:
String elementName = parser.getName();
String namespace = parser.getNamespace();
- switch(elementName) {
+ switch (elementName) {
case "error":
error = PacketParserUtils.parseError(parser);
break;
@@ -775,7 +775,7 @@ public class PacketParserUtils {
descriptiveTexts = parseDescriptiveTexts(parser, descriptiveTexts);
}
else {
- assert(condition == null);
+ assert (condition == null);
condition = parser.getName();
}
break;
@@ -945,7 +945,7 @@ public class PacketParserUtils {
}
}
}
- assert(parser.getEventType() == XmlPullParser.END_TAG);
+ assert (parser.getEventType() == XmlPullParser.END_TAG);
return new StartTls(required);
}
@@ -954,7 +954,7 @@ public class PacketParserUtils {
final int initialDepth = parser.getDepth();
boolean optional = false;
if (!parser.isEmptyElementTag()) {
- outerloop: while(true) {
+ outerloop: while (true) {
int event = parser.next();
switch (event) {
case XmlPullParser.START_TAG:
@@ -1022,7 +1022,7 @@ public class PacketParserUtils {
}
public static void addExtensionElement(Stanza packet, XmlPullParser parser, String elementName,
- String namespace) throws Exception{
+ String namespace) throws Exception {
ExtensionElement packetExtension = parseExtensionElement(elementName, namespace, parser);
packet.addExtension(packetExtension);
}
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 9a5b68153..3badf6a02 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
@@ -43,7 +43,7 @@ public class ParserUtils {
public static final String JID = "jid";
public static void assertAtStartTag(XmlPullParser parser) throws XmlPullParserException {
- assert(parser.getEventType() == XmlPullParser.START_TAG);
+ assert (parser.getEventType() == XmlPullParser.START_TAG);
}
public static void assertAtStartTag(XmlPullParser parser, String name) throws XmlPullParserException {
@@ -52,7 +52,7 @@ public class ParserUtils {
}
public static void assertAtEndTag(XmlPullParser parser) throws XmlPullParserException {
- assert(parser.getEventType() == XmlPullParser.END_TAG);
+ assert (parser.getEventType() == XmlPullParser.END_TAG);
}
public static void forwardToEndTagOfDepth(XmlPullParser parser, int depth)
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
index f58068269..c2bb9210a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
@@ -121,7 +121,7 @@ public class StringUtils {
return null;
}
final int len = input.length();
- final StringBuilder out = new StringBuilder((int)(len*1.3));
+ final StringBuilder out = new StringBuilder((int) (len * 1.3));
CharSequence toAppend;
char ch;
int last = 0;
@@ -153,7 +153,7 @@ public class StringUtils {
break;
case forAttribute:
// No need to escape '>' for attributes.
- switch(ch) {
+ switch (ch) {
case '<':
toAppend = LT_ENCODE;
break;
@@ -172,7 +172,7 @@ public class StringUtils {
break;
case forAttributeApos:
// No need to escape '>' and '"' for attributes using '\'' as quote.
- switch(ch) {
+ switch (ch) {
case '<':
toAppend = LT_ENCODE;
break;
@@ -188,7 +188,7 @@ public class StringUtils {
break;
case forText:
// No need to escape '"', '\'', and '>' for text.
- switch(ch) {
+ switch (ch) {
case '<':
toAppend = LT_ENCODE;
break;
@@ -308,7 +308,7 @@ public class StringUtils {
final Random random = randGen.get();
// Create a char buffer to put random letters and numbers in.
char[] randBuffer = new char[length];
- for (int i=0; i"));
}
@@ -710,7 +710,7 @@ public class PacketParserUtilsTest {
try {
PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
fail("Exception should be thrown");
- } catch(XmlPullParserException e) {
+ } catch (XmlPullParserException e) {
assertTrue(e.getMessage().contains("end tag name