Skip to content

Commit e4a3300

Browse files
committed
Change import from scala.jdk.Collections to scala.collection.JavaConverters
1 parent 21766cc commit e4a3300

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import javax.xml.stream.events.{Attribute, Characters, EndElement, StartElement,
2222
import javax.xml.transform.stream.StreamSource
2323
import javax.xml.validation.Schema
2424

25+
import scala.collection.JavaConverters._
2526
import scala.collection.mutable.ArrayBuffer
26-
import scala.jdk.CollectionConverters._
2727
import scala.util.Try
2828
import scala.util.control.NonFatal
2929

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import javax.xml.stream.{EventFilter, XMLEventReader, XMLInputFactory, XMLStream
2222
import javax.xml.stream.events._
2323

2424
import scala.annotation.tailrec
25-
import scala.jdk.CollectionConverters._
25+
import scala.collection.JavaConverters._
2626

2727
import org.apache.spark.sql.execution.datasources.xml.XmlOptions
2828

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/InferSchema.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import javax.xml.stream.events.{Attribute, Characters, EndElement, StartElement,
2222
import javax.xml.transform.stream.StreamSource
2323

2424
import scala.annotation.tailrec
25+
import scala.collection.JavaConverters._
2526
import scala.collection.mutable.ArrayBuffer
26-
import scala.jdk.CollectionConverters._
2727
import scala.util.control.NonFatal
2828

2929
import org.apache.spark.rdd.RDD

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/util/XSDToSchema.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import java.io.{File, FileInputStream, InputStreamReader, StringReader}
2020
import java.nio.charset.StandardCharsets
2121
import java.nio.file.Path
2222

23-
import scala.jdk.CollectionConverters._
23+
import scala.collection.JavaConverters._
2424

2525
import org.apache.ws.commons.schema._
2626
import org.apache.ws.commons.schema.constants.Constants

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/XmlSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import java.nio.file.{Files, Path, Paths}
2121
import java.sql.{Date, Timestamp}
2222
import java.util.TimeZone
2323

24+
import scala.collection.JavaConverters._
2425
import scala.collection.mutable
2526
import scala.io.Source
26-
import scala.jdk.CollectionConverters._
2727

2828
import org.apache.hadoop.conf.Configuration
2929
import org.apache.hadoop.io.{LongWritable, Text}

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/xml/parsers/StaxXmlParserUtilsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import java.io.StringReader
2020
import javax.xml.stream.{XMLInputFactory, XMLStreamConstants}
2121
import javax.xml.stream.events.Attribute
2222

23-
import scala.jdk.CollectionConverters._
23+
import scala.collection.JavaConverters._
2424

2525
import org.scalatest.BeforeAndAfterAll
2626

0 commit comments

Comments
 (0)