Browse Source

More checkstyle whitespace related checks

tags/4.2.1
Florian Schmaus 3 years ago
parent
commit
ce1cddc722
100 changed files with 443 additions and 372 deletions
  1. +1
    -0
      build.gradle
  2. +70
    -0
      config/checkstyle.xml
  3. +1
    -1
      smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
  4. +7
    -6
      smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
  5. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
  6. +3
    -3
      smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
  7. +2
    -2
      smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
  8. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
  9. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java
  10. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java
  11. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
  12. +2
    -2
      smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
  13. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java
  14. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java
  15. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
  16. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java
  17. +28
    -28
      smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
  18. +46
    -46
      smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
  19. +2
    -2
      smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java
  20. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
  21. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
  22. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
  23. +9
    -9
      smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
  24. +2
    -2
      smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
  25. +6
    -6
      smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
  26. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
  27. +1
    -1
      smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java
  28. +3
    -3
      smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
  29. +1
    -1
      smack-core/src/test/java/org/jivesoftware/smack/filter/FilterToStringTest.java
  30. +1
    -1
      smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
  31. +2
    -2
      smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
  32. +1
    -1
      smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java
  33. +1
    -1
      smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java
  34. +2
    -1
      smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
  35. +4
    -4
      smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
  36. +1
    -1
      smack-core/src/test/java/org/jivesoftware/smack/util/SHA1Test.java
  37. +6
    -6
      smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
  38. +4
    -4
      smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java
  39. +1
    -1
      smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java
  40. +1
    -1
      smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
  41. +2
    -2
      smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java
  42. +1
    -1
      smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
  43. +1
    -1
      smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
  44. +1
    -1
      smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
  45. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java
  46. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
  47. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBData.java
  48. +12
    -12
      smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java
  49. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java
  50. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java
  51. +4
    -4
      smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
  52. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
  53. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
  54. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
  55. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
  56. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
  57. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
  58. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
  59. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
  60. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
  61. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
  62. +5
    -5
      smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
  63. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java
  64. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
  65. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java
  66. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
  67. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
  68. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
  69. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java
  70. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
  71. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
  72. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
  73. +6
    -8
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
  74. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java
  75. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java
  76. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java
  77. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java
  78. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
  79. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java
  80. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java
  81. +4
    -4
      smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
  82. +4
    -4
      smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
  83. +1
    -1
      smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
  84. +2
    -2
      smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
  85. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
  86. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
  87. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
  88. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
  89. +26
    -26
      smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java
  90. +69
    -69
      smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProviderTest.java
  91. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
  92. +11
    -11
      smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
  93. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
  94. +2
    -2
      smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java
  95. +1
    -1
      smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java
  96. +3
    -3
      smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
  97. +7
    -7
      smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
  98. +3
    -3
      smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
  99. +3
    -3
      smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
  100. +4
    -4
      smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java

+ 1
- 0
build.gradle View File

@@ -267,6 +267,7 @@ subprojects {

checkstyle {
configFile = new File(rootConfigDir, 'checkstyle.xml')
toolVersion = '7.7'
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'


+ 70
- 0
config/checkstyle.xml View File

@@ -117,5 +117,75 @@
, INDEX_OP
"/>
</module>
<module name="WhitespaceAfter">
<property name="tokens" value="TYPECAST
, LITERAL_IF
, LITERAL_ELSE
, LITERAL_WHILE
, LITERAL_DO
, LITERAL_FOR
, DO_WHILE
"/>
</module>
<module name="WhitespaceAround">
<property
name="ignoreEnhancedForColon"
value="false"
/>
<!-- Currently disabled tokens: LCURLY, RCURLY, WILDCARD_TYPE, GENERIC_START, GENERIC_END -->
<property
name="tokens"
value="ASSIGN
, ARRAY_INIT
, BAND
, BAND_ASSIGN
, BOR
, BOR_ASSIGN
, BSR
, BSR_ASSIGN
, BXOR
, BXOR_ASSIGN
, COLON
, DIV
, DIV_ASSIGN
, DO_WHILE
, EQUAL
, GE
, GT
, LAMBDA
, LAND
, LE
, LITERAL_CATCH
, LITERAL_DO
, LITERAL_ELSE
, LITERAL_FINALLY
, LITERAL_FOR
, LITERAL_IF
, LITERAL_RETURN
, LITERAL_SWITCH
, LITERAL_SYNCHRONIZED
, LITERAL_TRY
, LITERAL_WHILE
, LOR
, LT
, MINUS
, MINUS_ASSIGN
, MOD
, MOD_ASSIGN
, NOT_EQUAL
, PLUS
, PLUS_ASSIGN
, QUESTION
, SL
, SLIST
, SL_ASSIGN
, SR
, SR_ASSIGN
, STAR
, STAR_ASSIGN
, LITERAL_ASSERT
, TYPE_EXTENSION_AND
"/>
</module>
</module>
</module>

+ 1
- 1
smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java View File

@@ -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() {


+ 7
- 6
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java View File

@@ -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) {


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java View File

@@ -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");


+ 3
- 3
smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java View File

@@ -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) {


+ 2
- 2
smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java View File

@@ -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<String> mechs) {
for(String mech : mechs) {
for (String mech : mechs) {
addSaslMech(mech);
}
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java View File

@@ -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";
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java View File

@@ -79,7 +79,7 @@ public class SynchronizationPoint<E extends Exception> {
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");


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractListFilter.java View File

@@ -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<StanzaFilter>(Arrays.asList(filters));


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java View File

@@ -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("");
}
}


+ 2
- 2
smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java View File

@@ -488,7 +488,7 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
// 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<Message> {
// 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());


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java View File

@@ -120,7 +120,7 @@ public final class StandardExtensionElement implements ExtensionElement {
}

public List<StandardExtensionElement> getElements() {
if (elements == null){
if (elements == null) {
return Collections.emptyList();
}
return elements.values();


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java View File

@@ -23,7 +23,7 @@ import org.xmlpull.v1.XmlPullParser;

public abstract class Provider<E extends Element> {

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);



+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java View File

@@ -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);
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java View File

@@ -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)


+ 28
- 28
smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java View File

@@ -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<len)
int len = 6;
int s = 0;
while (s < len)
{
int i=in.read(buf, s, len-s);
if(i<=0)
int i = in.read(buf, s, len - s);
if (i <= 0)
{
throw new ProxyException(ProxyInfo.ProxyType.SOCKS4,
"stream is closed");
}
s+=i;
s += i;
}
if(buf[0]!=0)
if (buf[0] != 0)
{
throw new ProxyException(ProxyInfo.ProxyType.SOCKS4,
"server returns VN "+buf[0]);
"server returns VN " + buf[0]);
}
if(buf[1]!=90)
if (buf[1] != 90)
{
try
{
socket.close();
}
catch(Exception eee)
catch (Exception eee)
{
}
String message="ProxySOCKS4: server returns CD "+buf[1];
throw new ProxyException(ProxyInfo.ProxyType.SOCKS4,message);
String message = "ProxySOCKS4: server returns CD " + buf[1];
throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, message);
}
byte[] temp = new byte[2];
in.read(temp, 0, 2);
}
catch(RuntimeException e)
catch (RuntimeException e)
{
throw e;
}
catch(Exception e)
catch (Exception e)
{
try
{
socket.close();
}
catch(Exception eee)
catch (Exception eee)
{
}
throw new ProxyException(ProxyInfo.ProxyType.SOCKS4, e.toString());


+ 46
- 46
smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java View File

@@ -50,13 +50,13 @@ public class Socks5ProxySocketConnection 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;

/*
+----+----------+----------+
@@ -79,11 +79,11 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
o X'FF' NO ACCEPTABLE METHODS
*/

buf[index++]=5;
buf[index++] = 5;

buf[index++]=2;
buf[index++]=0; // NO AUTHENTICATION REQUIRED
buf[index++]=2; // USERNAME/PASSWORD
buf[index++] = 2;
buf[index++] = 0; // NO AUTHENTICATION REQUIRED
buf[index++] = 2; // USERNAME/PASSWORD

out.write(buf, 0, index);

@@ -100,14 +100,14 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
//in.read(buf, 0, 2);
fill(in, buf, 2);

boolean check=false;
switch((buf[1])&0xff)
boolean check = false;
switch ((buf[1]) & 0xff)
{
case 0: // NO AUTHENTICATION REQUIRED
check=true;
check = true;
break;
case 2: // USERNAME/PASSWORD
if(user==null || passwd==null)
if (user == null || passwd == null)
{
break;
}
@@ -131,18 +131,18 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
PASSWD field that follows. The PASSWD field contains the password
association with the given UNAME.
*/
index=0;
buf[index++]=1;
buf[index++]=(byte)(user.length());
index = 0;
buf[index++] = 1;
buf[index++] = (byte) (user.length());
byte[] userBytes = user.getBytes(StringUtils.UTF8);
System.arraycopy(userBytes, 0, buf, index,
user.length());
index+=user.length();
index += user.length();
byte[] passwordBytes = user.getBytes(StringUtils.UTF8);
buf[index++]=(byte)(passwordBytes.length);
buf[index++] = (byte) (passwordBytes.length);
System.arraycopy(passwordBytes, 0, buf, index,
passwd.length());
index+=passwd.length();
index += passwd.length();

out.write(buf, 0, index);

@@ -162,21 +162,21 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
*/
//in.read(buf, 0, 2);
fill(in, buf, 2);
if(buf[1]==0)
if (buf[1] == 0)
{
check=true;
check = true;
}
break;
default:
}

if(!check)
if (!check)
{
try
{
socket.close();
}
catch(Exception eee)
catch (Exception eee)
{
}
throw new ProxyException(ProxyInfo.ProxyType.SOCKS5,
@@ -209,19 +209,19 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
order
*/

index=0;
buf[index++]=5;
buf[index++]=1; // CONNECT
buf[index++]=0;
index = 0;
buf[index++] = 5;
buf[index++] = 1; // CONNECT
buf[index++] = 0;

byte[] hostb= host.getBytes(StringUtils.UTF8);
int len=hostb.length;
buf[index++]=3; // DOMAINNAME
buf[index++]=(byte)(len);
byte[] hostb = host.getBytes(StringUtils.UTF8);
int len = hostb.length;
buf[index++] = 3; // DOMAINNAME
buf[index++] = (byte) (len);
System.arraycopy(hostb, 0, buf, index, len);
index+=len;
buf[index++]=(byte)(port>>>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<len)
int s = 0;
while (s < len)
{
int i=in.read(buf, s, len-s);
if(i<=0)
int i = in.read(buf, s, len - s);
if (i <= 0)
{
throw new ProxyException(ProxyInfo.ProxyType.SOCKS5, "stream " +
"is closed");
}
s+=i;
s += i;
}
}



+ 2
- 2
smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java View File

@@ -164,7 +164,7 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
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<SASLMechanism> {
this.serviceName = serviceName;
this.authorizationId = authzid;
this.sslSession = sslSession;
assert(authorizationId == null || authzidSupported());
assert (authorizationId == null || authzidSupported());
authenticateInternal(cbh);
authenticate();
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java View File

@@ -232,7 +232,7 @@ public abstract class ScramMechanism extends SASLMechanism {
}

String cbName = getChannelBindingName();
assert(StringUtils.isNotEmpty(cbName));
assert (StringUtils.isNotEmpty(cbName));

return cbName + ',' + authzidPortion + ",";
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java View File

@@ -81,7 +81,7 @@ public class EventManger<K, R, E extends Exception> {
return false;
}
reference.eventResult = eventResult;
synchronized(reference) {
synchronized (reference) {
reference.notifyAll();
}
return true;


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java View File

@@ -143,7 +143,7 @@ public class MultiMap<K,V> {
if (res == null) {
return null;
}
assert(!res.isEmpty());
assert (!res.isEmpty());
return res.iterator().next();
}



+ 9
- 9
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java View File

@@ -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);
}


+ 2
- 2
smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java View File

@@ -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)


+ 6
- 6
smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java View File

@@ -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<randBuffer.length; i++) {
for (int i = 0; i < randBuffer.length; i++) {
randBuffer[i] = numbersAndLetters[random.nextInt(numbersAndLetters.length)];
}
return new String(randBuffer);
@@ -336,7 +336,7 @@ public class StringUtils {
}

private static char getPrintableChar(byte indexByte) {
assert(numbersAndLetters.length < Byte.MAX_VALUE * 2);
assert (numbersAndLetters.length < Byte.MAX_VALUE * 2);

// Convert indexByte as it where an unsigned byte by promoting it to int
// and masking it with 0xff. Yields results from 0 - 254.


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java View File

@@ -172,7 +172,7 @@ public class XmlStringBuilder implements Appendable, CharSequence {
}

public XmlStringBuilder halfOpenElement(String name) {
assert(StringUtils.isNotEmpty(name));
assert (StringUtils.isNotEmpty(name));
sb.append('<').append(name);
return this;
}


+ 1
- 1
smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java View File

@@ -89,7 +89,7 @@ public class HostAddress {

public void setException(InetAddress inetAddress, Exception exception) {
Exception old = exceptions.put(inetAddress, exception);
assert(old == null);
assert (old == null);
}

/**


+ 3
- 3
smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java View File

@@ -31,7 +31,7 @@ public class StanzaCollectorTest
{
TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5);

for (int i=0; i<6; i++)
for (int i = 0; i < 6; i++)
{
Stanza testPacket = new TestPacket(i);
collector.processStanza(testPacket);
@@ -45,7 +45,7 @@ public class StanzaCollectorTest
assertEquals("5", collector.pollResult().getStanzaId());
assertNull(collector.pollResult());

for (int i=10; i<15; i++)
for (int i = 10; i < 15; i++)
{
Stanza testPacket = new TestPacket(i);
collector.processStanza(testPacket);
@@ -156,7 +156,7 @@ public class StanzaCollectorTest
consumer2.start();
consumer3.start();

for(int i=0; i<insertCount; i++)
for (int i = 0; i < insertCount; i++)
{
collector.processStanza(new TestPacket(i));
}


+ 1
- 1
smack-core/src/test/java/org/jivesoftware/smack/filter/FilterToStringTest.java View File

@@ -29,7 +29,7 @@ public class FilterToStringTest {
andFilter.addFilter(new ThreadFilter("42"));
andFilter.addFilter(MessageWithBodiesFilter.INSTANCE);

final String res =andFilter.toString();
final String res = andFilter.toString();
assertEquals("AndFilter: (StanzaIdFilter: id=foo, ThreadFilter: thread=42, MessageWithBodiesFilter)", res);
}
}

+ 1
- 1
smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java View File

@@ -64,7 +64,7 @@ public class MessageTest {
assertXMLEqual(control, messageTypeSet.toXML().toString());
}

@Test(expected=NullPointerException.class)
@Test(expected = NullPointerException.class)
public void setNullMessageBodyTest() {
Message message = getNewMessage();
message.addBody(null, null);


+ 2
- 2
smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java View File

@@ -60,7 +60,7 @@ public class PresenceTest {
assertXMLEqual(control, presenceTypeSet.toXML().toString());
}

@Test(expected=NullPointerException.class)
@Test(expected = NullPointerException.class)
public void setNullPresenceTypeTest() {
getNewPresence().setType(null);
}
@@ -113,7 +113,7 @@ public class PresenceTest {
assertXMLEqual(control, presence.toXML().toString());
}

@Test(expected=IllegalArgumentException.class)
@Test(expected = IllegalArgumentException.class)
public void setIllegalPriorityTest() {
getNewPresence().setPriority(Integer.MIN_VALUE);
}


+ 1
- 1
smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java View File

@@ -54,7 +54,7 @@ public class ProviderConfigTest {
}

@Test
public void addClasspathFileLoaderProvider() throws Exception{
public void addClasspathFileLoaderProvider() throws Exception {
ProviderManager.addLoader(new ProviderFileLoader(FileUtils.getStreamForUrl("classpath:test.providers", null)));
Assert.assertNotNull(ProviderManager.getIQProvider("provider", "test:file_provider"));
}


+ 1
- 1
smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java View File

@@ -29,7 +29,7 @@ public class ProviderManagerTest {
* This test should be run in a clean (e.g. forked) VM
*/
@Test
public void shouldInitializeSmackTest() throws Exception{
public void shouldInitializeSmackTest() throws Exception {
ProviderManager.addIQProvider("foo", "bar", new TestIQProvider());
assertTrue(SmackConfiguration.isSmackInitialized());
}


+ 2
- 1
smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java View File

@@ -17,6 +17,7 @@
package org.jivesoftware.smack.sasl;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.UnsupportedEncodingException;
import java.util.HashMap;
@@ -57,7 +58,7 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
if (useAuthzid) {
assertMapValue("authzid", "shazbat@xmpp.org", responsePairs);
} else {
assert(!responsePairs.containsKey("authzid"));
assertTrue (!responsePairs.containsKey("authzid"));
}
assertMapValue("username", "florian", responsePairs);
assertMapValue("realm", "xmpp.org", responsePairs);


+ 4
- 4
smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java View File

@@ -664,7 +664,7 @@ public class PacketParserUtilsTest {
*
* @throws Exception
*/
@Test(expected=XmlPullParserException.class)
@Test(expected = XmlPullParserException.class)
public void invalidMessageBodyContainingTagTest() throws Exception {
String control = XMLBuilder.create("message")
.a("from", "romeo@montague.lit/orchard")
@@ -701,7 +701,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 </span>"));
}

@@ -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 </body>"));
}

@@ -719,7 +719,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 </message>"));
}



+ 1
- 1
smack-core/src/test/java/org/jivesoftware/smack/util/SHA1Test.java View File

@@ -70,7 +70,7 @@ public class SHA1Test {
*/
private boolean isValidHash(String result) {
boolean valid = true;
for (int i=0; i<result.length(); i++) {
for (int i = 0; i < result.length(); i++) {
char c = result.charAt(i);
if (HASH_CHARS.indexOf(c) < 0) {
valid = false;


+ 6
- 6
smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java View File

@@ -263,7 +263,7 @@ public class EnhancedDebugger implements SmackDebugger {

}
@Override
public void reconnectingIn(final int seconds){
public void reconnectingIn(final int seconds) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@@ -301,7 +301,7 @@ public class EnhancedDebugger implements SmackDebugger {

messagesTable =
new DefaultTableModel(
new Object[]{"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},
new Object[] {"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},
0) {
// CHECKSTYLE:OFF
private static final long serialVersionUID = 8136121224474217264L;
@@ -735,9 +735,9 @@ public class EnhancedDebugger implements SmackDebugger {
packetsPanel.setBorder(BorderFactory.createTitledBorder("Transmitted Packets"));

statisticsTable =
new DefaultTableModel(new Object[][]{{"IQ", 0, 0}, {"Message", 0, 0},
new DefaultTableModel(new Object[][] { {"IQ", 0, 0}, {"Message", 0, 0},
{"Presence", 0, 0}, {"Other", 0, 0}, {"Total", 0, 0}},
new Object[]{"Type", "Received", "Sent"}) {
new Object[] {"Type", "Received", "Sent"}) {
// CHECKSTYLE:OFF
private static final long serialVersionUID = -6793886085109589269L;
@Override
@@ -878,7 +878,7 @@ public class EnhancedDebugger implements SmackDebugger {
}

messagesTable.addRow(
new Object[]{
new Object[] {
formatXML(packet.toXML().toString()),
dateFormatter.format(new Date()),
packetReceivedIcon,
@@ -940,7 +940,7 @@ public class EnhancedDebugger implements SmackDebugger {
}

messagesTable.addRow(
new Object[]{
new Object[] {
formatXML(packet.toXML().toString()),
dateFormatter.format(new Date()),
packetSentIcon,


+ 4
- 4
smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java View File

@@ -289,8 +289,8 @@ public class LiteDebugger implements SmackDebugger {
*/
public void rootWindowClosing(WindowEvent evt) {
connection.removeAsyncStanzaListener(listener);
((ObservableReader)reader).removeReaderListener(readerListener);
((ObservableWriter)writer).removeWriterListener(writerListener);
((ObservableReader) reader).removeReaderListener(readerListener);
((ObservableWriter) writer).removeWriterListener(writerListener);
}

/**
@@ -322,7 +322,7 @@ public class LiteDebugger implements SmackDebugger {

@Override
public Reader newConnectionReader(Reader newReader) {
((ObservableReader)reader).removeReaderListener(readerListener);
((ObservableReader) reader).removeReaderListener(readerListener);
ObservableReader debugReader = new ObservableReader(newReader);
debugReader.addReaderListener(readerListener);
reader = debugReader;
@@ -331,7 +331,7 @@ public class LiteDebugger implements SmackDebugger {

@Override
public Writer newConnectionWriter(Writer newWriter) {
((ObservableWriter)writer).removeWriterListener(writerListener);
((ObservableWriter) writer).removeWriterListener(writerListener);
ObservableWriter debugWriter = new ObservableWriter(newWriter);
debugWriter.addWriterListener(writerListener);
writer = debugWriter;


+ 1
- 1
smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java View File

@@ -123,7 +123,7 @@ public final class CarbonManager extends Manager {
// also reset here.
enabled_state = false;
boolean removed = connection().removeSyncStanzaListener(carbonsListener);
assert(removed);
assert (removed);
}
@Override
public void authenticated(XMPPConnection connection, boolean resumed) {


+ 1
- 1
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java View File

@@ -121,7 +121,7 @@ public final class HttpFileUploadManager extends Manager {
}

private static UploadService uploadServiceFrom(DiscoverInfo discoverInfo) {
assert(containsHttpFileUploadNamespace(discoverInfo));
assert (containsHttpFileUploadNamespace(discoverInfo));

UploadService.Version version;
if (discoverInfo.containsFeature(NAMESPACE)) {


+ 2
- 2
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java View File

@@ -34,13 +34,13 @@ public class FileTooLargeErrorProvider extends ExtensionElementProvider<FileTooL
final String namespace = parser.getNamespace();
Long maxFileSize = null;

outerloop: while(true) {
outerloop: while (true) {
int event = parser.next();

switch (event) {
case XmlPullParser.START_TAG:
String name = parser.getName();
switch(name) {
switch (name) {
case "max-file-size":
maxFileSize = Long.valueOf(parser.nextText());
break;


+ 1
- 1
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java View File

@@ -50,7 +50,7 @@ public class SlotProvider extends IQProvider<Slot> {
switch (event) {
case XmlPullParser.START_TAG:
String name = parser.getName();
switch(name) {
switch (name) {
case "put":
putUrl = new URL(parser.nextText());
break;


+ 1
- 1
smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java View File

@@ -94,7 +94,7 @@ public class CarbonTest extends ExperimentalInitializerTest {
assertEquals("received", parser.getName());
}

@Test(expected=Exception.class)
@Test(expected = Exception.class)
public void carbonEmptyTest() throws Exception {
XmlPullParser parser;
String control;


+ 1
- 1
smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java View File

@@ -27,7 +27,7 @@ public class MUCLightDestroyTest {
+ "<query xmlns='urn:xmpp:muclight:0#destroy'/>" + "</iq>";

@Test
public void checkDestroyMUCLightStanza() throws Exception{
public void checkDestroyMUCLightStanza() throws Exception {
MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(JidCreate.from("coven@muclight.shakespeare.lit"));
mucLightDestroyIQ.setStanzaId("destroy1");
Assert.assertEquals(mucLightDestroyIQ.toXML().toString(), stanza);


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java View File

@@ -84,7 +84,7 @@ public class ServiceAdministrationManager extends Manager {
passwordVerifyField.addValue(password);

command.next(answerForm);
assert(command.isCompleted());
assert (command.isCompleted());
}

public RemoteCommand deleteUser() {
@@ -112,6 +112,6 @@ public class ServiceAdministrationManager extends Manager {
accountJids.addValues(JidUtil.toStringList(jidsToDelete));

command.next(answerForm);
assert(command.isCompleted());
assert (command.isCompleted());
}
}

+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java View File

@@ -228,7 +228,7 @@ public class AMPExtension implements ExtensionElement {
String getName();
String getValue();

static final String ATTRIBUTE_NAME="condition";
static final String ATTRIBUTE_NAME = "condition";
}

/**
@@ -265,7 +265,7 @@ public class AMPExtension implements ExtensionElement {
*/
notify;

public static final String ATTRIBUTE_NAME="action";
public static final String ATTRIBUTE_NAME = "action";
}

/**


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBData.java View File

@@ -82,7 +82,7 @@ public class BoBData {

private void setContentBinaryIfRequired() {
if (contentBinary == null) {
assert(StringUtils.isNotEmpty(contentString));
assert (StringUtils.isNotEmpty(contentString));
contentBinary = Base64.decode(contentString);
}
}


+ 12
- 12
smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java View File

@@ -118,9 +118,9 @@ public final class BookmarkManager {
BookmarkedConference bookmark
= new BookmarkedConference(name, jid, isAutoJoin, nickname, password);
List<BookmarkedConference> conferences = bookmarks.getBookmarkedConferences();
if(conferences.contains(bookmark)) {
if (conferences.contains(bookmark)) {
BookmarkedConference oldConference = conferences.get(conferences.indexOf(bookmark));
if(oldConference.isShared()) {
if (oldConference.isShared()) {
throw new IllegalArgumentException("Cannot modify shared bookmark");
}
oldConference.setAutoJoin(isAutoJoin);
@@ -149,10 +149,10 @@ public final class BookmarkManager {
public void removeBookmarkedConference(EntityBareJid jid) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
retrieveBookmarks();
Iterator<BookmarkedConference> it = bookmarks.getBookmarkedConferences().iterator();
while(it.hasNext()) {
while (it.hasNext()) {
BookmarkedConference conference = it.next();
if(conference.getJid().equals(jid)) {
if(conference.isShared()) {
if (conference.getJid().equals(jid)) {
if (conference.isShared()) {
throw new IllegalArgumentException("Conference is shared and can't be removed");
}
it.remove();
@@ -192,9 +192,9 @@ public final class BookmarkManager {
retrieveBookmarks();
BookmarkedURL bookmark = new BookmarkedURL(URL, name, isRSS);
List<BookmarkedURL> urls = bookmarks.getBookmarkedURLS();
if(urls.contains(bookmark)) {
if (urls.contains(bookmark)) {
BookmarkedURL oldURL = urls.get(urls.indexOf(bookmark));
if(oldURL.isShared()) {
if (oldURL.isShared()) {
throw new IllegalArgumentException("Cannot modify shared bookmarks");
}
oldURL.setName(name);
@@ -219,10 +219,10 @@ public final class BookmarkManager {
public void removeBookmarkedURL(String bookmarkURL) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
retrieveBookmarks();
Iterator<BookmarkedURL> it = bookmarks.getBookmarkedURLS().iterator();
while(it.hasNext()) {
while (it.hasNext()) {
BookmarkedURL bookmark = it.next();
if(bookmark.getURL().equalsIgnoreCase(bookmarkURL)) {
if(bookmark.isShared()) {
if (bookmark.getURL().equalsIgnoreCase(bookmarkURL)) {
if (bookmark.isShared()) {
throw new IllegalArgumentException("Cannot delete a shared bookmark.");
}
it.remove();
@@ -249,8 +249,8 @@ public final class BookmarkManager {
}

private Bookmarks retrieveBookmarks() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
synchronized(bookmarkLock) {
if(bookmarks == null) {
synchronized (bookmarkLock) {
if (bookmarks == null) {
bookmarks = (Bookmarks) privateDataManager.getPrivateData("storage",
"storage:bookmarks");
}


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java View File

@@ -115,10 +115,10 @@ public class BookmarkedConference implements SharedBookmark {

@Override
public boolean equals(Object obj) {
if(obj == null || !(obj instanceof BookmarkedConference)) {
if (obj == null || !(obj instanceof BookmarkedConference)) {
return false;
}
BookmarkedConference conference = (BookmarkedConference)obj;
BookmarkedConference conference = (BookmarkedConference) obj;
return conference.getJid().equals(jid);
}



+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java View File

@@ -86,10 +86,10 @@ public class BookmarkedURL implements SharedBookmark {

@Override
public boolean equals(Object obj) {
if(!(obj instanceof BookmarkedURL)) {
if (!(obj instanceof BookmarkedURL)) {
return false;
}
BookmarkedURL url = (BookmarkedURL)obj;
BookmarkedURL url = (BookmarkedURL) obj;
return url.getURL().equalsIgnoreCase(URL);
}



+ 4
- 4
smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java View File

@@ -177,7 +177,7 @@ public class Bookmarks implements PrivateData {
buf.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket();

for (BookmarkedURL urlStorage : getBookmarkedURLS()) {
if(urlStorage.isShared()) {
if (urlStorage.isShared()) {
continue;
}
buf.halfOpenElement("url").attribute("name", urlStorage.getName()).attribute("url", urlStorage.getURL());
@@ -187,7 +187,7 @@ public class Bookmarks implements PrivateData {

// Add Conference additions
for (BookmarkedConference conference : getBookmarkedConferences()) {
if(conference.isShared()) {
if (conference.isShared()) {
continue;
}
buf.halfOpenElement("conference");
@@ -260,7 +260,7 @@ public class Bookmarks implements PrivateData {
boolean done = false;
while (!done) {
int eventType = parser.next();
if(eventType == XmlPullParser.START_TAG
if (eventType == XmlPullParser.START_TAG
&& "shared_bookmark".equals(parser.getName())) {
urlStore.setShared(true);
}
@@ -291,7 +291,7 @@ public class Bookmarks implements PrivateData {
else if (eventType == XmlPullParser.START_TAG && "password".equals(parser.getName())) {
conf.setPassword(parser.nextText());
}
else if(eventType == XmlPullParser.START_TAG
else if (eventType == XmlPullParser.START_TAG
&& "shared_bookmark".equals(parser.getName())) {
conf.setShared(true);
}


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java View File

@@ -64,7 +64,7 @@ class DataListener extends AbstractIqRequestHandler {
ibbSession.processIQPacket(data);
}
}
catch (NotConnectedException|InterruptedException e) {
catch (NotConnectedException | InterruptedException e) {
return null;
}
return null;


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java View File

@@ -415,7 +415,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
*/
@Override
public Socks5BytestreamSession establishSession(Jid targetJID, String sessionID)
throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException{
throws IOException, InterruptedException, NoResponseException, SmackException, XMPPException {
XMPPConnection connection = connection();
XMPPErrorException discoveryException = null;
// check if target supports SOCKS5 Bytestream
@@ -556,7 +556,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
try {
proxyInfo = serviceDiscoveryManager.discoverInfo(item.getEntityID());
}
catch (NoResponseException|XMPPErrorException e) {
catch (NoResponseException | XMPPErrorException e) {
// blacklist errornous server
proxyBlacklist.add(item.getEntityID());
continue;


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java View File

@@ -280,7 +280,7 @@ public final class Socks5Proxy {
* @return true if the address was removed.
*/
public boolean removeLocalAddress(String address) {
synchronized(localAddresses) {
synchronized (localAddresses) {
return localAddresses.remove(address);
}
}
@@ -311,7 +311,7 @@ public final class Socks5Proxy {
if (addresses == null) {
throw new IllegalArgumentException("list must not be null");
}
synchronized(localAddresses) {
synchronized (localAddresses) {
localAddresses.clear();
localAddresses.addAll(addresses);
}


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java View File

@@ -224,7 +224,7 @@ public class Bytestream extends IQ {

@Override
protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
switch(getType()) {
switch (getType()) {
case set:
xml.optAttribute("sid", getSessionID());
xml.optAttribute("mode", getMode());


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java View File

@@ -717,7 +717,7 @@ public final class EntityCapsManager extends Manager {
throw new AssertionError(e);
}
byte[] digest;
synchronized(md) {
synchronized (md) {
digest = md.digest(bytes);
}
String version = Base64.encodeToString(digest);


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java View File

@@ -105,10 +105,10 @@ public final class ChatStateManager extends Manager {
* @throws InterruptedException
*/
public void setCurrentState(ChatState newState, org.jivesoftware.smack.chat.Chat chat) throws NotConnectedException, InterruptedException {
if(chat == null || newState == null) {
if (chat == null || newState == null) {
throw new IllegalArgumentException("Arguments cannot be null.");
}
if(!updateChatState(chat, newState)) {
if (!updateChatState(chat, newState)) {
return;
}
Message message = new Message();


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java View File

@@ -140,7 +140,7 @@ public final class ServiceDiscoveryManager extends Manager {
response.addItems(nodeInformationProvider.getNodeItems());
// Add packet extensions
response.addExtensions(nodeInformationProvider.getNodePacketExtensions());
} else if(discoverItems.getNode() != null) {
} else if (discoverItems.getNode() != null) {
// Return <item-not-found/> error since client doesn't contain
// the specified node
response.setType(IQ.Type.error);
@@ -761,7 +761,7 @@ public final class ServiceDiscoveryManager extends Manager {
try {
// Get the disco items and send the disco packet to each server item
items = discoverItems(serviceName);
} catch(XMPPErrorException e) {
} catch (XMPPErrorException e) {
LOGGER.log(Level.WARNING, "Could not discover items about service", e);
return serviceDiscoInfo;
}


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java View File

@@ -74,7 +74,7 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
if (parser.getName().equals("feature")) {
// Create a new feature and add it to the discovered info.
boolean notADuplicateFeature = discoverInfo.addFeature(variable);
assert(notADuplicateFeature);
assert (notADuplicateFeature);
}
if (parser.getName().equals("query")) {
done = true;


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java View File

@@ -73,7 +73,7 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
private StreamNegotiator determineNegotiator(Stanza streamInitiation) {
if (streamInitiation instanceof Bytestream) {
return primaryNegotiator;
} else if (streamInitiation instanceof Open){
} else if (streamInitiation instanceof Open) {
return secondaryNegotiator;
} else {
throw new IllegalStateException("Unknown stream initation type");


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java View File

@@ -308,7 +308,7 @@ public abstract class FileTransfer {
* Return the length of bytes written out to the stream.
* @return the amount in bytes written out.
*/
public long getAmountWritten(){
public long getAmountWritten() {
return amountWritten;
}



+ 5
- 5
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java View File

@@ -162,7 +162,7 @@ public class OutgoingFileTransfer extends FileTransfer {
final long fileSize, final String description,
final NegotiationProgress progress)
{
if(progress == null) {
if (progress == null) {
throw new IllegalArgumentException("Callback progress cannot be null.");
}
checkTransferThread();
@@ -295,7 +295,7 @@ public class OutgoingFileTransfer extends FileTransfer {
* @param fileSize the size of the file that is transferred
* @param description a description for the file to transfer.
*/
public synchronized void sendStream(final InputStream in, final String fileName, final long fileSize, final String description){
public synchronized void sendStream(final InputStream in, final String fileName, final long fileSize, final String description) {
checkTransferThread();

setFileInfo(fileName, fileSize);
@@ -409,7 +409,7 @@ public class OutgoingFileTransfer extends FileTransfer {
@Override
protected boolean updateStatus(Status oldStatus, Status newStatus) {
boolean isUpdated = super.updateStatus(oldStatus, newStatus);
if(callback != null && isUpdated) {
if (callback != null && isUpdated) {
callback.statusUpdated(oldStatus, newStatus);
}
return isUpdated;
@@ -419,7 +419,7 @@ public class OutgoingFileTransfer extends FileTransfer {
protected void setStatus(Status status) {
Status oldStatus = getStatus();
super.setStatus(status);
if(callback != null) {
if (callback != null) {
callback.statusUpdated(oldStatus, status);
}
}
@@ -427,7 +427,7 @@ public class OutgoingFileTransfer extends FileTransfer {
@Override
protected void setException(Exception exception) {
super.setException(exception);
if(callback != null) {
if (callback != null) {
callback.errorEstablishingStream(exception);
}
}


+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java View File

@@ -112,10 +112,10 @@ public class Occupant {

@Override
public boolean equals(Object obj) {
if(!(obj instanceof Occupant)) {
if (!(obj instanceof Occupant)) {
return false;
}
Occupant occupant = (Occupant)obj;
Occupant occupant = (Occupant) obj;
return jid.equals(occupant.jid);
}



+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java View File

@@ -247,7 +247,7 @@ public class MUCUser implements ExtensionElement {
* @author Gaston Dombiak
*/
public static class Invite implements NamedElement {
public static final String ELEMENT ="invite";
public static final String ELEMENT = "invite";

private final String reason;



+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java View File

@@ -95,9 +95,9 @@ public final class PEPManager extends Manager {
public void processStanza(Stanza stanza) {
Message message = (Message) stanza;
EventElement event = EventElement.from(stanza);
assert(event != null);
assert (event != null);
EntityBareJid from = message.getFrom().asEntityBareJidIfPossible();
assert(from != null);
assert (from != null);
for (PEPListener listener : pepListeners) {
listener.eventReceived(from, event, message);
}


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java View File

@@ -575,7 +575,7 @@ public final class PrivacyListManager extends Manager {
* @throws NotConnectedException
* @throws InterruptedException
*/
public boolean isSupported() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException{
public boolean isSupported() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
return ServiceDiscoveryManager.getInstanceFor(connection()).serverSupportsFeature(NAMESPACE);
}
}

+ 2
- 2
smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java View File

@@ -46,11 +46,11 @@ public class Privacy extends IQ {
public static final String NAMESPACE = "jabber:iq:privacy";

/** declineActiveList is true when the user declines the use of the active list **/
private boolean declineActiveList=false;
private boolean declineActiveList = false;
/** activeName is the name associated with the active list set for the session **/
private String activeName;
/** declineDefaultList is true when the user declines the use of the default list **/
private boolean declineDefaultList=false;
private boolean declineDefaultList = false;
/** defaultName is the name of the default list that applies to the user as a whole **/
private String defaultName;
/** itemLists holds the set of privacy items classified in lists. It is a map where the


+ 1
- 1
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java View File

@@ -139,7 +139,7 @@ public class Affiliation implements ExtensionElement
*/
public boolean isAffiliationModification() {
if (jid != null && affiliation != null) {
assert(node == null && namespace == PubSubNamespace.OWNER);