This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/spark-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new cd8789c [SPARK-53824] Ban `org.apache.commons.collections4` package
cd8789c is described below
commit cd8789c5dc0647401e045c0b0adf646d80fdb10c
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Tue Oct 7 15:20:04 2025 -0700
[SPARK-53824] Ban `org.apache.commons.collections4` package
### What changes were proposed in this pull request?
This PR aims to ban `org.apache.commons.collections4` package because our
use cases can use more simpler Java API `isEmpty` directly.
```java
Map<String, String> confFromSpec = cluster.getSpec().getSparkConf();
- if (MapUtils.isNotEmpty(confFromSpec)) {
+ if (!confFromSpec.isEmpty()) {
```
### Why are the changes needed?
To reduce the 3rd-party library dependency.
### Does this PR introduce _any_ user-facing change?
No behavior change.
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #372 from dongjoon-hyun/SPARK-53824.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
config/checkstyle/checkstyle.xml | 5 +++--
.../org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java | 5 ++---
.../org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java | 6 ++----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index c5677d5..315a62a 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -201,10 +201,11 @@
value="Please use the `assertThrows` method to test for
exceptions."/>
</module>
<module name="IllegalImport">
- <property name="illegalPkgs" value="org.apache.log4j"/>
- <property name="illegalPkgs" value="org.apache.commons.lang"/>
<property name="illegalPkgs" value="org.apache.commons.collections"/>
+ <property name="illegalPkgs" value="org.apache.commons.collections4" />
+ <property name="illegalPkgs" value="org.apache.commons.lang"/>
<property name="illegalPkgs" value="org.apache.commons.lang3" />
+ <property name="illegalPkgs" value="org.apache.log4j"/>
</module>
</module>
</module>
diff --git
a/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java
b/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java
index 032e198..a9e11bb 100644
---
a/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java
+++
b/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java
@@ -27,7 +27,6 @@ import scala.Option;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections4.MapUtils;
import org.apache.spark.SparkConf;
import org.apache.spark.deploy.k8s.KubernetesDriverSpec;
@@ -111,12 +110,12 @@ public class SparkAppSubmissionWorker {
SparkApplication app, Map<String, String> confOverrides) {
ApplicationSpec applicationSpec = app.getSpec();
SparkConf effectiveSparkConf = new SparkConf();
- if (MapUtils.isNotEmpty(applicationSpec.getSparkConf())) {
+ if (!applicationSpec.getSparkConf().isEmpty()) {
for (String confKey : applicationSpec.getSparkConf().keySet()) {
effectiveSparkConf.set(confKey,
applicationSpec.getSparkConf().get(confKey));
}
}
- if (MapUtils.isNotEmpty(confOverrides)) {
+ if (!confOverrides.isEmpty()) {
for (Map.Entry<String, String> entry : confOverrides.entrySet()) {
effectiveSparkConf.set(entry.getKey(), entry.getValue());
}
diff --git
a/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java
b/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java
index 2460d82..94760ff 100644
---
a/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java
+++
b/spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java
@@ -21,8 +21,6 @@ package org.apache.spark.k8s.operator;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
-
import org.apache.spark.SparkConf;
/** Worker for submitting Spark clusters. */
@@ -39,13 +37,13 @@ public class SparkClusterSubmissionWorker {
SparkConf effectiveSparkConf = new SparkConf();
Map<String, String> confFromSpec = cluster.getSpec().getSparkConf();
- if (MapUtils.isNotEmpty(confFromSpec)) {
+ if (!confFromSpec.isEmpty()) {
for (Map.Entry<String, String> entry : confFromSpec.entrySet()) {
effectiveSparkConf.set(entry.getKey(), entry.getValue());
}
}
- if (MapUtils.isNotEmpty(confOverrides)) {
+ if (!confOverrides.isEmpty()) {
for (Map.Entry<String, String> entry : confOverrides.entrySet()) {
effectiveSparkConf.set(entry.getKey(), entry.getValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
