diff --git a/dev/dependencyList b/dev/dependencyList index 327d4ac15..348bf08b6 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -29,7 +29,6 @@ arrow-vector/12.0.0//arrow-vector-12.0.0.jar checker-qual/3.42.0//checker-qual-3.42.0.jar classgraph/4.8.138//classgraph-4.8.138.jar commons-codec/1.15//commons-codec-1.15.jar -commons-collections/3.2.2//commons-collections-3.2.2.jar commons-lang3/3.13.0//commons-lang3-3.13.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar error_prone_annotations/2.20.0//error_prone_annotations-2.20.0.jar diff --git a/kyuubi-rest-client/pom.xml b/kyuubi-rest-client/pom.xml index 24571ff9a..cf4b226c7 100644 --- a/kyuubi-rest-client/pom.xml +++ b/kyuubi-rest-client/pom.xml @@ -39,16 +39,6 @@ jackson-databind - - commons-collections - commons-collections - - - - javax.servlet - javax.servlet-api - - org.apache.commons commons-lang3 @@ -122,6 +112,12 @@ jetty-servlet test + + + javax.servlet + javax.servlet-api + test + diff --git a/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/RestClient.java b/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/RestClient.java index 86af2c759..86de74cf6 100644 --- a/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/RestClient.java +++ b/kyuubi-rest-client/src/main/java/org/apache/kyuubi/client/RestClient.java @@ -24,7 +24,6 @@ import java.net.URISyntaxException; import java.net.UnknownHostException; import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpHeaders; @@ -207,7 +206,7 @@ public class RestClient implements IRestClient { String url = StringUtils.isNotBlank(path) ? this.baseUrl + "/" + path : this.baseUrl; URIBuilder builder = new URIBuilder(url); - if (MapUtils.isNotEmpty(params)) { + if (params != null) { for (Map.Entry entry : params.entrySet()) { if (entry.getValue() != null) { builder.addParameter(entry.getKey(), entry.getValue().toString());