HDFS-8169. Move LocatedBlocks and related classes to hdfs-client. Con…

…tributed by Haohui Mai.

hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml

@@ -1,2 +1,10 @@
 <FindBugsFilter>
+  <Match>
+    <Or>
+      <Class name="org.apache.hadoop.hdfs.protocol.HdfsFileStatus"/>
+      <Class name="org.apache.hadoop.hdfs.protocol.LocatedBlock"/>
+      <Class name="org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier"/>
+    </Or>
+    <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
+  </Match>
 </FindBugsFilter>

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

@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs;
+
+import org.apache.hadoop.util.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+
+public class DFSUtilClient {
+  /**
+   * Converts a byte array to a string using UTF8 encoding.
+   */
+  public static String bytes2String(byte[] bytes) {
+    return bytes2String(bytes, 0, bytes.length);
+  }
+
+  /** Return used as percentage of capacity */
+  public static float getPercentUsed(long used, long capacity) {
+    return capacity <= 0 ? 100 : (used * 100.0f)/capacity;
+  }
+
+  /** Return remaining as percentage of capacity */
+  public static float getPercentRemaining(long remaining, long capacity) {
+    return capacity <= 0 ? 0 : (remaining * 100.0f)/capacity;
+  }
+
+  /** Convert percentage to a string. */
+  public static String percent2String(double percentage) {
+    return StringUtils.format("%.2f%%", percentage);
+  }
+
+  /**
+   * Decode a specific range of bytes of the given byte array to a string
+   * using UTF8.
+   *
+   * @param bytes The bytes to be decoded into characters
+   * @param offset The index of the first byte to decode
+   * @param length The number of bytes to decode
+   * @return The decoded string
+   */
+  private static String bytes2String(byte[] bytes, int offset, int length) {
+    try {
+      return new String(bytes, offset, length, "UTF8");
+    } catch(UnsupportedEncodingException e) {
+      assert false : "UTF8 encoding is not supported ";
+    }
+    return null;
+  }
+
+}

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java → hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java

@@ -26,7 +26,7 @@
 import org.apache.hadoop.io.*;
 
 /**************************************************
- * A Block is a Hadoop FS primitive, identified by a 
+ * A Block is a Hadoop FS primitive, identified by a
  * long.
  *
  **************************************************/
@@ -124,7 +124,7 @@ public void set(long blkid, long len, long genStamp) {
   public long getBlockId() {
     return blockId;
   }
-  
+
   public void setBlockId(long bid) {
     blockId = bid;
   }
@@ -147,7 +147,7 @@ public void setNumBytes(long len) {
   public long getGenerationStamp() {
     return generationStamp;
   }
-  
+
   public void setGenerationStamp(long stamp) {
     generationStamp = stamp;
   }
@@ -179,13 +179,13 @@ public void write(DataOutput out) throws IOException {
   public void readFields(DataInput in) throws IOException {
     readHelper(in);
   }
-  
+
   final void writeHelper(DataOutput out) throws IOException {
     out.writeLong(blockId);
     out.writeLong(numBytes);
     out.writeLong(generationStamp);
   }
-  
+
   final void readHelper(DataInput in) throws IOException {
     this.blockId = in.readLong();
     this.numBytes = in.readLong();
@@ -194,7 +194,7 @@ final void readHelper(DataInput in) throws IOException {
       throw new IOException("Unexpected block size: " + numBytes);
     }
   }
-  
+
   // write only the identifier part of the block
   public void writeId(DataOutput out) throws IOException {
     out.writeLong(blockId);
@@ -223,7 +223,7 @@ public boolean equals(Object o) {
     }
     return compareTo((Block)o) == 0;
   }
-  
+
   /**
    * @return true if the two blocks have the same block ID and the same
    * generation stamp, or if both blocks are null.

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java → hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeID.java

@@ -50,7 +50,7 @@ public class DatanodeID implements Comparable<DatanodeID> {
 
   /**
    * UUID identifying a given datanode. For upgraded Datanodes this is the
-   * same as the StorageID that was previously used by this Datanode. 
+   * same as the StorageID that was previously used by this Datanode.
    * For newly formatted Datanodes it is a UUID.
    */
   private final String datanodeUuid;
@@ -80,7 +80,7 @@ public DatanodeID(String datanodeUuid, DatanodeID from) {
    *                     e.g. if this is a new datanode. A new UUID will
    *                     be assigned by the namenode.
    * @param xferPort data transfer port
-   * @param infoPort info server port 
+   * @param infoPort info server port
    * @param ipcPort ipc server port
    */
   public DatanodeID(String ipAddr, String hostName, String datanodeUuid,
@@ -92,7 +92,7 @@ public DatanodeID(String ipAddr, String hostName, String datanodeUuid,
     this.infoSecurePort = infoSecurePort;
     this.ipcPort = ipcPort;
   }
-  
+
   public void setIpAddr(String ipAddr) {
     //updated during registration, preserve former xferPort
     setIpAndXferPort(ipAddr, xferPort);
@@ -108,7 +108,7 @@ private void setIpAndXferPort(String ipAddr, int xferPort) {
   public void setPeerHostName(String peerHostName) {
     this.peerHostName = peerHostName;
   }
-  
+
   /**
    * @return data node ID.
    */
@@ -139,12 +139,12 @@ public String getHostName() {
   }
 
   /**
-   * @return hostname from the actual connection 
+   * @return hostname from the actual connection
    */
   public String getPeerHostName() {
     return peerHostName;
   }
-  
+
   /**
    * @return IP:xferPort string
    */
@@ -242,17 +242,17 @@ public boolean equals(Object to) {
     return (getXferAddr().equals(((DatanodeID)to).getXferAddr()) &&
         datanodeUuid.equals(((DatanodeID)to).getDatanodeUuid()));
   }
-  
+
   @Override
   public int hashCode() {
     return datanodeUuid.hashCode();
   }
-  
+
   @Override
   public String toString() {
     return getXferAddr();
   }
-  
+
   /**
    * Update fields when a new registration request comes in.
    * Note that this does not update storageID.
@@ -265,7 +265,7 @@ public void updateRegInfo(DatanodeID nodeReg) {
     infoSecurePort = nodeReg.getInfoSecurePort();
     ipcPort = nodeReg.getIpcPort();
   }
-    
+
   /**
    * Compare based on data transfer address.
    *