HADOOP-19143. Upgrade commons-cli to 1.9.0.

Author: yanmin

LICENSE-binary

@@ -243,7 +243,7 @@ com.microsoft.azure:azure-storage:7.0.0
 com.nimbusds:nimbus-jose-jwt:9.37.2
 com.zaxxer:HikariCP:4.0.3
 commons-beanutils:commons-beanutils:1.9.4
-commons-cli:commons-cli:1.5.0
+commons-cli:commons-cli:1.9.0
 commons-codec:commons-codec:1.15
 org.apache.commons:commons-collections4:4.4
 commons-daemon:commons-daemon:1.0.13

hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java

@@ -1370,7 +1370,7 @@ public byte[] getXAttr(Path f, String name) throws IOException {
     JSONObject json = (JSONObject) HttpFSUtils.jsonParse(conn);
     Map<String, byte[]> xAttrs = createXAttrMap(
         (JSONArray) json.get(XATTRS_JSON));
-    return xAttrs != null ? xAttrs.get(name) : null;
+    return xAttrs.get(name);
   }
 
   /** Convert xAttrs json to xAttrs map */

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java

@@ -1085,15 +1085,9 @@ public DatanodeInfo[] getDatanodeReport(DatanodeReportType type)
    * @throws IOException If it cannot get the report.
    */
   DatanodeInfo[] getCachedDatanodeReport(DatanodeReportType type)
-      throws IOException {
+          throws IOException {
     try {
-      DatanodeInfo[] dns = this.dnCache.get(type);
-      if (dns == null) {
-        LOG.debug("Get null DN report from cache");
-        dns = getCachedDatanodeReportImpl(type);
-        this.dnCache.put(type, dns);
-      }
-      return dns;
+      return this.dnCache.get(type);
     } catch (ExecutionException e) {
       LOG.error("Cannot get the DN report for {}", type, e);
       Throwable cause = e.getCause();

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java

@@ -560,7 +560,7 @@ boolean parseArguments(String[] args) throws IOException {
       ignoreSymlink = true;
     }
     String fs = parser.getCommandLine()
-        .getOptionValue("fs", null);
+        .getOptionValue("fs", () -> null);
     String path = parser.getCommandLine().getOptionValue("target",
         "/usr/lib/mr-framework.tar.gz#mr-framework");
     boolean isFullPath =

hadoop-project/pom.xml

@@ -119,7 +119,7 @@
 
     <!-- Apache Commons dependencies -->
     <commons-beanutils.version>1.9.4</commons-beanutils.version>
-    <commons-cli.version>1.5.0</commons-cli.version>
+    <commons-cli.version>1.9.0</commons-cli.version>
     <commons-codec.version>1.15</commons-codec.version>
     <commons-collections4.version>4.4</commons-collections4.version>
     <commons-compress.version>1.26.1</commons-compress.version>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java

@@ -586,7 +586,7 @@ public boolean init(String[] args) throws ParseException {
           + " exiting. Specified numContainer=" + numContainers);
     }
 
-    nodeLabelExpression = cliParser.getOptionValue("node_label_expression", null);
+    nodeLabelExpression = cliParser.getOptionValue("node_label_expression", () -> null);
 
     clientTimeout = Integer.parseInt(cliParser.getOptionValue("timeout", "600000"));
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/main/java/org/apache/hadoop/yarn/applications/unmanagedamlauncher/UnmanagedAMLauncher.java

@@ -160,7 +160,7 @@ public boolean init(String[] args) throws ParseException {
     appName = cliParser.getOptionValue("appname", "UnmanagedAM");
     amPriority = Integer.parseInt(cliParser.getOptionValue("priority", "0"));
     amQueue = cliParser.getOptionValue("queue", "default");
-    classpath = cliParser.getOptionValue("classpath", null);
+    classpath = cliParser.getOptionValue("classpath", () ->null);
 
     amCmd = cliParser.getOptionValue("cmd");
     if (amCmd == null) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/dev-support/findbugs-exclude.xml

@@ -56,4 +56,9 @@
       </Or>
       <Bug pattern="SE_BAD_FIELD" />
   </Match>
+    <Match>
+        <Class name="org.apache.hadoop.yarn.service.ServiceScheduler$1"/>
+        <Method name="load"/>
+        <Bug code="NP" pattern="NP_NONNULL_RETURN_VIOLATION"/>
+    </Match>
 </FindBugsFilter>