HADOOP-19415. Fix CheckStyle Issue.

Author: slfan1989

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBloomMapFile.java

@@ -18,7 +18,9 @@
 
 package org.apache.hadoop.io;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -134,8 +136,8 @@ private void checkMembershipVaryingSizedKeys(List<Text> keys)
       reader = new BloomMapFile.Reader(fs, qualifiedDirName.toString(), conf);
       Collections.reverse(keys);
       for (Text key : keys) {
-        assertTrue(
-         reader.probablyHasKey(key), "False negative for existing key " + key);
+        assertTrue(reader.probablyHasKey(key),
+            "False negative for existing key " + key);
       }
       reader.close();
       fs.delete(qualifiedDirName, true);
@@ -201,8 +203,8 @@ public void testIOExceptionInWriterConstructor() {
       reader = new BloomMapFile.Reader(dirNameSpy, conf,
           MapFile.Reader.comparator(new WritableComparator(IntWritable.class)));
 
-      assertNull(
-         reader.getBloomFilter(), "testIOExceptionInWriterConstructor error !!!");
+      assertNull(reader.getBloomFilter(),
+          "testIOExceptionInWriterConstructor error !!!");
     } catch (Exception ex) {
       fail("unexpect ex in testIOExceptionInWriterConstructor !!!");
     } finally {
@@ -232,12 +234,12 @@ public void testGetBloomMapFile() {
           MapFile.Reader.comparator(new WritableComparator(IntWritable.class)));
 
       for (int i = 0; i < SIZE; i++) {
-        assertNotNull(
-           reader.get(new IntWritable(i), new Text()), "testGetBloomMapFile error !!!");
+        assertNotNull(reader.get(new IntWritable(i), new Text()),
+            "testGetBloomMapFile error !!!");
       }
 
-      assertNull(
-         reader.get(new IntWritable(SIZE + 5), new Text()), "testGetBloomMapFile error !!!");
+      assertNull(reader.get(new IntWritable(SIZE + 5), new Text()),
+          "testGetBloomMapFile error !!!");
     } catch (Exception ex) {
       fail("unexpect ex in testGetBloomMapFile !!!");
     } finally {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBooleanWritable.java

@@ -20,7 +20,9 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestBooleanWritable {
 
@@ -64,7 +66,7 @@ public void testCommonMethods() {
     assertTrue(newInstance(true).compareTo(newInstance(false)) > 0, "testCommonMethods6 error !!!" );
     assertTrue(newInstance(false).compareTo(newInstance(true)) < 0, "testCommonMethods7 error !!!" );
     assertTrue(newInstance(false).compareTo(newInstance(false)) == 0, "testCommonMethods8 error !!!" );
-    assertEquals("testCommonMethods9 error !!!", "true", newInstance(true).toString());
+    assertEquals("true", newInstance(true).toString(), "testCommonMethods9 error !!!");
   }
 
   private boolean checkHashCode(BooleanWritable f, BooleanWritable s) {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBoundedByteArrayOutputStream.java

@@ -44,8 +44,8 @@ public void testBoundedStream() throws IOException {
 
     // Write to the stream, get the data back and check for contents
     stream.write(INPUT, 0, SIZE);
-    assertTrue(
-       Arrays.equals(INPUT, stream.getBuffer()), "Array Contents Mismatch");
+    assertTrue(Arrays.equals(INPUT, stream.getBuffer()),
+        "Array Contents Mismatch");
 
     // Try writing beyond end of buffer. Should throw an exception
     boolean caughtException = false;
@@ -56,16 +56,16 @@ public void testBoundedStream() throws IOException {
       caughtException = true;
     }
 
-    assertTrue(
-       caughtException, "Writing beyond limit did not throw an exception");
+    assertTrue(caughtException,
+        "Writing beyond limit did not throw an exception");
 
     //Reset the stream and try, should succeed 
     stream.reset();
-    assertTrue(
-        (stream.getLimit() == SIZE), "Limit did not get reset correctly");
+    assertTrue((stream.getLimit() == SIZE),
+        "Limit did not get reset correctly");
     stream.write(INPUT, 0, SIZE);
-    assertTrue(
-       Arrays.equals(INPUT, stream.getBuffer()), "Array Contents Mismatch");
+    assertTrue(Arrays.equals(INPUT, stream.getBuffer()),
+        "Array Contents Mismatch");
 
     // Try writing one more byte, should fail
     caughtException = false;
@@ -78,8 +78,8 @@ public void testBoundedStream() throws IOException {
     // Reset the stream, but set a lower limit. Writing beyond
     // the limit should throw an exception
     stream.reset(SIZE - 1);
-    assertTrue(
-       (stream.getLimit() == SIZE -1), "Limit did not get reset correctly");
+    assertTrue((stream.getLimit() == SIZE -1),
+        "Limit did not get reset correctly");
     caughtException = false;
 
     try {
@@ -88,8 +88,8 @@ public void testBoundedStream() throws IOException {
       caughtException = true;
     }
 
-    assertTrue(
-       caughtException, "Writing beyond limit did not throw an exception");
+    assertTrue(caughtException,
+        "Writing beyond limit did not throw an exception");
   }
 
 
@@ -114,8 +114,8 @@ public void testResetBuffer() throws IOException {
 
     // Write to the stream, get the data back and check for contents
     stream.write(INPUT, 0, SIZE);
-    assertTrue(
-       Arrays.equals(INPUT, stream.getBuffer()), "Array Contents Mismatch");
+    assertTrue(Arrays.equals(INPUT, stream.getBuffer()),
+        "Array Contents Mismatch");
 
     // Try writing beyond end of buffer. Should throw an exception
     boolean caughtException = false;
@@ -126,17 +126,17 @@ public void testResetBuffer() throws IOException {
       caughtException = true;
     }
 
-    assertTrue(
-       caughtException, "Writing beyond limit did not throw an exception");
+    assertTrue(caughtException,
+        "Writing beyond limit did not throw an exception");
 
     //Reset the stream and try, should succeed
     byte[] newBuf = new byte[SIZE];
     stream.resetBuffer(newBuf, 0, newBuf.length);
-    assertTrue(
-        (stream.getLimit() == SIZE), "Limit did not get reset correctly");
+    assertTrue((stream.getLimit() == SIZE),
+        "Limit did not get reset correctly");
     stream.write(INPUT, 0, SIZE);
-    assertTrue(
-       Arrays.equals(INPUT, stream.getBuffer()), "Array Contents Mismatch");
+    assertTrue(Arrays.equals(INPUT, stream.getBuffer()),
+        "Array Contents Mismatch");
 
     // Try writing one more byte, should fail
     caughtException = false;
@@ -145,8 +145,8 @@ public void testResetBuffer() throws IOException {
     } catch (Exception e) {
       caughtException = true;
     }
-    assertTrue(
-       caughtException, "Writing beyond limit did not throw an exception");
+    assertTrue(caughtException,
+        "Writing beyond limit did not throw an exception");
   }
 
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestBytesWritable.java

@@ -112,26 +112,28 @@ public void testZeroCopy() {
     BytesWritable zeroBuf = new BytesWritable(bytes, bytes.length); // new
     BytesWritable copyBuf = new BytesWritable(bytes); // old
     // using zero copy constructor shouldn't result in a copy
-    assertTrue(
-     bytes == zeroBuf.getBytes(), "copy took place, backing array != array passed to constructor");
-    assertTrue(zeroBuf.getLength() == bytes.length, "length of BW should backing byte array");
-    assertEquals(zeroBuf, copyBuf, "objects with same backing array should be equal");
-    assertEquals("string repr of objects with same backing array should be equal", 
-        zeroBuf.toString(), copyBuf.toString());
-    assertTrue(
-        zeroBuf.compareTo(copyBuf) == 0, "compare order objects with same backing array should be equal");
-    assertTrue(
-       zeroBuf.hashCode() == copyBuf.hashCode(), "hash of objects with same backing array should be equal");
+    assertTrue(bytes == zeroBuf.getBytes(),
+        "copy took place, backing array != array passed to constructor");
+    assertTrue(zeroBuf.getLength() == bytes.length,
+        "length of BW should backing byte array");
+    assertEquals(zeroBuf, copyBuf,
+        "objects with same backing array should be equal");
+    assertEquals(zeroBuf.toString(), copyBuf.toString(),
+        "string repr of objects with same backing array should be equal");
+    assertTrue(zeroBuf.compareTo(copyBuf) == 0,
+        "compare order objects with same backing array should be equal");
+    assertTrue(zeroBuf.hashCode() == copyBuf.hashCode(),
+        "hash of objects with same backing array should be equal");
 
     // ensure expanding buffer is handled correctly
     // for buffers created with zero copy api
     byte[] buffer = new byte[bytes.length * 5];
     zeroBuf.set(buffer, 0, buffer.length); // expand internal buffer
     zeroBuf.set(bytes, 0, bytes.length); // set back to normal contents
-    assertEquals(
-        zeroBuf, copyBuf, "buffer created with (array, len) has bad contents");
-    assertTrue(
-       zeroBuf.getLength() == copyBuf.getLength(), "buffer created with (array, len) has bad length");
+    assertEquals(zeroBuf, copyBuf,
+        "buffer created with (array, len) has bad contents");
+    assertTrue(zeroBuf.getLength() == copyBuf.getLength(),
+        "buffer created with (array, len) has bad length");
   }
 
   /**
@@ -150,7 +152,7 @@ public void testObjectCommonMethods() {
     assertTrue(bw.equals(new ByteWritable((byte)0x9)), "testSetByteWritable equals error !!!");
     assertTrue(! bw.equals(new ByteWritable((byte)0xA)), "testSetByteWritable equals error !!!");
     assertTrue(! bw.equals(new IntWritable(1)), "testSetByteWritable equals error !!!");
-    assertEquals("testSetByteWritable error ", "9", bw.toString());    
+    assertEquals("9", bw.toString(), "testSetByteWritable error ");
   }
 
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestDataByteBuffers.java

@@ -25,7 +25,8 @@
 import java.util.Random;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestDataByteBuffers {
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestDefaultStringifier.java

@@ -93,8 +93,8 @@ public void testStoreLoad() throws IOException {
     DefaultStringifier.store(conf,text, keyName);
 
     Text claimedText = DefaultStringifier.load(conf, keyName, Text.class);
-    assertEquals(
-        text, claimedText, "DefaultStringifier#load() or #store() might be flawed");
+    assertEquals(text, claimedText,
+        "DefaultStringifier#load() or #store() might be flawed");
 
   }
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestEnumSetWritable.java

@@ -135,12 +135,11 @@ public void testEnumSetWritableEquals() {
     EnumSetWritable<TestEnumSet> eset2 = new EnumSetWritable<TestEnumSet>(
         EnumSet.of(TestEnumSet.APPEND, TestEnumSet.CREATE), TestEnumSet.class);
     assertTrue(eset1.equals(eset2), "testEnumSetWritableEquals error !!!");
-    assertFalse(
-       eset1.equals(new EnumSetWritable<TestEnumSet>(EnumSet.of(
-            TestEnumSet.APPEND, TestEnumSet.CREATE, TestEnumSet.OVERWRITE),
-            TestEnumSet.class)), "testEnumSetWritableEquals error !!!");
-    assertTrue(eset1
-        .getElementType().equals(TestEnumSet.class), "testEnumSetWritableEquals getElementType error !!!");
+    assertFalse(eset1.equals(new EnumSetWritable<TestEnumSet>(EnumSet.of(
+        TestEnumSet.APPEND, TestEnumSet.CREATE, TestEnumSet.OVERWRITE),
+        TestEnumSet.class)), "testEnumSetWritableEquals error !!!");
+    assertTrue(eset1.getElementType().equals(TestEnumSet.class),
+        "testEnumSetWritableEquals getElementType error !!!");
   }
 
   /** 
@@ -163,8 +162,8 @@ public void testEnumSetWritableWriteRead() throws Exception {
     Iterator<TestEnumSet> dstIter = result.iterator();
     Iterator<TestEnumSet> srcIter = srcSet.iterator();
     while (dstIter.hasNext() && srcIter.hasNext()) {
-      assertEquals(dstIter.next()
-,           srcIter.next(), "testEnumSetWritableWriteRead error !!!");
+      assertEquals(dstIter.next(), srcIter.next(),
+          "testEnumSetWritableWriteRead error !!!");
     }
   }
 }