Skip to content

Commit d256977

Browse files
committed
[SPARK-53824] Ban org.apache.commons.collections4 package
1 parent 5ae1b3a commit d256977

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

config/checkstyle/checkstyle.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,9 @@
202202
</module>
203203
<module name="IllegalImport">
204204
<property name="illegalPkgs" value="org.apache.log4j"/>
205-
<property name="illegalPkgs" value="org.apache.commons.lang"/>
206205
<property name="illegalPkgs" value="org.apache.commons.collections"/>
206+
<property name="illegalPkgs" value="org.apache.commons.collections4" />
207+
<property name="illegalPkgs" value="org.apache.commons.lang"/>
207208
<property name="illegalPkgs" value="org.apache.commons.lang3" />
208209
</module>
209210
</module>

spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import io.fabric8.kubernetes.client.KubernetesClient;
2929
import org.apache.commons.codec.digest.DigestUtils;
30-
import org.apache.commons.collections4.MapUtils;
3130

3231
import org.apache.spark.SparkConf;
3332
import org.apache.spark.deploy.k8s.KubernetesDriverSpec;
@@ -111,12 +110,12 @@ protected SparkAppDriverConf buildDriverConf(
111110
SparkApplication app, Map<String, String> confOverrides) {
112111
ApplicationSpec applicationSpec = app.getSpec();
113112
SparkConf effectiveSparkConf = new SparkConf();
114-
if (MapUtils.isNotEmpty(applicationSpec.getSparkConf())) {
113+
if (!applicationSpec.getSparkConf().isEmpty()) {
115114
for (String confKey : applicationSpec.getSparkConf().keySet()) {
116115
effectiveSparkConf.set(confKey, applicationSpec.getSparkConf().get(confKey));
117116
}
118117
}
119-
if (MapUtils.isNotEmpty(confOverrides)) {
118+
if (!confOverrides.isEmpty()) {
120119
for (Map.Entry<String, String> entry : confOverrides.entrySet()) {
121120
effectiveSparkConf.set(entry.getKey(), entry.getValue());
122121
}

spark-submission-worker/src/main/java/org/apache/spark/k8s/operator/SparkClusterSubmissionWorker.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import java.util.Map;
2323

24-
import org.apache.commons.collections4.MapUtils;
25-
2624
import org.apache.spark.SparkConf;
2725

2826
/** Worker for submitting Spark clusters. */
@@ -39,13 +37,13 @@ public SparkClusterResourceSpec getResourceSpec(
3937
SparkConf effectiveSparkConf = new SparkConf();
4038

4139
Map<String, String> confFromSpec = cluster.getSpec().getSparkConf();
42-
if (MapUtils.isNotEmpty(confFromSpec)) {
40+
if (!confFromSpec.isEmpty()) {
4341
for (Map.Entry<String, String> entry : confFromSpec.entrySet()) {
4442
effectiveSparkConf.set(entry.getKey(), entry.getValue());
4543
}
4644
}
4745

48-
if (MapUtils.isNotEmpty(confOverrides)) {
46+
if (!confOverrides.isEmpty()) {
4947
for (Map.Entry<String, String> entry : confOverrides.entrySet()) {
5048
effectiveSparkConf.set(entry.getKey(), entry.getValue());
5149
}

0 commit comments

Comments
 (0)