HDFS-11953. Remove Guava v21 usage from HDFS-7240. Contributed by Xiaoyu Yao.

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java

@@ -19,7 +19,6 @@
 package org.apache.hadoop.fs;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
 import org.apache.commons.collections.map.CaseInsensitiveMap;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -637,8 +636,8 @@ public class FileUtil {
       }
     }
     // Exit condition -- ZipFile must exist.
-    Verify.verify(archiveName.exists(), "Expected archive file missing: {}",
-        archiveName.toPath());
+    Preconditions.checkState(archiveName.exists(),
+        "Expected archive file missing: {}", archiveName.toPath());
     long crc32 = checksum.getChecksum().getValue();
     checksum.close();
     return crc32;

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/OzoneClientUtils.java

@@ -382,7 +382,7 @@ public final class OzoneClientUtils {
     if ((value == null) || value.isEmpty()) {
       return Optional.absent();
     }
-    return Optional.of(HostAndPort.fromString(value).getHost());
+    return Optional.of(HostAndPort.fromString(value).getHostText());
   }
 
   /**