You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2024/01/03 00:00:37 UTC

(spark) branch master updated: [SPARK-45338][TEST][SQL][FOLLOWUP] Use scala.jdk.javaapi.CollectionConverters in JavaHigherOrderFunctionsSuite

This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 65e464769b5a [SPARK-45338][TEST][SQL][FOLLOWUP] Use scala.jdk.javaapi.CollectionConverters in JavaHigherOrderFunctionsSuite
65e464769b5a is described below

commit 65e464769b5a8740b2b5a5caeae78fe596b625b7
Author: Kris Mok <kr...@databricks.com>
AuthorDate: Wed Jan 3 09:00:18 2024 +0900

    [SPARK-45338][TEST][SQL][FOLLOWUP] Use scala.jdk.javaapi.CollectionConverters in JavaHigherOrderFunctionsSuite
    
    ### What changes were proposed in this pull request?
    
    This PR proposes to use `scala.jdk.javaapi.CollectionConverters` intended for Java-interop in `JavaHigherOrderFunctionsSuite` instead of the original `scala.jdk.CollectionConverters`.
    
    ### Why are the changes needed?
    
    Simply Java test suite code by using the Scala standard library type intended for Java-interop.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    Existing test suite `JavaHigherOrderFunctionsSuite`, as this is a test-only change that only affects this suite.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No
    
    Closes #44567 from rednaxelafx/scala213-collectionconverters.
    
    Authored-by: Kris Mok <kr...@databricks.com>
    Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
 .../apache/spark/sql/JavaHigherOrderFunctionsSuite.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sql/core/src/test/java/test/org/apache/spark/sql/JavaHigherOrderFunctionsSuite.java b/sql/core/src/test/java/test/org/apache/spark/sql/JavaHigherOrderFunctionsSuite.java
index 4636b21def88..3ee228fb587f 100644
--- a/sql/core/src/test/java/test/org/apache/spark/sql/JavaHigherOrderFunctionsSuite.java
+++ b/sql/core/src/test/java/test/org/apache/spark/sql/JavaHigherOrderFunctionsSuite.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import static java.util.stream.Collectors.toList;
 
-import scala.jdk.CollectionConverters;
+import scala.jdk.javaapi.CollectionConverters;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -222,10 +222,10 @@ public class JavaHigherOrderFunctionsSuite {
         checkAnswer(
             mapDf.select(transform_keys(col("x"), (k, v) -> k.plus(v))),
             toRows(
-                CollectionConverters.MapHasAsScala(new HashMap<Integer, Integer>() {{
+                CollectionConverters.asScala(new HashMap<Integer, Integer>() {{
                     put(2, 1);
                     put(4, 2);
-                }}).asScala(),
+                }}),
                 null
             )
         );
@@ -236,10 +236,10 @@ public class JavaHigherOrderFunctionsSuite {
         checkAnswer(
             mapDf.select(transform_values(col("x"), (k, v) -> k.plus(v))),
             toRows(
-                CollectionConverters.MapHasAsScala(new HashMap<Integer, Integer>() {{
+                CollectionConverters.asScala(new HashMap<Integer, Integer>() {{
                     put(1, 2);
                     put(2, 4);
-                }}).asScala(),
+                }}),
                 null
             )
         );
@@ -250,7 +250,7 @@ public class JavaHigherOrderFunctionsSuite {
         checkAnswer(
             mapDf.select(map_filter(col("x"), (k, v) -> lit(false))),
             toRows(
-                CollectionConverters.MapHasAsScala(new HashMap<Integer, Integer>()).asScala(),
+                CollectionConverters.asScala(new HashMap<Integer, Integer>()),
                 null
             )
         );
@@ -261,10 +261,10 @@ public class JavaHigherOrderFunctionsSuite {
         checkAnswer(
             mapDf.select(map_zip_with(col("x"), col("x"), (k, v1, v2) -> lit(false))),
             toRows(
-                CollectionConverters.MapHasAsScala(new HashMap<Integer, Boolean>() {{
+                CollectionConverters.asScala(new HashMap<Integer, Boolean>() {{
                     put(1, false);
                     put(2, false);
-                }}).asScala(),
+                }}),
                 null
             )
         );


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