This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 43a52d9 PHOENIX-7430 Remove commons-collections dependency in
queryserver (#163)
43a52d9 is described below
commit 43a52d90ea393b21c1dfa8635127f6fab012b172
Author: Nihal Jain <[email protected]>
AuthorDate: Fri Nov 8 20:23:13 2024 +0530
PHOENIX-7430 Remove commons-collections dependency in queryserver (#163)
- Also remove imports and replace with equivalent code
---
phoenix-queryserver/pom.xml | 4 ----
.../main/java/org/apache/phoenix/util/InstanceResolver.java | 10 ++++++----
pom.xml | 7 -------
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 142694a..345e3f9 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -215,10 +215,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
diff --git
a/phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
index 8a84a92..3f1cc74 100644
---
a/phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
+++
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
@@ -17,8 +17,7 @@
*/
package org.apache.phoenix.util;
-import org.apache.commons.collections.IteratorUtils;
-
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ServiceLoader;
@@ -68,10 +67,13 @@ public class InstanceResolver {
@SuppressWarnings("unchecked")
public static <T> List get(Class<T> clazz, List<T> defaultInstances) {
Iterator<T> iterator = ServiceLoader.load(clazz).iterator();
+ List<T> instances = new ArrayList<>();
+ iterator.forEachRemaining(instances::add);
+
if (defaultInstances != null) {
- defaultInstances.addAll(IteratorUtils.toList(iterator));
+ defaultInstances.addAll(instances);
} else {
- defaultInstances = IteratorUtils.toList(iterator);
+ defaultInstances = instances;
}
return defaultInstances;
diff --git a/pom.xml b/pom.xml
index b527d91..f83192c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,6 @@
<jetty.version>9.4.53.v20231009</jetty.version>
<netty-bom.version>4.1.108.Final</netty-bom.version>
<commons-io.version>2.14.0</commons-io.version>
- <commons-collections.version>3.2.2</commons-collections.version>
<sqlline.version>1.9.0</sqlline.version>
<slf4j.version>1.7.36</slf4j.version>
<avatica.version>1.25.0</avatica.version>
@@ -729,12 +728,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica</artifactId>
