Change import from scala.jdk.Collections to scala.collection.JavaConv…

…erters
apache · Aug 7, 2023 · e4a3300 · e4a3300
1 parent 21766cc
commit e4a3300
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...src/main/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParser.scala b/...src/main/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParser.scala
@@ -22,8 +22,8 @@ import javax.xml.stream.events.{Attribute, Characters, EndElement, StartElement,
 import javax.xml.transform.stream.StreamSource
 import javax.xml.validation.Schema
 
+import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
-import scala.jdk.CollectionConverters._
 import scala.util.Try
 import scala.util.control.NonFatal
 

diff --git a/...ain/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtils.scala b/...ain/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtils.scala
@@ -22,7 +22,7 @@ import javax.xml.stream.{EventFilter, XMLEventReader, XMLInputFactory, XMLStream
 import javax.xml.stream.events._
 
 import scala.annotation.tailrec
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 import org.apache.spark.sql.execution.datasources.xml.XmlOptions
 

diff --git a/...core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/InferSchema.scala b/...core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/InferSchema.scala
@@ -22,8 +22,8 @@ import javax.xml.stream.events.{Attribute, Characters, EndElement, StartElement,
 import javax.xml.transform.stream.StreamSource
 
 import scala.annotation.tailrec
+import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
-import scala.jdk.CollectionConverters._
 import scala.util.control.NonFatal
 
 import org.apache.spark.rdd.RDD

diff --git a/...core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/XSDToSchema.scala b/...core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/XSDToSchema.scala
@@ -20,7 +20,7 @@ import java.io.{File, FileInputStream, InputStreamReader, StringReader}
 import java.nio.charset.StandardCharsets
 import java.nio.file.Path
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 import org.apache.ws.commons.schema._
 import org.apache.ws.commons.schema.constants.Constants

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala
@@ -21,9 +21,9 @@ import java.nio.file.{Files, Path, Paths}
 import java.sql.{Date, Timestamp}
 import java.util.TimeZone
 
+import scala.collection.JavaConverters._
 import scala.collection.mutable
 import scala.io.Source
-import scala.jdk.CollectionConverters._
 
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.io.{LongWritable, Text}

diff --git a/...cala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtilsSuite.scala b/...cala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtilsSuite.scala
@@ -20,7 +20,7 @@ import java.io.StringReader
 import javax.xml.stream.{XMLInputFactory, XMLStreamConstants}
 import javax.xml.stream.events.Attribute
 
-import scala.jdk.CollectionConverters._
+import scala.collection.JavaConverters._
 
 import org.scalatest.BeforeAndAfterAll