Add Checkstyle WhitespaceAround

Author: garydgregory

src/conf/checkstyle.xml

@@ -78,5 +78,6 @@ limitations under the License.
     <module name="UnnecessaryParentheses" />
     <module name="UnusedImports" />
     <module name="WhitespaceAfter" />
+    <module name="WhitespaceAround" />
   </module>
 </module>

src/main/java/org/apache/commons/io/FilenameUtils.java

@@ -413,7 +413,7 @@ private static String doNormalize(final String fileName, final char separator, f
                     lastIsDirectory = true;
                 }
                 System.arraycopy(array, i + 1, array, i - 1, size - i);
-                size -=2;
+                size -= 2;
                 i--;
             }
         }
@@ -1547,7 +1547,7 @@ static String[] splitOnTokens(final String text) {
                 }
                 if (ch == '?') {
                     list.add("?");
-                } else if (prevChar != '*') {// ch == '*' here; check if previous char was '*'
+                } else if (prevChar != '*') { // ch == '*' here; check if previous char was '*'
                     list.add("*");
                 }
             } else {

src/main/java/org/apache/commons/io/function/Constants.java

@@ -26,12 +26,16 @@ final class Constants {
      * No-op singleton.
      */
     @SuppressWarnings("rawtypes")
-    static final IOBiConsumer IO_BI_CONSUMER = (t, u) -> {/* No-op */};
+    static final IOBiConsumer IO_BI_CONSUMER = (t, u) -> {
+        // noop
+    };
 
     /**
      * No-op singleton.
      */
-    static final IORunnable IO_RUNNABLE = () -> {/* No-op */};
+    static final IORunnable IO_RUNNABLE = () -> {
+        // noop
+    };
 
     /**
      * No-op singleton.
@@ -59,7 +63,9 @@ final class Constants {
      * No-op singleton.
      */
     @SuppressWarnings("rawtypes")
-    static final IOTriConsumer IO_TRI_CONSUMER = (t, u, v) -> {/* No-op */};
+    static final IOTriConsumer IO_TRI_CONSUMER = (t, u, v) -> {
+        // noop
+    };
 
     private Constants() {
         // We don't want instances

src/main/java/org/apache/commons/io/function/IOConsumer.java

@@ -38,7 +38,9 @@ public interface IOConsumer<T> {
     /**
      * Consider private.
      */
-    IOConsumer<?> NOOP_IO_CONSUMER = t -> {/* noop */};
+    IOConsumer<?> NOOP_IO_CONSUMER = t -> {
+        // noop
+    };
 
     /**
      * Performs an action for each element of the collection gathering any exceptions.

src/main/java/org/apache/commons/io/function/IOIntConsumer.java

@@ -34,7 +34,9 @@ public interface IOIntConsumer {
     /**
      * The constant no-op consumer.
      */
-    IOIntConsumer NOOP = i -> {/* noop */};
+    IOIntConsumer NOOP = i -> {
+        // noop
+    };
 
     /**
      * Performs this operation on the given argument.

src/test/java/org/apache/commons/io/FileUtilsTest.java

@@ -193,7 +193,9 @@ private void backDateFile10Minutes(final File testFile) throws IOException {
 
     private void consumeRemaining(final Iterator<File> iterator) {
         if (iterator != null) {
-            iterator.forEachRemaining(e -> {});
+            iterator.forEachRemaining(e -> {
+                // noop
+            });
         }
     }
 

src/test/java/org/apache/commons/io/IOUtilsTest.java

@@ -1528,7 +1528,7 @@ public void testToByteArray_InputStream_SizeOne() throws Exception {
 
     @Test
     public void testToByteArray_InputStream_SizeZero() throws Exception {
-        try (InputStream fin =Files.newInputStream(testFilePath)) {
+        try (InputStream fin = Files.newInputStream(testFilePath)) {
             final byte[] out = IOUtils.toByteArray(fin, 0);
             assertNotNull(out, "Out cannot be null");
             assertEquals(0, out.length, "Out length must be 0");

src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java

@@ -41,7 +41,7 @@ public class CharSequenceReaderTest {
 
     private void checkArray(final char[] expected, final char[] actual) {
         for (int i = 0; i < expected.length; i++) {
-            assertEquals(expected[i], actual[i], "Compare[" +i + "]");
+            assertEquals(expected[i], actual[i], "Compare[" + i + "]");
         }
     }
 

src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java

@@ -33,7 +33,7 @@ public class CountingOutputStreamTest {
 
     private void assertByteArrayEquals(final String msg, final byte[] array, final int start, final int end) {
         for (int i = start; i < end; i++) {
-            assertEquals(array[i], i-start, msg+": array[" + i + "] mismatch");
+            assertEquals(array[i], i - start, msg + ": array[" + i + "] mismatch");
         }
     }
 

src/test/java/org/apache/commons/io/output/DeferredFileOutputStreamTest.java

@@ -344,7 +344,7 @@ public void testThresholdNegative(final int initialBufferSize) throws IOExceptio
     @MethodSource("data")
     public void testThresholdReached(final int initialBufferSize) throws IOException {
         final File testFile = Files.createTempFile(tempDirPath, "testThresholdReached", "dat").toFile();
-        final int threshold = testBytes.length /2;
+        final int threshold = testBytes.length / 2;
         try (DeferredFileOutputStream out = DeferredFileOutputStream.builder()
             // @formatter:off
                 .setThreshold(threshold)