(spark-kubernetes-operator) branch main updated: [SPARK-56443] Use Java-friendly API of `KubernetesDriverSpec`

[do...@apache.org]

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 2f2fc66  [SPARK-56443] Use Java-friendly API of `KubernetesDriverSpec`
2f2fc66 is described below

commit 2f2fc664edc17cf8cec7f0b7fe9b54498f961f83
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Fri Apr 10 09:32:50 2026 -0700

    [SPARK-56443] Use Java-friendly API of `KubernetesDriverSpec`
    
    ### What changes were proposed in this pull request?
    
    This PR aims to use the Java-friendly factory `KubernetesDriverSpec.create` in `SparkAppResourceSpecTest` instead of Mockito mocks and Scala collection converters.
    
    ### Why are the changes needed?
    
    Apache Spark 4.2.0-preview4 provides a Java-friendly static factory `KubernetesDriverSpec.create(SparkPod, java.util.List<HasMetadata>, java.util.List<HasMetadata>, java.util.Map<String, String>)`. Using it removes the need to mock `KubernetesDriverSpec` and to convert Java collections into Scala `Seq`/`HashMap`, making the tests shorter and easier to read.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Pass the CIs with the updated test cases.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    Generated-by: Claude Opus 4.6
    
    Closes #632 from dongjoon-hyun/SPARK-56443.
    
    Authored-by: Dongjoon Hyun <do...@apache.org>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 .../k8s/operator/SparkAppResourceSpecTest.java     | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppResourceSpecTest.java b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppResourceSpecTest.java
index 2eee28d..4ef3476 100644
--- a/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppResourceSpecTest.java
+++ b/spark-submission-worker/src/test/java/org/apache/spark/k8s/operator/SparkAppResourceSpecTest.java
@@ -23,10 +23,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
-
-import scala.collection.immutable.HashMap;
-import scala.collection.immutable.Seq;
-import scala.jdk.javaapi.CollectionConverters;
+import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.Container;
@@ -54,7 +51,6 @@ class SparkAppResourceSpecTest {
     when(mockConf.sparkConf())
         .thenReturn(new SparkConf().set("spark.kubernetes.namespace", "foo-namespace"));
 
-    KubernetesDriverSpec mockSpec = mock(KubernetesDriverSpec.class);
     Pod driver = buildBasicPod("driver");
     SparkPod sparkPod = new SparkPod(driver, buildBasicContainer());
 
@@ -63,15 +59,11 @@ class SparkAppResourceSpecTest {
     Pod pod2 = buildBasicPod("pod-2");
     List<HasMetadata> preResourceList = List.of(pod1);
     List<HasMetadata> resourceList = List.of(pod2);
-    Seq<HasMetadata> preResourceSeq = CollectionConverters.asScala(preResourceList).toList();
-    Seq<HasMetadata> resourceSeq = CollectionConverters.asScala(resourceList).toList();
-    when(mockSpec.driverKubernetesResources()).thenReturn(resourceSeq);
-    when(mockSpec.driverPreKubernetesResources()).thenReturn(preResourceSeq);
-    when(mockSpec.pod()).thenReturn(sparkPod);
-    when(mockSpec.systemProperties()).thenReturn(new HashMap<>());
+    KubernetesDriverSpec spec =
+        KubernetesDriverSpec.create(sparkPod, preResourceList, resourceList, Map.of());
 
     SparkAppResourceSpec appResourceSpec =
-        new SparkAppResourceSpec(mockConf, mockSpec, List.of(), List.of());
+        new SparkAppResourceSpec(mockConf, spec, List.of(), List.of());
 
     Assertions.assertEquals(2, appResourceSpec.getDriverResources().size());
     Assertions.assertEquals(2, appResourceSpec.getDriverPreResources().size());
@@ -120,19 +112,14 @@ class SparkAppResourceSpecTest {
     when(mockConf.sparkConf())
         .thenReturn(new SparkConf().set("spark.kubernetes.namespace", "foo-namespace"));
 
-    KubernetesDriverSpec mockSpec = mock(KubernetesDriverSpec.class);
     Pod driver = buildBasicPod("driver");
     SparkPod sparkPod = new SparkPod(driver, buildBasicContainer());
 
-    // Add some mock resources and pre-resources
-    Seq<HasMetadata> empty = CollectionConverters.asScala(List.<HasMetadata>of()).toList();
-    when(mockSpec.driverKubernetesResources()).thenReturn(empty);
-    when(mockSpec.driverPreKubernetesResources()).thenReturn(empty);
-    when(mockSpec.pod()).thenReturn(sparkPod);
-    when(mockSpec.systemProperties()).thenReturn(new HashMap<>());
+    KubernetesDriverSpec spec =
+        KubernetesDriverSpec.create(sparkPod, List.of(), List.of(), Map.of());
 
     SparkAppResourceSpec appResourceSpec =
-        new SparkAppResourceSpec(mockConf, mockSpec, List.of(), List.of());
+        new SparkAppResourceSpec(mockConf, spec, List.of(), List.of());
 
     Assertions.assertEquals(1, appResourceSpec.getDriverPreResources().size());
     Assertions.assertEquals(NetworkPolicy.class,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org