checkstyle fix

Author: Melissa You

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java

@@ -26,7 +26,6 @@
 import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
@@ -285,7 +284,8 @@ public void startThreads() throws IOException {
       // by calling the incrSharedCount
       currentSeqNum = incrSharedCount(delTokSeqCounter, seqNumBatchSize);
       currentMaxSeqNum = currentSeqNum + seqNumBatchSize;
-      LOG.info("Fetched initial range of seq num, from {} to {} ", currentSeqNum + 1, currentMaxSeqNum);
+      LOG.info("Fetched initial range of seq num, from {} to {} ", 
+          currentSeqNum + 1, currentMaxSeqNum);
     } catch (Exception e) {
       throw new IOException("Could not start Sequence Counter", e);
     }
@@ -305,14 +305,18 @@ public void startThreads() throws IOException {
     }
     try {
       keyCache = CuratorCache.bridgeBuilder(zkClient, ZK_DTSM_MASTER_KEY_ROOT).build();
-      CuratorCacheListener keyCacheListener = CuratorCacheListener.builder().forCreatesAndChanges((oldNode, node) -> {
-        try {
-          processKeyAddOrUpdate(node.getData());
-        } catch (IOException e) {
-          LOG.error("Error while processing Curator keyCacheListener " + "NODE_CREATED / NODE_CHANGED event");
-          throw new UncheckedIOException(e);
-        }
-      }).forDeletes(childData -> processKeyRemoved(childData.getPath())).build();
+      CuratorCacheListener keyCacheListener = CuratorCacheListener.builder()
+          .forCreatesAndChanges((oldNode, node) -> {
+            try {
+              processKeyAddOrUpdate(node.getData());
+            } catch (IOException e) {
+              LOG.error("Error while processing Curator keyCacheListener " 
+                  + "NODE_CREATED / NODE_CHANGED event");
+              throw new UncheckedIOException(e);
+            }
+          })
+          .forDeletes(childData -> processKeyRemoved(childData.getPath()))
+          .build();
       keyCache.listenable().addListener(keyCacheListener);
       keyCache.start();
       loadFromZKCache(false);
@@ -323,21 +327,26 @@ public void startThreads() throws IOException {
       LOG.info("TokenCache is enabled");
       try {
         tokenCache = CuratorCache.bridgeBuilder(zkClient, ZK_DTSM_TOKENS_ROOT).build();
-        CuratorCacheListener tokenCacheListener = CuratorCacheListener.builder().forCreatesAndChanges((oldNode, node) -> {
+        CuratorCacheListener tokenCacheListener = CuratorCacheListener.builder()
+            .forCreatesAndChanges((oldNode, node) -> {
               try {
                 processTokenAddOrUpdate(node.getData());
               } catch (IOException e) {
-                LOG.error("Error while processing Curator tokenCacheListener " + "NODE_CREATED / NODE_CHANGED event");
+                LOG.error("Error while processing Curator tokenCacheListener " 
+                    + "NODE_CREATED / NODE_CHANGED event");
                 throw new UncheckedIOException(e);
               }
-            }).forDeletes(childData -> {
+            })
+            .forDeletes(childData -> {
               try {
                 processTokenRemoved(childData);
               } catch (IOException e) {
-                LOG.error("Error while processing Curator tokenCacheListener " + "NODE_DELETED event");
+                LOG.error("Error while processing Curator tokenCacheListener " 
+                    + "NODE_DELETED event");
                 throw new UncheckedIOException(e);
               }
-            }).build();
+            })
+            .build();
         tokenCache.listenable().addListener(tokenCacheListener);
         tokenCache.start();
         loadFromZKCache(true);

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java

@@ -436,7 +436,7 @@ protected void stopServer() throws Exception {
 
 
     protected static ZooKeeperServer getServer(ServerCnxnFactory fac) {
-      return fac.getZooKeeperServer();
+        return fac.getZooKeeperServer();
     }
 
     protected void tearDownAll() throws Exception {

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/security/token/ZKDelegationTokenSecretManagerImpl.java

@@ -30,8 +30,6 @@
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
@@ -193,7 +191,7 @@ private void rebuildTokenCache(boolean initial) throws IOException {
       // 2) remove tokens in local cache but not in zk anymore
       for (AbstractDelegationTokenIdentifier ident : currentTokens.keySet()) {
         if (!localTokenCache.contains(ident)) {
-            currentTokens.remove(ident);
+          currentTokens.remove(ident);
         }
       }
     }

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/security/token/TestZKDelegationTokenSecretManagerImpl.java

@@ -162,6 +162,7 @@ public void testMultiNodeTokenRemovalShortSyncWithoutWatch()
 
   // This is very unlikely to happen in real case, but worth putting
   // the case out
+  @SuppressWarnings("unchecked")
   @Test
   public void testMultiNodeTokenRemovalLongSyncWithoutWatch()
       throws Exception {