YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh)

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

@@ -31,7 +31,6 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FileSystem;

hadoop-yarn-project/CHANGES.txt

@@ -632,6 +632,8 @@ Release 2.8.0 - UNRELEASED
     YARN-4164. Changed updateApplicationPriority API to return the updated
     application priority. (Rohith Sharma K S via jianhe)
 
+    YARN-4480. Clean up some inappropriate imports. (Kai Zheng via umamahesh)
+
   OPTIMIZATIONS
 
     YARN-3339. TestDockerContainerExecutor should pull a single image and not

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/MockResourceManagerFacade.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.directory.api.util.Strings;
-import org.apache.directory.api.util.exception.NotImplementedException;
+import com.google.common.base.Strings;
+import org.apache.commons.lang.NotImplementedException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.TokenIdentifier;
@@ -224,7 +224,7 @@ public class MockResourceManagerFacade implements
           // it is OK to hard code it to some dummy value
           NodeId nodeId =
               NodeId.newInstance(
-                  !Strings.isEmpty(rr.getResourceName()) ? rr
+                  !Strings.isNullOrEmpty(rr.getResourceName()) ? rr
                       .getResourceName() : "dummy", 1000);
           container.setNodeId(nodeId);
           container.setResource(rr.getCapability());