fix checkstyle complaints

Author: omalley

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

@@ -22,7 +22,6 @@
 import org.apache.hadoop.security.AccessControlException;
 import org.apache.hadoop.classification.VisibleForTesting;
 import org.apache.hadoop.util.Preconditions;
-import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -376,7 +375,7 @@ private class Connection extends Thread {
     private IOException closeException; // close reason
 
     private final Thread rpcRequestThread;
-    private final SynchronousQueue<Pair<Call,ResponseBuffer>> rpcRequestQueue =
+    private final SynchronousQueue<Pair<Call, ResponseBuffer>> rpcRequestQueue =
         new SynchronousQueue<>(true);
 
     private AtomicReference<Thread> connectingThread = new AtomicReference<>();

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java

@@ -88,7 +88,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -951,9 +950,9 @@ public void run() {
    * We use a mock SocketFactory so that we can control when the input and
    * output streams are frozen.
    */
-  @Test
+  @Test(timeout=30000)
   public void testSlowConnection() throws Exception {
-    final int NUM_THREADS = 5;
+    final int numThreads = 5;
     SocketFactory mockFactory = Mockito.mock(SocketFactory.class);
     Socket mockSocket = Mockito.mock(Socket.class);
     Mockito.when(mockFactory.createSocket()).thenReturn(mockSocket);
@@ -997,17 +996,17 @@ public int read() throws IOException {
       // The connection isn't actually made until the first call.
       client.ping(null, newEmptyRequest());
       mockOutputStream.waitForFlush(1);
-      final long header_and_first = mockOutputStream.bytesWritten;
+      final long headerAndFirst = mockOutputStream.bytesWritten;
       client.ping(null, newEmptyRequest());
       mockOutputStream.waitForFlush(2);
-      final long second = mockOutputStream.bytesWritten - header_and_first;
+      final long second = mockOutputStream.bytesWritten - headerAndFirst;
       // pause the writer thread
       mockOutputStream.pause();
       // create a set of threads to create calls that will back up
       ExecutorService pool = Executors.newCachedThreadPool();
-      Future<Void>[] futures = new Future[NUM_THREADS];
+      Future<Void>[] futures = new Future[numThreads];
       final AtomicInteger doneThreads = new AtomicInteger(0);
-      for(int thread = 0; thread < NUM_THREADS; ++thread) {
+      for(int thread = 0; thread < numThreads; ++thread) {
         final TestRpcService finalClient = client;
         futures[thread] = pool.submit(new Callable<Void>() {
           @Override
@@ -1021,7 +1020,7 @@ public Void call() throws Exception {
       // wait until one of the threads has started writing
       mockOutputStream.waitForWriters();
       // interrupt all the threads
-      for(int thread=0; thread < NUM_THREADS; ++thread) {
+      for(int thread=0; thread < numThreads; ++thread) {
         futures[thread].cancel(true);
       }
       mockOutputStream.resume();
@@ -1030,7 +1029,7 @@ public Void call() throws Exception {
       // All the threads should have been interrupted
       assertEquals(0, doneThreads.get());
       // make sure that only one additional rpc request was sent
-      assertEquals(header_and_first + second * 2, mockOutputStream.bytesWritten);
+      assertEquals(headerAndFirst + second * 2, mockOutputStream.bytesWritten);
     } finally {
       Client.setAsynchronousMode(wasAsync);
       if (client != null) {
@@ -1040,8 +1039,8 @@ public Void call() throws Exception {
   }
 
   private static final class MockOutputStream extends OutputStream {
-    long bytesWritten = 0;
-    AtomicInteger flushCount = new AtomicInteger(0);
+    private long bytesWritten = 0;
+    private AtomicInteger flushCount = new AtomicInteger(0);
     private ReentrantLock lock = new ReentrantLock(true);
 
     @Override