More checkstyle whitespace related checks

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'

config/checkstyle.xml

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

smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java

@@ -895,7 +895,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                         continue;
                     }
                 }
-            }});
+            }
+        });
     }
 
     @Override

smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java

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

smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java

@@ -608,9 +608,7 @@ abstract public class Node
         @SuppressWarnings({ "rawtypes", "unchecked" })
         public void processStanza(Stanza packet)
         {
-// CHECKSTYLE:OFF
             EventElement event = (EventElement) packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
-// CHECKSTYLE:ON
             ItemsExtension itemsElem = (ItemsExtension) event.getEvent();
             ItemPublishEvent eventItems = new ItemPublishEvent(itemsElem.getNode(), itemsElem.getItems(), getSubscriptionIds(packet), DelayInformationManager.getDelayTimestamp(packet));
             listener.handlePublishedItems(eventItems);

smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/ParseStreamManagement.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014 Florian Schmaus
+ * Copyright © 2014-2017 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.