Merge r1582068 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582069 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -16,6 +16,9 @@ Release 2.5.0 - UNRELEASED
     HDFS-5196. Provide more snapshot information in WebUI.
     (Shinichi Yamashita via wheat9)
 
+    HDFS-6155. Fix Boxing/unboxing to parse a primitive findbugs warnings.
+    (suresh)
+
   OPTIMIZATIONS
 
   BUG FIXES 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/ShortCircuitCache.java

@@ -618,9 +618,8 @@ public class ShortCircuitCache implements Closeable {
       evictionTimeNs++;
     }
     Preconditions.checkState(null == replica.getEvictableTimeNs());
-    Long time = Long.valueOf(evictionTimeNs);
+    replica.setEvictableTimeNs(evictionTimeNs);
-    replica.setEvictableTimeNs(time);
+    map.put(evictionTimeNs, replica);
-    map.put(time, replica);
   }
 
   /**

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirectiveIterator.java

@@ -38,7 +38,7 @@ public class CacheDirectiveIterator
 
   public CacheDirectiveIterator(ClientProtocol namenode,
       CacheDirectiveInfo filter) {
-    super(Long.valueOf(0));
+    super(0L);
     this.namenode = namenode;
     this.filter = filter;
   }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/PipelineAck.java

@@ -52,7 +52,7 @@ public class PipelineAck {
     String[] ele = conf.get(DFS_DATANODE_OOB_TIMEOUT_KEY,
         DFS_DATANODE_OOB_TIMEOUT_DEFAULT).split(",");
     for (int i = 0; i < NUM_OOB_TYPES; i++) {
-      OOB_TIMEOUT[i] = (i < ele.length) ? Long.valueOf(ele[i]) : 0;
+      OOB_TIMEOUT[i] = (i < ele.length) ? Long.parseLong(ele[i]) : 0;
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JNStorage.java

@@ -165,7 +165,7 @@ class JNStorage extends Storage {
         if (matcher.matches()) {
           // This parsing will always succeed since the group(1) is
           // /\d+/ in the regex itself.
-          long txid = Long.valueOf(matcher.group(1));
+          long txid = Long.parseLong(matcher.group(1));
           if (txid < minTxIdToKeep) {
             LOG.info("Purging no-longer needed file " + txid);
             if (!f.delete()) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java

@@ -1166,7 +1166,7 @@ public class DatanodeManager {
       port = DFSConfigKeys.DFS_DATANODE_DEFAULT_PORT;
     } else {
       hostStr = hostLine.substring(0, idx);
-      port = Integer.valueOf(hostLine.substring(idx+1));
+      port = Integer.parseInt(hostLine.substring(idx+1));
     }
 
     if (InetAddresses.isInetAddress(hostStr)) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceScanner.java

@@ -382,11 +382,11 @@ class BlockPoolSliceScanner {
         
         try {
           if (name.equals("id")) {
-            entry.blockId = Long.valueOf(value);
+            entry.blockId = Long.parseLong(value);
           } else if (name.equals("time")) {
-            entry.verificationTime = Long.valueOf(value);
+            entry.verificationTime = Long.parseLong(value);
           } else if (name.equals("genstamp")) {
-            entry.genStamp = Long.valueOf(value);
+            entry.genStamp = Long.parseLong(value);
           }
         } catch(NumberFormatException nfe) {
           LOG.warn("Cannot parse line: " + line, nfe);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java

@@ -187,7 +187,7 @@ abstract public class ReplicaInfo extends Block implements Replica {
       if (!internedBaseDirs.containsKey(replicaDirInfo.baseDirPath)) {
         // Create a new String path of this file and make a brand new File object
         // to guarantee we drop the reference to the underlying char[] storage.
-        File baseDir = new File(new String(replicaDirInfo.baseDirPath));
+        File baseDir = new File(replicaDirInfo.baseDirPath);
         internedBaseDirs.put(replicaDirInfo.baseDirPath, baseDir);
       }
       this.baseDir = internedBaseDirs.get(replicaDirInfo.baseDirPath);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java

@@ -154,7 +154,7 @@ class ReplicaMap {
   /**
    * Remove the replica's meta information from the map if present
    * @param bpid block pool id
-   * @param the block id of the replica to be removed
+   * @param blockId block id of the replica to be removed
    * @return the removed replica's meta information
    */
   ReplicaInfo remove(String bpid, long blockId) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CheckpointSignature.java

@@ -22,7 +22,6 @@ import java.io.IOException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.hdfs.server.common.StorageInfo;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.NodeType;
-import org.apache.hadoop.hdfs.server.namenode.FSImage;
 
 import com.google.common.collect.ComparisonChain;
 
@@ -53,13 +52,13 @@ public class CheckpointSignature extends StorageInfo
     assert fields.length == NUM_FIELDS :
       "Must be " + NUM_FIELDS + " fields in CheckpointSignature";
     int i = 0;
-    layoutVersion = Integer.valueOf(fields[i++]);
+    layoutVersion = Integer.parseInt(fields[i++]);
-    namespaceID = Integer.valueOf(fields[i++]);
+    namespaceID = Integer.parseInt(fields[i++]);
-    cTime = Long.valueOf(fields[i++]);
+    cTime = Long.parseLong(fields[i++]);
-    mostRecentCheckpointTxId  = Long.valueOf(fields[i++]);
+    mostRecentCheckpointTxId  = Long.parseLong(fields[i++]);
-    curSegmentTxId  = Long.valueOf(fields[i++]);
+    curSegmentTxId  = Long.parseLong(fields[i++]);
     clusterID = fields[i++];
-    blockpoolID = fields[i++];
+    blockpoolID = fields[i];
   }
 
   public CheckpointSignature(StorageInfo info, String blockpoolID,

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

@@ -2944,7 +2944,7 @@ public class FSDirectory implements Closeable {
     final String inodeId = DFSUtil.bytes2String(pathComponents[3]);
     long id = 0;
     try {
-      id = Long.valueOf(inodeId);
+      id = Long.parseLong(inodeId);
     } catch (NumberFormatException e) {
       throw new FileNotFoundException("Invalid inode path: " + src);
     }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogOp.java

@@ -288,7 +288,7 @@ public abstract class FSEditLogOp {
         ClientId.toBytes(st.getValue("RPC_CLIENTID"))
         : RpcConstants.DUMMY_CLIENT_ID;
     this.rpcCallId = st.hasChildren("RPC_CALLID") ? 
-        Integer.valueOf(st.getValue("RPC_CALLID"))
+        Integer.parseInt(st.getValue("RPC_CALLID"))
         : RpcConstants.INVALID_CALL_ID;
   }
   
@@ -305,7 +305,7 @@ public abstract class FSEditLogOp {
     XMLUtils.addSaxString(contentHandler, "RPC_CLIENTID",
         ClientId.toString(clientId));
     XMLUtils.addSaxString(contentHandler, "RPC_CALLID", 
-        Integer.valueOf(callId).toString());
+        Integer.toString(callId));
   }
 
   private static final class AclEditLogUtil {
@@ -615,18 +615,18 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "INODEID",
-          Long.valueOf(inodeId).toString());
+          Long.toString(inodeId));
       XMLUtils.addSaxString(contentHandler, "PATH", path);
       XMLUtils.addSaxString(contentHandler, "REPLICATION",
           Short.valueOf(replication).toString());
       XMLUtils.addSaxString(contentHandler, "MTIME",
-          Long.valueOf(mtime).toString());
+          Long.toString(mtime));
       XMLUtils.addSaxString(contentHandler, "ATIME",
-          Long.valueOf(atime).toString());
+          Long.toString(atime));
       XMLUtils.addSaxString(contentHandler, "BLOCKSIZE",
-          Long.valueOf(blockSize).toString());
+          Long.toString(blockSize));
       XMLUtils.addSaxString(contentHandler, "CLIENT_NAME", clientName);
       XMLUtils.addSaxString(contentHandler, "CLIENT_MACHINE", clientMachine);
       for (Block b : blocks) {
@@ -643,13 +643,13 @@ public abstract class FSEditLogOp {
 
     @Override 
     void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
-      this.inodeId = Long.valueOf(st.getValue("INODEID"));
+      this.inodeId = Long.parseLong(st.getValue("INODEID"));
       this.path = st.getValue("PATH");
       this.replication = Short.valueOf(st.getValue("REPLICATION"));
-      this.mtime = Long.valueOf(st.getValue("MTIME"));
+      this.mtime = Long.parseLong(st.getValue("MTIME"));
-      this.atime = Long.valueOf(st.getValue("ATIME"));
+      this.atime = Long.parseLong(st.getValue("ATIME"));
-      this.blockSize = Long.valueOf(st.getValue("BLOCKSIZE"));
+      this.blockSize = Long.parseLong(st.getValue("BLOCKSIZE"));
       this.clientName = st.getValue("CLIENT_NAME");
       this.clientMachine = st.getValue("CLIENT_MACHINE");
       if (st.hasChildren("BLOCK")) {
@@ -1103,10 +1103,10 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "TRG", trg);
       XMLUtils.addSaxString(contentHandler, "TIMESTAMP",
-          Long.valueOf(timestamp).toString());
+          Long.toString(timestamp));
       contentHandler.startElement("", "", "SOURCES", new AttributesImpl());
       for (int i = 0; i < srcs.length; ++i) {
         XMLUtils.addSaxString(contentHandler,
@@ -1117,9 +1117,9 @@ public abstract class FSEditLogOp {
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
       this.trg = st.getValue("TRG");
-      this.timestamp = Long.valueOf(st.getValue("TIMESTAMP"));
+      this.timestamp = Long.parseLong(st.getValue("TIMESTAMP"));
       List<Stanza> sources = st.getChildren("SOURCES");
       int i = 0;
       while (true) {
@@ -1221,20 +1221,20 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "SRC", src);
       XMLUtils.addSaxString(contentHandler, "DST", dst);
       XMLUtils.addSaxString(contentHandler, "TIMESTAMP",
-          Long.valueOf(timestamp).toString());
+          Long.toString(timestamp));
       appendRpcIdsToXml(contentHandler, rpcClientId, rpcCallId);
     }
     
     @Override 
     void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
       this.src = st.getValue("SRC");
       this.dst = st.getValue("DST");
-      this.timestamp = Long.valueOf(st.getValue("TIMESTAMP"));
+      this.timestamp = Long.parseLong(st.getValue("TIMESTAMP"));
       
       readRpcIdsFromXml(st);
     }
@@ -1314,17 +1314,17 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "PATH", path);
       XMLUtils.addSaxString(contentHandler, "TIMESTAMP",
-          Long.valueOf(timestamp).toString());
+          Long.toString(timestamp));
       appendRpcIdsToXml(contentHandler, rpcClientId, rpcCallId);
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
       this.path = st.getValue("PATH");
-      this.timestamp = Long.valueOf(st.getValue("TIMESTAMP"));
+      this.timestamp = Long.parseLong(st.getValue("TIMESTAMP"));
       
       readRpcIdsFromXml(st);
     }
@@ -1453,12 +1453,12 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "INODEID",
-          Long.valueOf(inodeId).toString());
+          Long.toString(inodeId));
       XMLUtils.addSaxString(contentHandler, "PATH", path);
       XMLUtils.addSaxString(contentHandler, "TIMESTAMP",
-          Long.valueOf(timestamp).toString());
+          Long.toString(timestamp));
       FSEditLogOp.permissionStatusToXml(contentHandler, permissions);
       if (aclEntries != null) {
         appendAclEntriesToXml(contentHandler, aclEntries);
@@ -1466,10 +1466,10 @@ public abstract class FSEditLogOp {
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
-      this.inodeId = Long.valueOf(st.getValue("INODEID"));
+      this.inodeId = Long.parseLong(st.getValue("INODEID"));
       this.path = st.getValue("PATH");
-      this.timestamp = Long.valueOf(st.getValue("TIMESTAMP"));
+      this.timestamp = Long.parseLong(st.getValue("TIMESTAMP"));
       this.permissions = permissionStatusFromXml(st);
       aclEntries = readAclEntriesFromXml(st);
     }
@@ -1526,11 +1526,11 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "GENSTAMP",
-                            Long.valueOf(genStampV1).toString());
+                            Long.toString(genStampV1));
     }
 
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.genStampV1 = Long.valueOf(st.getValue("GENSTAMP"));
+      this.genStampV1 = Long.parseLong(st.getValue("GENSTAMP"));
     }
   }
 
@@ -1579,11 +1579,11 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "GENSTAMPV2",
-                            Long.valueOf(genStampV2).toString());
+                            Long.toString(genStampV2));
     }
 
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.genStampV2 = Long.valueOf(st.getValue("GENSTAMPV2"));
+      this.genStampV2 = Long.parseLong(st.getValue("GENSTAMPV2"));
     }
   }
 
@@ -1632,11 +1632,11 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "BLOCK_ID",
-                            Long.valueOf(blockId).toString());
+                            Long.toString(blockId));
     }
 
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.blockId = Long.valueOf(st.getValue("BLOCK_ID"));
+      this.blockId = Long.parseLong(st.getValue("BLOCK_ID"));
     }
   }
 
@@ -1832,12 +1832,12 @@ public abstract class FSEditLogOp {
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "SRC", src);
       XMLUtils.addSaxString(contentHandler, "NSQUOTA",
-          Long.valueOf(nsQuota).toString());
+          Long.toString(nsQuota));
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
       this.src = st.getValue("SRC");
-      this.nsQuota = Long.valueOf(st.getValue("NSQUOTA"));
+      this.nsQuota = Long.parseLong(st.getValue("NSQUOTA"));
     }
   }
 
@@ -1953,15 +1953,15 @@ public abstract class FSEditLogOp {
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "SRC", src);
       XMLUtils.addSaxString(contentHandler, "NSQUOTA",
-          Long.valueOf(nsQuota).toString());
+          Long.toString(nsQuota));
       XMLUtils.addSaxString(contentHandler, "DSQUOTA",
-          Long.valueOf(dsQuota).toString());
+          Long.toString(dsQuota));
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
       this.src = st.getValue("SRC");
-      this.nsQuota = Long.valueOf(st.getValue("NSQUOTA"));
+      this.nsQuota = Long.parseLong(st.getValue("NSQUOTA"));
-      this.dsQuota = Long.valueOf(st.getValue("DSQUOTA"));
+      this.dsQuota = Long.parseLong(st.getValue("DSQUOTA"));
     }
   }
 
@@ -2047,19 +2047,19 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "PATH", path);
       XMLUtils.addSaxString(contentHandler, "MTIME",
-          Long.valueOf(mtime).toString());
+          Long.toString(mtime));
       XMLUtils.addSaxString(contentHandler, "ATIME",
-          Long.valueOf(atime).toString());
+          Long.toString(atime));
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
       this.path = st.getValue("PATH");
-      this.mtime = Long.valueOf(st.getValue("MTIME"));
+      this.mtime = Long.parseLong(st.getValue("MTIME"));
-      this.atime = Long.valueOf(st.getValue("ATIME"));
+      this.atime = Long.parseLong(st.getValue("ATIME"));
     }
   }
 
@@ -2186,27 +2186,27 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "INODEID",
-          Long.valueOf(inodeId).toString());
+          Long.toString(inodeId));
       XMLUtils.addSaxString(contentHandler, "PATH", path);
       XMLUtils.addSaxString(contentHandler, "VALUE", value);
       XMLUtils.addSaxString(contentHandler, "MTIME",
-          Long.valueOf(mtime).toString());
+          Long.toString(mtime));
       XMLUtils.addSaxString(contentHandler, "ATIME",
-          Long.valueOf(atime).toString());
+          Long.toString(atime));
       FSEditLogOp.permissionStatusToXml(contentHandler, permissionStatus);
       appendRpcIdsToXml(contentHandler, rpcClientId, rpcCallId);
     }
 
     @Override 
     void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
-      this.inodeId = Long.valueOf(st.getValue("INODEID"));
+      this.inodeId = Long.parseLong(st.getValue("INODEID"));
       this.path = st.getValue("PATH");
       this.value = st.getValue("VALUE");
-      this.mtime = Long.valueOf(st.getValue("MTIME"));
+      this.mtime = Long.parseLong(st.getValue("MTIME"));
-      this.atime = Long.valueOf(st.getValue("ATIME"));
+      this.atime = Long.parseLong(st.getValue("ATIME"));
       this.permissionStatus = permissionStatusFromXml(st);
       
       readRpcIdsFromXml(st);
@@ -2330,11 +2330,11 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, "LENGTH",
-          Integer.valueOf(length).toString());
+          Integer.toString(length));
       XMLUtils.addSaxString(contentHandler, "SRC", src);
       XMLUtils.addSaxString(contentHandler, "DST", dst);
       XMLUtils.addSaxString(contentHandler, "TIMESTAMP",
-          Long.valueOf(timestamp).toString());
+          Long.toString(timestamp));
       StringBuilder bld = new StringBuilder();
       String prefix = "";
       for (Rename r : options) {
@@ -2346,10 +2346,10 @@ public abstract class FSEditLogOp {
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
-      this.length = Integer.valueOf(st.getValue("LENGTH"));
+      this.length = Integer.parseInt(st.getValue("LENGTH"));
       this.src = st.getValue("SRC");
       this.dst = st.getValue("DST");
-      this.timestamp = Long.valueOf(st.getValue("TIMESTAMP"));
+      this.timestamp = Long.parseLong(st.getValue("TIMESTAMP"));
       String opts = st.getValue("OPTIONS");
       String o[] = opts.split("\\|");
       this.options = new Rename[o.length];
@@ -2511,13 +2511,13 @@ public abstract class FSEditLogOp {
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       FSEditLogOp.delegationTokenToXml(contentHandler, token);
       XMLUtils.addSaxString(contentHandler, "EXPIRY_TIME",
-          Long.valueOf(expiryTime).toString());
+          Long.toString(expiryTime));
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
       this.token = delegationTokenFromXml(st.getChildren(
           "DELEGATION_TOKEN_IDENTIFIER").get(0));
-      this.expiryTime = Long.valueOf(st.getValue("EXPIRY_TIME"));
+      this.expiryTime = Long.parseLong(st.getValue("EXPIRY_TIME"));
     }
   }
 
@@ -2584,13 +2584,13 @@ public abstract class FSEditLogOp {
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       FSEditLogOp.delegationTokenToXml(contentHandler, token);
       XMLUtils.addSaxString(contentHandler, "EXPIRY_TIME",
-          Long.valueOf(expiryTime).toString());
+          Long.toString(expiryTime));
     }
     
     @Override void fromXml(Stanza st) throws InvalidXmlException {
       this.token = delegationTokenFromXml(st.getChildren(
           "DELEGATION_TOKEN_IDENTIFIER").get(0));
-      this.expiryTime = Long.valueOf(st.getValue("EXPIRY_TIME"));
+      this.expiryTime = Long.parseLong(st.getValue("EXPIRY_TIME"));
     }
   }
 
@@ -3626,12 +3626,12 @@ public abstract class FSEditLogOp {
     @Override
     protected void toXml(ContentHandler contentHandler) throws SAXException {
       XMLUtils.addSaxString(contentHandler, name + "TIME",
-          Long.valueOf(time).toString());
+          Long.toString(time));
     }
 
     @Override
     void fromXml(Stanza st) throws InvalidXmlException {
-      this.time = Long.valueOf(st.getValue(name + "TIME"));
+      this.time = Long.parseLong(st.getValue(name + "TIME"));
     }
 
     @Override
@@ -3938,7 +3938,7 @@ public abstract class FSEditLogOp {
   abstract void fromXml(Stanza st) throws InvalidXmlException;
   
   public void decodeXml(Stanza st) throws InvalidXmlException {
-    this.txid = Long.valueOf(st.getValue("TXID"));
+    this.txid = Long.parseLong(st.getValue("TXID"));
     fromXml(st);
   }
   
@@ -3946,19 +3946,19 @@ public abstract class FSEditLogOp {
       throws SAXException {
     contentHandler.startElement("", "", "BLOCK", new AttributesImpl());
     XMLUtils.addSaxString(contentHandler, "BLOCK_ID",
-        Long.valueOf(block.getBlockId()).toString());
+        Long.toString(block.getBlockId()));
     XMLUtils.addSaxString(contentHandler, "NUM_BYTES",
-        Long.valueOf(block.getNumBytes()).toString());
+        Long.toString(block.getNumBytes()));
     XMLUtils.addSaxString(contentHandler, "GENSTAMP",
-        Long.valueOf(block.getGenerationStamp()).toString());
+        Long.toString(block.getGenerationStamp()));
     contentHandler.endElement("", "", "BLOCK");
   }
 
   public static Block blockFromXml(Stanza st)
       throws InvalidXmlException {
-    long blockId = Long.valueOf(st.getValue("BLOCK_ID"));
+    long blockId = Long.parseLong(st.getValue("BLOCK_ID"));
-    long numBytes = Long.valueOf(st.getValue("NUM_BYTES"));
+    long numBytes = Long.parseLong(st.getValue("NUM_BYTES"));
-    long generationStamp = Long.valueOf(st.getValue("GENSTAMP"));
+    long generationStamp = Long.parseLong(st.getValue("GENSTAMP"));
     return new Block(blockId, numBytes, generationStamp);
   }
 
@@ -3967,7 +3967,7 @@ public abstract class FSEditLogOp {
     contentHandler.startElement("", "", "DELEGATION_TOKEN_IDENTIFIER", new AttributesImpl());
     XMLUtils.addSaxString(contentHandler, "KIND", token.getKind().toString());
     XMLUtils.addSaxString(contentHandler, "SEQUENCE_NUMBER",
-        Integer.valueOf(token.getSequenceNumber()).toString());
+        Integer.toString(token.getSequenceNumber()));
     XMLUtils.addSaxString(contentHandler, "OWNER",
         token.getOwner().toString());
     XMLUtils.addSaxString(contentHandler, "RENEWER",
@@ -3975,11 +3975,11 @@ public abstract class FSEditLogOp {
     XMLUtils.addSaxString(contentHandler, "REALUSER",
         token.getRealUser().toString());
     XMLUtils.addSaxString(contentHandler, "ISSUE_DATE",
-        Long.valueOf(token.getIssueDate()).toString());
+        Long.toString(token.getIssueDate()));
     XMLUtils.addSaxString(contentHandler, "MAX_DATE",
-        Long.valueOf(token.getMaxDate()).toString());
+        Long.toString(token.getMaxDate()));
     XMLUtils.addSaxString(contentHandler, "MASTER_KEY_ID",
-        Integer.valueOf(token.getMasterKeyId()).toString());
+        Integer.toString(token.getMasterKeyId()));
     contentHandler.endElement("", "", "DELEGATION_TOKEN_IDENTIFIER");
   }
 
@@ -3991,13 +3991,13 @@ public abstract class FSEditLogOp {
       throw new InvalidXmlException("can't understand " +
         "DelegationTokenIdentifier KIND " + kind);
     }
-    int seqNum = Integer.valueOf(st.getValue("SEQUENCE_NUMBER"));
+    int seqNum = Integer.parseInt(st.getValue("SEQUENCE_NUMBER"));
     String owner = st.getValue("OWNER");
     String renewer = st.getValue("RENEWER");
     String realuser = st.getValue("REALUSER");
-    long issueDate = Long.valueOf(st.getValue("ISSUE_DATE"));
+    long issueDate = Long.parseLong(st.getValue("ISSUE_DATE"));
-    long maxDate = Long.valueOf(st.getValue("MAX_DATE"));
+    long maxDate = Long.parseLong(st.getValue("MAX_DATE"));
-    int masterKeyId = Integer.valueOf(st.getValue("MASTER_KEY_ID"));
+    int masterKeyId = Integer.parseInt(st.getValue("MASTER_KEY_ID"));
     DelegationTokenIdentifier token =
         new DelegationTokenIdentifier(new Text(owner),
             new Text(renewer), new Text(realuser));
@@ -4012,9 +4012,9 @@ public abstract class FSEditLogOp {
       DelegationKey key) throws SAXException {
     contentHandler.startElement("", "", "DELEGATION_KEY", new AttributesImpl());
     XMLUtils.addSaxString(contentHandler, "KEY_ID",
-        Integer.valueOf(key.getKeyId()).toString());
+        Integer.toString(key.getKeyId()));
     XMLUtils.addSaxString(contentHandler, "EXPIRY_DATE",
-        Long.valueOf(key.getExpiryDate()).toString());
+        Long.toString(key.getExpiryDate()));
     if (key.getEncodedKey() != null) {
       XMLUtils.addSaxString(contentHandler, "KEY",
           Hex.encodeHexString(key.getEncodedKey()));
@@ -4024,8 +4024,8 @@ public abstract class FSEditLogOp {
   
   public static DelegationKey delegationKeyFromXml(Stanza st)
       throws InvalidXmlException {
-    int keyId = Integer.valueOf(st.getValue("KEY_ID"));
+    int keyId = Integer.parseInt(st.getValue("KEY_ID"));
-    long expiryDate = Long.valueOf(st.getValue("EXPIRY_DATE"));
+    long expiryDate = Long.parseLong(st.getValue("EXPIRY_DATE"));
     byte key[] = null;
     try {
       key = Hex.decodeHex(st.getValue("KEY").toCharArray());

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageTransactionalStorageInspector.java

@@ -115,7 +115,7 @@ class FSImageTransactionalStorageInspector extends FSImageStorageInspector {
       if (imageMatch != null) {
         if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE)) {
           try {
-            long txid = Long.valueOf(imageMatch.group(1));
+            long txid = Long.parseLong(imageMatch.group(1));
             foundImages.add(new FSImageFile(sd, f, txid));
           } catch (NumberFormatException nfe) {
             LOG.error("Image file " + f + " has improperly formatted " +

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java

@@ -247,8 +247,8 @@ public class FileJournalManager implements JournalManager {
       Matcher editsMatch = EDITS_REGEX.matcher(name);
       if (editsMatch.matches()) {
         try {
-          long startTxId = Long.valueOf(editsMatch.group(1));
+          long startTxId = Long.parseLong(editsMatch.group(1));
-          long endTxId = Long.valueOf(editsMatch.group(2));
+          long endTxId = Long.parseLong(editsMatch.group(2));
           ret.add(new EditLogFile(f, startTxId, endTxId));
         } catch (NumberFormatException nfe) {
           LOG.error("Edits file " + f + " has improperly formatted " +
@@ -261,7 +261,7 @@ public class FileJournalManager implements JournalManager {
       Matcher inProgressEditsMatch = EDITS_INPROGRESS_REGEX.matcher(name);
       if (inProgressEditsMatch.matches()) {
         try {
-          long startTxId = Long.valueOf(inProgressEditsMatch.group(1));
+          long startTxId = Long.parseLong(inProgressEditsMatch.group(1));
           ret.add(
               new EditLogFile(f, startTxId, HdfsConstants.INVALID_TXID, true));
         } catch (NumberFormatException nfe) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/HostFileManager.java

@@ -105,7 +105,7 @@ public class HostFileManager {
         prefix = entry.substring(0, idx);
         String portStr = entry.substring(idx + 1);
         try {
-          port = Integer.valueOf(portStr);
+          port = Integer.parseInt(portStr);
         } catch (NumberFormatException e) {
           throw new IOException("unable to parse port number for " +
               "'" + entry + "'", e);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NNStorage.java

@@ -786,7 +786,6 @@ public class NNStorage extends Storage implements Closeable,
    * Marks a list of directories as having experienced an error.
    *
    * @param sds A list of storage directories to mark as errored.
-   * @throws IOException
    */
   void reportErrorsOnDirectories(List<StorageDirectory> sds) {
     for (StorageDirectory sd : sds) {
@@ -800,7 +799,6 @@ public class NNStorage extends Storage implements Closeable,
    * available.
    *
    * @param sd A storage directory to mark as errored.
-   * @throws IOException
    */
   private void reportErrorsOnDirectory(StorageDirectory sd) {
     LOG.error("Error reported on storage directory " + sd);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/CacheAdmin.java

@@ -301,7 +301,7 @@ public class CacheAdmin extends Configured implements Tool {
       }
       long id;
       try {
-        id = Long.valueOf(idString);
+        id = Long.parseLong(idString);
       } catch (NumberFormatException e) {
         System.err.println("Invalid directive ID " + idString + ": expected " +
             "a numeric value.");

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/DelimitedImageVisitor.java

@@ -144,7 +144,7 @@ class DelimitedImageVisitor extends TextWriterImageVisitor {
     
     // Special case of file size, which is sum of the num bytes in each block
     if(element == ImageElement.NUM_BYTES)
-      fileSize += Long.valueOf(value);
+      fileSize += Long.parseLong(value);
     
     if(elements.containsKey(element) && element != ImageElement.NUM_BYTES)
       elements.put(element, value);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java

@@ -159,10 +159,10 @@ class FileDistributionVisitor extends TextWriterImageVisitor {
         current.path = (value.equals("") ? "/" : value);
         break;
       case REPLICATION:
-        current.replication = Integer.valueOf(value);
+        current.replication = Integer.parseInt(value);
         break;
       case NUM_BYTES:
-        current.fileSize += Long.valueOf(value);
+        current.fileSize += Long.parseLong(value);
         break;
       default:
         break;

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/LsImageVisitor.java

@@ -135,7 +135,7 @@ class LsImageVisitor extends TextWriterImageVisitor {
         perms = value;
         break;
       case REPLICATION:
-        replication = Integer.valueOf(value);
+        replication = Integer.parseInt(value);
         break;
       case USER_NAME:
         username = value;
@@ -144,7 +144,7 @@ class LsImageVisitor extends TextWriterImageVisitor {
         group = value;
         break;
       case NUM_BYTES:
-        filesize += Long.valueOf(value);
+        filesize += Long.parseLong(value);
         break;
       case MODIFICATION_TIME:
         modTime = value;
@@ -173,6 +173,6 @@ class LsImageVisitor extends TextWriterImageVisitor {
     if(element == ImageElement.INODE)
       newLine();
     else if (element == ImageElement.BLOCKS)
-      numBlocks = Integer.valueOf(value);
+      numBlocks = Integer.parseInt(value);
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/PersistentLongFile.java

@@ -20,7 +20,6 @@ package org.apache.hadoop.hdfs.util;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
@@ -96,7 +95,7 @@ public class PersistentLongFile {
           new BufferedReader(new InputStreamReader(new FileInputStream(
               file), Charsets.UTF_8));
       try {
-        val = Long.valueOf(br.readLine());
+        val = Long.parseLong(br.readLine());
         br.close();
         br = null;
       } finally {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java

@@ -134,7 +134,6 @@ public class HftpFileSystem extends FileSystem
    *  3. DFS_NAMENODE_HTTP_PORT_DEFAULT i.e. 50070.
    *
    * @param uri
-   * @return
    */
   protected InetSocketAddress getNamenodeAddr(URI uri) {
     // use authority so user supplied uri can override port
@@ -435,9 +434,9 @@ public class HftpFileSystem extends FileSystem
       } catch (ParseException e) { throw new SAXException(e); }
       FileStatus fs = "file".equals(qname)
         ? new FileStatus(
-              Long.valueOf(attrs.getValue("size")).longValue(), false,
+              Long.parseLong(attrs.getValue("size")), false,
               Short.valueOf(attrs.getValue("replication")).shortValue(),
-              Long.valueOf(attrs.getValue("blocksize")).longValue(),
+              Long.parseLong(attrs.getValue("blocksize")),
               modif, atime, FsPermission.valueOf(attrs.getValue("permission")),
               attrs.getValue("owner"), attrs.getValue("group"),
               HftpFileSystem.this.makeQualified(

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFetchImage.java

@@ -107,7 +107,7 @@ public class TestFetchImage {
       for (File imageFile : new File(new File(nameDir), "current").listFiles()) {
         Matcher imageMatch = IMAGE_REGEX.matcher(imageFile.getName());
         if (imageMatch.matches()) {
-          long imageTxId = Long.valueOf(imageMatch.group(1));
+          long imageTxId = Long.parseLong(imageMatch.group(1));
           if (imageTxId > highestImageTxId) {
             highestImageTxId = imageTxId;
             highestImageOnNn = imageFile;

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java

@@ -519,7 +519,7 @@ public class TestShortCircuitLocalRead {
     }
     boolean shortcircuit = Boolean.valueOf(args[0]);
     boolean checksum = Boolean.valueOf(args[1]);
-    int threadCount = Integer.valueOf(args[2]);
+    int threadCount = Integer.parseInt(args[2]);
 
     // Setup create a file
     final Configuration conf = new Configuration();

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java

@@ -1059,11 +1059,11 @@ public class TestEditLog {
         assertTrue("bad spec: " + logSpec, m.matches());
         if (m.group(2) == null) {
           files.add(NNStorage.getInProgressEditsFileName(
-              Long.valueOf(m.group(1))));
+              Long.parseLong(m.group(1))));
         } else {
           files.add(NNStorage.getFinalizedEditsFileName(
-              Long.valueOf(m.group(1)),
+              Long.parseLong(m.group(1)),
-              Long.valueOf(m.group(2))));
+              Long.parseLong(m.group(2))));
         }
       }
       StorageDirectory sd = FSImageTestUtil.mockStorageDirectory(

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeJspHelper.java

@@ -316,7 +316,7 @@ public class TestNameNodeJspHelper {
       String digitLine = output.substring(matcher.start(), matcher.end())
           .trim();
       assertTrue("assertCounts error. actual != expected",
-          Integer.valueOf(digitLine) == expectedCount);
+          Integer.parseInt(digitLine) == expectedCount);
     } else {
       fail("assertCount matcher error");
     }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/SpotCheckImageVisitor.java

@@ -43,9 +43,9 @@ class SpotCheckImageVisitor extends ImageVisitor {
   @Override
   void visit(ImageElement element, String value) throws IOException {
     if(element == ImageElement.NUM_BYTES) 
-      current.totalFileSize += Long.valueOf(value);
+      current.totalFileSize += Long.parseLong(value);
     else if (element == ImageElement.REPLICATION)
-      current.totalReplications += Long.valueOf(value);
+      current.totalReplications += Long.parseLong(value);
     else if (element == ImageElement.INODE_PATH)
       current.pathNames.add(value);
   }
@@ -61,7 +61,7 @@ class SpotCheckImageVisitor extends ImageVisitor {
       current = INUCs;
       break;
     case BLOCKS:
-      current.totalNumBlocks += Long.valueOf(value);
+      current.totalNumBlocks += Long.parseLong(value);
       break;
       // OK to not have a default, we're skipping most of the values
     }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenRemoteFetcher.java

@@ -186,7 +186,7 @@ public class TestDelegationTokenRemoteFetcher {
       NumberFormatException, AuthenticationException {
     bootstrap = startHttpServer(httpPort, testToken, serviceUrl);
     assertTrue("testRenewTokenFromHttp error",
-        Long.valueOf(EXP_DATE) == DelegationTokenFetcher.renewDelegationToken(
+        Long.parseLong(EXP_DATE) == DelegationTokenFetcher.renewDelegationToken(
             connectionFactory, serviceUrl, testToken));
     if (assertionError != null)
       throw assertionError;