From 4ca965e0c1d82f8aafb2628eaa92edb5b5f64337 Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Wed, 13 May 2020 11:58:09 -0400 Subject: [PATCH] Fix deprecation warns (#2966) --- build.sbt | 22 ++++++++++++++++++- .../scala/com/spotify/scio/avro/AvroIO.scala | 2 +- .../scio/avro/types/ConverterProvider.scala | 4 ++-- .../scio/avro/types/SchemaProvider.scala | 2 +- .../spotify/scio/avro/types/SchemaUtil.scala | 2 +- .../scio/avro/types/TypeProvider.scala | 2 +- .../scio/avro/types/SchemaUtilTest.scala | 2 +- .../scio/bigquery/BigQueryClientIT.scala | 2 +- .../scio/bigquery/types/BeamSchemaIT.scala | 2 +- .../scio/bigquery/types/BigQueryTypeIT.scala | 2 +- .../scio/bigquery/types/StorageIT.scala | 2 +- .../spotify/scio/bigquery/BigQueryIO.scala | 2 +- .../spotify/scio/bigquery/StorageUtil.scala | 2 +- .../scio/bigquery/client/BigQuery.scala | 2 +- .../scio/bigquery/client/ExtractOps.scala | 2 +- .../spotify/scio/bigquery/client/JobOps.scala | 2 +- .../scio/bigquery/client/LoadOps.scala | 2 +- .../scio/bigquery/client/QueryOps.scala | 2 +- .../scio/bigquery/client/TableOps.scala | 2 +- .../scio/bigquery/syntax/TableRowSyntax.scala | 2 +- .../com/spotify/scio/bigquery/taps.scala | 2 +- .../bigquery/types/ConverterProvider.scala | 8 +++---- .../scio/bigquery/types/SchemaProvider.scala | 2 +- .../scio/bigquery/types/SchemaUtil.scala | 2 +- .../scio/bigquery/types/TypeProvider.scala | 2 +- .../scio/bigquery/BigQueryUtilTest.scala | 2 +- .../scio/bigquery/types/SchemaUtilTest.scala | 2 +- .../spotify/scio/bigtable/BigtableIT.scala | 2 +- .../spotify/scio/bigtable/BigTableIO.scala | 2 +- .../spotify/scio/bigtable/TableAdmin.scala | 2 +- .../scio/bigtable/syntax/RowSyntax.scala | 2 +- .../bigtable/syntax/ScioContextSyntax.scala | 2 +- .../scio/bigtable/BigtableDoFnTest.scala | 2 +- .../spotify/scio/bigtable/RichRowTest.scala | 2 +- .../spotify/scio/cassandra/CassandraIT.scala | 2 +- .../scio/cassandra/BulkOperations.scala | 2 +- .../scio/cassandra/DataTypeExternalizer.scala | 2 +- .../kryo/JTraversableSerializer.scala | 2 +- .../com/spotify/scio/util/JMapWrapper.scala | 2 +- .../kryo/JTraversableSerializer.scala | 2 +- .../com/spotify/scio/util/JMapWrapper.scala | 2 +- .../main/scala/com/spotify/scio/Args.scala | 2 +- .../scala/com/spotify/scio/ScioContext.scala | 2 +- .../scala/com/spotify/scio/ScioResult.scala | 2 +- .../scala/com/spotify/scio/SysProps.scala | 2 +- .../scala/com/spotify/scio/VersionUtil.scala | 2 +- .../spotify/scio/coders/AvroBytesUtil.scala | 2 +- .../scala/com/spotify/scio/coders/Coder.scala | 2 +- .../spotify/scio/coders/KryoAtomicCoder.scala | 2 +- .../scio/coders/instances/ScalaCoders.scala | 2 +- .../scala/com/spotify/scio/io/BinaryIO.scala | 2 +- .../com/spotify/scio/io/FileStorage.scala | 2 +- .../scala/com/spotify/scio/io/PubsubIO.scala | 2 +- .../scala/com/spotify/scio/io/TextIO.scala | 2 +- .../io/dynamic/syntax/SCollecionSyntax.scala | 2 +- .../runners/dataflow/DataflowContext.scala | 2 +- .../runners/dataflow/DataflowResult.scala | 2 +- .../scio/runners/flink/FlinkContext.scala | 2 +- .../scio/runners/spark/SparkContext.scala | 2 +- .../spotify/scio/schemas/PrettyPrint.scala | 2 +- .../com/spotify/scio/schemas/Schema.scala | 2 +- .../scio/schemas/SchemaMaterializer.scala | 2 +- .../scala/com/spotify/scio/schemas/To.scala | 2 +- .../schemas/instances/AvroInstances.scala | 2 +- .../schemas/instances/ScalaInstances.scala | 2 +- .../scio/transforms/ScalaFutureHandlers.scala | 2 +- .../com/spotify/scio/transforms/package.scala | 2 +- .../com/spotify/scio/util/ArtisanJoin.scala | 2 +- .../com/spotify/scio/util/Functions.scala | 2 +- .../com/spotify/scio/util/MultiJoin.scala | 2 +- .../spotify/scio/util/TupleFunctions.scala | 2 +- .../com/spotify/scio/values/DistCache.scala | 2 +- .../com/spotify/scio/values/SCollection.scala | 2 +- .../values/SCollectionWithSideInput.scala | 2 +- .../values/SCollectionWithSideOutput.scala | 2 +- .../com/spotify/scio/values/SideInput.scala | 2 +- .../scala/com/spotify/scio/values/Views.scala | 2 +- .../scio/elasticsearch/ElasticsearchIO.scala | 2 +- .../elasticsearch/CoderInstancesTest.scala | 2 +- .../scio/elasticsearch/ElasticsearchIO.scala | 2 +- .../elasticsearch/CoderInstancesTest.scala | 2 +- .../scio/elasticsearch/ElasticsearchIO.scala | 2 +- .../elasticsearch/CoderInstancesTest.scala | 2 +- .../scio/examples/DebuggingWordCount.scala | 2 +- .../scio/examples/complete/AutoComplete.scala | 2 +- .../complete/StreamingWordExtract.scala | 2 +- .../scio/examples/complete/TfIdf.scala | 2 +- .../examples/cookbook/BigQueryTornadoes.scala | 2 +- .../cookbook/CombinePerKeyExamples.scala | 2 +- .../cookbook/DistinctByKeyExample.scala | 2 +- .../examples/cookbook/FilterExamples.scala | 2 +- .../examples/cookbook/MaxPerKeyExamples.scala | 2 +- .../cookbook/StorageBigQueryTornadoes.scala | 2 +- .../scio/examples/extra/AvroExample.scala | 2 +- .../extra/SortMergeBucketExample.scala | 2 +- .../extra/AnnoyIndexSaveExampleTest.scala | 2 +- .../scio/examples/extra/AvroInOutTest.scala | 2 +- .../spotify/scio/extra/annoy/AnnoyIT.scala | 2 +- .../scio/extra/sparkey/SparkeyIT.scala | 2 +- .../instances/StringSparkeyReader.scala | 2 +- .../instances/TypedSparkeyReader.scala | 2 +- .../instances/StringSparkeyReader.scala | 2 +- .../instances/TypedSparkeyReader.scala | 2 +- .../com/spotify/scio/extra/Collections.scala | 2 +- .../spotify/scio/extra/annoy/package.scala | 2 +- .../scio/extra/bigquery/AvroConverters.scala | 2 +- .../scio/extra/bigquery/ToTableRow.scala | 2 +- .../scio/extra/bigquery/ToTableSchema.scala | 2 +- .../scio/extra/nn/NearestNeighbor.scala | 2 +- .../sorter/syntax/SCollectionSyntax.scala | 2 +- .../extra/sparkey/ShardedSparkeyUri.scala | 2 +- .../scio/extra/sparkey/SparkeyUri.scala | 2 +- .../instances/ShardedSparkeyReader.scala | 2 +- .../spotify/scio/extra/sparkey/package.scala | 2 +- .../scio/extra/bigquery/ToTableRowTest.scala | 2 +- .../extra/bigquery/ToTableSchemaTest.scala | 2 +- .../spotify/scio/extra/csv/CsvIOTest.scala | 2 +- .../spotify/scio/extra/json/JsonIOTest.scala | 2 +- .../scio/extra/sparkey/SparkeyTest.scala | 2 +- .../spotify/scio/jmh/FunctionsBenchmark.scala | 2 +- .../spotify/scio/jmh/GroupByBenchmark.scala | 2 +- .../com/spotify/scio/jmh/JoinBenchmark.scala | 2 +- .../scio/parquet/avro/ParquetAvroIO.scala | 2 +- .../parquet/tensorflow/ParquetExampleIO.scala | 2 +- .../tensorflow/ParquetExampleIOTest.scala | 2 +- .../com/spotify/scio/repl/IoCommands.scala | 2 +- .../com/spotify/scio/avro/AvroUtils.scala | 2 +- .../scio/smb/SortMergeBucketParityIT.scala | 2 +- .../SortMergeBucketScioContextSyntax.scala | 2 +- .../spotify/scio/spanner/SpannerIOIT.scala | 2 +- .../com/spotify/scio/spanner/SpannerIO.scala | 2 +- .../main/scala/com/spotify/scio/sql/Sql.scala | 2 +- .../scio/tensorflow/TensorFlowDoFns.scala | 2 +- .../scio/tensorflow/MetadataSchemaTest.scala | 2 +- .../scio/tensorflow/TFExampleTest.scala | 2 +- .../tensorflow/TFSequenceExampleIOTest.scala | 2 +- .../src/it/scala/com/spotify/DataflowIT.scala | 2 +- .../com/spotify/scio/PopulateTestData.scala | 2 +- .../com/spotify/scio/values/DistCacheIT.scala | 2 +- .../com/spotify/scio/testing/Pretty.scala | 2 +- .../scio/testing/SCollectionMatchers.scala | 2 +- .../scala/com/spotify/scio/ArgsTest.scala | 10 ++++----- .../com/spotify/scio/ScioContextTest.scala | 2 +- .../com/spotify/scio/coders/CoderTest.scala | 2 +- .../scio/coders/KryoAtomicCoderTest.scala | 2 +- .../instances/kryo/GrpcSerializersTest.scala | 2 +- .../instances/kryo/JodaSerializerTest.scala | 2 +- .../com/spotify/scio/io/ScioIOTest.scala | 2 +- .../scio/io/dynamic/DynamicFileTest.scala | 2 +- .../scio/schemas/SchemaCompatTest.scala | 16 +++++++------- .../scio/schemas/SchemaMaterializerTest.scala | 2 +- .../com/spotify/scio/sql/BeamSQLTest.scala | 10 ++++----- .../scio/transforms/AsyncLookupDoFnTest.scala | 2 +- .../transforms/FileDownloadDoFnTest.scala | 2 +- .../com/spotify/scio/util/FunctionsTest.scala | 2 +- .../spotify/scio/util/ProtobufUtilTest.scala | 2 +- .../spotify/scio/values/DistCacheTest.scala | 2 +- .../spotify/scio/values/SCollectionTest.scala | 2 +- scripts/multijoin.py | 2 +- 159 files changed, 198 insertions(+), 178 deletions(-) diff --git a/build.sbt b/build.sbt index 3b061c1f33..d607cf4b2a 100644 --- a/build.sbt +++ b/build.sbt @@ -531,6 +531,7 @@ lazy val `scio-sql`: Project = Project( .settings( description := "Scio - SQL extension", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.apache.beam" % "beam-sdks-java-extensions-sql" % beamVersion, "org.apache.commons" % "commons-lang3" % commonsLang3Version, @@ -551,6 +552,7 @@ lazy val `scio-test`: Project = project .settings( description := "Scio helpers for ScalaTest", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-runners-direct-java" % beamVersion, "org.apache.beam" % "beam-runners-google-cloud-dataflow-java" % beamVersion % "test,it", "org.apache.beam" % "beam-sdks-java-core" % beamVersion % "test", @@ -616,6 +618,7 @@ lazy val `scio-avro`: Project = project .settings( description := "Scio add-on for working with Avro", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "me.lyh" %% "protobuf-generic" % protobufGenericVersion, "org.apache.beam" % "beam-vendor-guava-26_0-jre" % beamVendorVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, @@ -646,6 +649,7 @@ lazy val `scio-bigquery`: Project = project .settings( description := "Scio add-on for Google BigQuery", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-vendor-guava-26_0-jre" % beamVendorVersion, "com.twitter" %% "chill" % chillVersion, "com.google.protobuf" % "protobuf-java" % protobufVersion, @@ -691,6 +695,7 @@ lazy val `scio-bigtable`: Project = project .settings( description := "Scio add-on for Google Cloud Bigtable", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "joda-time" % "joda-time" % jodaTimeVersion, "com.google.protobuf" % "protobuf-java" % protobufVersion, @@ -723,6 +728,7 @@ lazy val `scio-cassandra3`: Project = project .settings( description := "Scio add-on for Apache Cassandra 3.x", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "com.google.protobuf" % "protobuf-java" % protobufVersion, "com.google.guava" % "guava" % guavaVersion, "com.twitter" %% "chill" % chillVersion, @@ -751,6 +757,7 @@ lazy val `scio-elasticsearch5`: Project = project .settings( description := "Scio add-on for writing to Elasticsearch", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-vendor-guava-26_0-jre" % beamVendorVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "joda-time" % "joda-time" % jodaTimeVersion, @@ -770,6 +777,7 @@ lazy val `scio-elasticsearch6`: Project = project .settings( description := "Scio add-on for writing to Elasticsearch", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-vendor-guava-26_0-jre" % beamVendorVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "joda-time" % "joda-time" % jodaTimeVersion, @@ -790,6 +798,7 @@ lazy val `scio-elasticsearch7`: Project = project .settings( description := "Scio add-on for writing to Elasticsearch", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-vendor-guava-26_0-jre" % beamVendorVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "joda-time" % "joda-time" % jodaTimeVersion, @@ -814,6 +823,7 @@ lazy val `scio-extra`: Project = project .settings( description := "Scio extra utilities", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.apache.beam" % "beam-sdks-java-extensions-sorter" % beamVersion, "com.google.apis" % "google-api-services-bigquery" % googleApiServicesBigQuery, @@ -885,6 +895,7 @@ lazy val `scio-parquet`: Project = project javacOptions ++= Seq("-s", (sourceManaged.value / "main").toString), description := "Scio add-on for Parquet", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "me.lyh" %% "parquet-avro" % parquetExtraVersion, "me.lyh" % "parquet-tensorflow" % parquetExtraVersion, "com.google.cloud.bigdataoss" % "gcs-connector" % s"hadoop2-$bigdataossVersion", @@ -917,6 +928,7 @@ lazy val `scio-spanner`: Project = project .settings( description := "Scio add-on for Google Cloud Spanner", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "com.google.cloud" % "google-cloud-core" % "1.92.2", "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "com.google.cloud" % "google-cloud-spanner" % googleCloudSpannerVersion excludeAll ( @@ -944,6 +956,7 @@ lazy val `scio-tensorflow`: Project = project Compile / managedSourceDirectories := (Compile / managedSourceDirectories).value .filterNot(_.getPath.endsWith("/src_managed/main")), libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.tensorflow" % "tensorflow" % tensorFlowVersion, "org.tensorflow" % "proto" % tensorFlowVersion, @@ -975,7 +988,10 @@ lazy val `scio-schemas`: Project = project .settings(protobufSettings) .settings( description := "Avro/Proto schemas for testing", - libraryDependencies += "org.apache.avro" % "avro" % avroVersion, + libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, + "org.apache.avro" % "avro" % avroVersion + ), Compile / sourceDirectories := (Compile / sourceDirectories).value .filterNot(_.getPath.endsWith("/src_managed/main")), Compile / managedSourceDirectories := (Compile / managedSourceDirectories).value @@ -994,6 +1010,7 @@ lazy val `scio-examples`: Project = project .settings(macroSettings) .settings( libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.apache.avro" % "avro" % avroVersion, "com.google.cloud.datastore" % "datastore-v1-proto-client" % datastoreV1ProtoClientVersion, @@ -1066,6 +1083,7 @@ lazy val `scio-repl`: Project = project .settings(macroSettings) .settings( libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-runners-direct-java" % beamVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.apache.avro" % "avro" % avroVersion, @@ -1104,6 +1122,7 @@ lazy val `scio-jmh`: Project = project classDirectory in Jmh := (classDirectory in Test).value, dependencyClasspath in Jmh := (dependencyClasspath in Test).value, libraryDependencies ++= directRunnerDependencies ++ Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "junit" % "junit" % junitVersion % "test", "org.hamcrest" % "hamcrest-core" % hamcrestVersion % "test", "org.hamcrest" % "hamcrest-library" % hamcrestVersion % "test", @@ -1124,6 +1143,7 @@ lazy val `scio-smb`: Project = project .settings( description := "Sort Merge Bucket source/sink implementations for Apache Beam", libraryDependencies ++= Seq( + "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion, "org.apache.beam" % "beam-sdks-java-core" % beamVersion % "it,test" classifier "tests", "org.apache.beam" % "beam-sdks-java-extensions-sorter" % beamVersion, diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala b/scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala index aba84a2c94..f6a64b2cbe 100644 --- a/scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala +++ b/scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala @@ -32,7 +32,7 @@ import org.apache.beam.sdk.transforms.DoFn.ProcessElement import org.apache.beam.sdk.transforms.{DoFn, SerializableFunction} import org.apache.beam.sdk.{io => beam} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe._ import scala.reflect.ClassTag diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala b/scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala index d6891bb196..a25eb25d31 100644 --- a/scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala +++ b/scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala @@ -118,7 +118,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: ${p(c, ApacheAvro)}.generic.GenericRecord) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ @@ -204,7 +204,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: $tpe) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala b/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala index c0be8b25c6..8a41f372d9 100644 --- a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala +++ b/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala @@ -26,7 +26,7 @@ import com.spotify.scio.avro.types.MacroUtil._ import org.apache.avro.{JsonProperties, Schema} import org.apache.avro.Schema.Field -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe import scala.reflect.runtime.universe._ diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala b/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala index 9fef5b3ccc..9f2f65ce99 100644 --- a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala +++ b/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala @@ -20,7 +20,7 @@ package com.spotify.scio.avro.types import org.apache.avro.Schema import org.apache.avro.Schema.Type._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Utility for Avro schemas. */ object SchemaUtil { diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala b/scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala index 44e7ff6b8c..8d196b3cdf 100644 --- a/scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala +++ b/scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala @@ -38,7 +38,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.hash.Hashing import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.Files import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.macros._ import scala.util.Try diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala b/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala index bff3020cf9..1bdc1b3d75 100644 --- a/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala +++ b/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala @@ -23,7 +23,7 @@ import org.apache.avro.Schema import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class SchemaUtilTest extends AnyFlatSpec with Matchers { "toPrettyString()" should "support primitive types" in { diff --git a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/BigQueryClientIT.scala b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/BigQueryClientIT.scala index a63a1cc98b..d07e306d35 100644 --- a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/BigQueryClientIT.scala +++ b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/BigQueryClientIT.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Success // scio-test/it:runMain PopulateTestData to re-populate data for integration tests diff --git a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BeamSchemaIT.scala b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BeamSchemaIT.scala index b1c2738675..5ec8eee3cc 100644 --- a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BeamSchemaIT.scala +++ b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BeamSchemaIT.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.testing.PAssert import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object BeamSchemaIT { final case class Shakespeare(word: String, word_count: Long, corpus: String, corpus_date: Long) diff --git a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BigQueryTypeIT.scala b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BigQueryTypeIT.scala index 436922caca..66f1c8f80c 100644 --- a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BigQueryTypeIT.scala +++ b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/BigQueryTypeIT.scala @@ -23,7 +23,7 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import scala.annotation.StaticAnnotation -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe._ import com.spotify.scio.bigquery.Query diff --git a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/StorageIT.scala b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/StorageIT.scala index b703a8b87f..9d4214f0b1 100644 --- a/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/StorageIT.scala +++ b/scio-bigquery/src/it/scala/com/spotify/scio/bigquery/types/StorageIT.scala @@ -29,7 +29,7 @@ import org.joda.time.{DateTimeZone, Duration, Instant} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ // scio-test/it:runMain PopulateTestData to re-populate data for integration tests class StorageIT extends AnyFlatSpec with Matchers { diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/BigQueryIO.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/BigQueryIO.scala index 2f03ed961b..30781f9dc7 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/BigQueryIO.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/BigQueryIO.scala @@ -41,7 +41,7 @@ import org.apache.beam.sdk.io.gcp.{bigquery => beam} import org.apache.beam.sdk.io.{Compression, TextIO} import org.apache.beam.sdk.transforms.SerializableFunction -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.reflect.runtime.universe._ diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/StorageUtil.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/StorageUtil.scala index aaee0c6b85..4028d7a9bf 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/StorageUtil.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/StorageUtil.scala @@ -22,7 +22,7 @@ import com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions import org.apache.avro.Schema import org.apache.avro.Schema.Type -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Utility for BigQuery Storage API. */ object StorageUtil { diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/BigQuery.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/BigQuery.scala index c10faa7a60..4686ef4b8a 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/BigQuery.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/BigQuery.scala @@ -40,7 +40,7 @@ import org.apache.beam.sdk.io.gcp.bigquery.BigQueryHelpers import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write.{CreateDisposition, WriteDisposition} import org.apache.beam.sdk.io.gcp.{bigquery => beam} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe.TypeTag import scala.util.Try diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/ExtractOps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/ExtractOps.scala index 3c05071543..71669b68ea 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/ExtractOps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/ExtractOps.scala @@ -23,7 +23,7 @@ import com.spotify.scio.bigquery.BigQueryUtil import org.apache.beam.sdk.io.gcp.{bigquery => bq} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[client] object ExtractOps { private val Logger = LoggerFactory.getLogger(this.getClass) diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/JobOps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/JobOps.scala index 21bf0e097a..25a1e25555 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/JobOps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/JobOps.scala @@ -26,7 +26,7 @@ import org.joda.time.Period import org.joda.time.format.PeriodFormatterBuilder import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[client] object JobOps { private val Logger = LoggerFactory.getLogger(this.getClass) diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/LoadOps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/LoadOps.scala index 4250a39621..d818a0be5a 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/LoadOps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/LoadOps.scala @@ -24,7 +24,7 @@ import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write.{CreateDisposition, import org.apache.beam.sdk.io.gcp.{bigquery => bq} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try private[client] object LoadOps { diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/QueryOps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/QueryOps.scala index b2e400cf16..08ddc711a9 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/QueryOps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/QueryOps.scala @@ -27,7 +27,7 @@ import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write.{CreateDisposition, import org.apache.beam.sdk.io.gcp.{bigquery => bq} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable.{Map => MMap} import scala.util.control.NonFatal import scala.util.{Failure, Success, Try} diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/TableOps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/TableOps.scala index ab47a0a1c0..df7f196a10 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/TableOps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/client/TableOps.scala @@ -37,7 +37,7 @@ import org.joda.time.Instant import org.joda.time.format.DateTimeFormat import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable.ArrayBuffer import scala.util.Random import scala.util.control.NonFatal diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/syntax/TableRowSyntax.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/syntax/TableRowSyntax.scala index f4f1766725..968758f326 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/syntax/TableRowSyntax.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/syntax/TableRowSyntax.scala @@ -21,7 +21,7 @@ package com.spotify.scio.bigquery.syntax import com.spotify.scio.bigquery.{Date, DateTime, TableRow, Time, Timestamp} import org.joda.time.{Instant, LocalDate, LocalDateTime, LocalTime} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/taps.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/taps.scala index b6ef2cda6a..9b979e421e 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/taps.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/taps.scala @@ -25,7 +25,7 @@ import com.spotify.scio.coders.Coder import com.spotify.scio.io.{FileStorage, Tap, Taps} import com.spotify.scio.values.SCollection -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.Future import scala.reflect.ClassTag import scala.reflect.runtime.universe._ diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/ConverterProvider.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/ConverterProvider.scala index 45f013c788..e77a1db275 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/ConverterProvider.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/ConverterProvider.scala @@ -153,7 +153,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: _root_.org.apache.avro.generic.GenericRecord) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ @@ -247,7 +247,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: $tpe) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ @@ -353,7 +353,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: _root_.java.util.Map[String, AnyRef]) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ @@ -451,7 +451,7 @@ private[types] object ConverterProvider { val tn = TermName("r") q"""(r: $tpe) => { - import _root_.scala.collection.JavaConverters._ + import _root_.scala.jdk.CollectionConverters._ ${constructor(tpe, tn)} } """ diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaProvider.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaProvider.scala index 9e9627ea99..ce22eea46b 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaProvider.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaProvider.scala @@ -25,7 +25,7 @@ import org.apache.avro.Schema import org.apache.beam.sdk.io.gcp.bigquery.BigQueryUtils import org.joda.time.{Instant, LocalDate, LocalDateTime, LocalTime} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe._ import com.spotify.scio.util.Cache diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaUtil.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaUtil.scala index e822ddcb8c..1da78a6adc 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaUtil.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/SchemaUtil.scala @@ -21,7 +21,7 @@ import java.util.{List => JList} import com.google.api.services.bigquery.model.{TableFieldSchema, TableSchema} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Utility for BigQuery schemas. */ object SchemaUtil { diff --git a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/TypeProvider.scala b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/TypeProvider.scala index 28c9c3d917..957c59d58d 100644 --- a/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/TypeProvider.scala +++ b/scio-bigquery/src/main/scala/com/spotify/scio/bigquery/types/TypeProvider.scala @@ -37,7 +37,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.hash.Hashing import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.Files import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable.{Buffer => MBuffer, Map => MMap} import scala.reflect.macros._ diff --git a/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/BigQueryUtilTest.scala b/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/BigQueryUtilTest.scala index c93618cdab..c8e9215031 100644 --- a/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/BigQueryUtilTest.scala +++ b/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/BigQueryUtilTest.scala @@ -22,7 +22,7 @@ import com.google.api.services.bigquery.model.{TableFieldSchema, TableSchema} import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class BigQueryUtilTest extends AnyFlatSpec with Matchers { "parseSchema" should "work" in { diff --git a/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/types/SchemaUtilTest.scala b/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/types/SchemaUtilTest.scala index 39f677fc92..870478ec1d 100644 --- a/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/types/SchemaUtilTest.scala +++ b/scio-bigquery/src/test/scala/com/spotify/scio/bigquery/types/SchemaUtilTest.scala @@ -21,7 +21,7 @@ import com.google.api.services.bigquery.model.{TableFieldSchema, TableSchema} import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class SchemaUtilTest extends AnyFlatSpec with Matchers { def newSchema(mode: String): TableSchema = diff --git a/scio-bigtable/src/it/scala/com/spotify/scio/bigtable/BigtableIT.scala b/scio-bigtable/src/it/scala/com/spotify/scio/bigtable/BigtableIT.scala index d448adae74..17cba62dd7 100644 --- a/scio-bigtable/src/it/scala/com/spotify/scio/bigtable/BigtableIT.scala +++ b/scio-bigtable/src/it/scala/com/spotify/scio/bigtable/BigtableIT.scala @@ -28,7 +28,7 @@ import com.spotify.scio._ import com.spotify.scio.testing._ import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object BigtableIT { val projectId = "data-integration-test" diff --git a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/BigTableIO.scala b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/BigTableIO.scala index cf6d2d4fac..ae42b5e841 100644 --- a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/BigTableIO.scala +++ b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/BigTableIO.scala @@ -29,7 +29,7 @@ import org.apache.beam.sdk.transforms.SerializableFunction import org.apache.beam.sdk.values.KV import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ sealed trait BigtableIO[T] extends ScioIO[T] { final override val tapT = EmptyTapOf[T] diff --git a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/TableAdmin.scala b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/TableAdmin.scala index 83d34b26f9..52b0444dc8 100644 --- a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/TableAdmin.scala +++ b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/TableAdmin.scala @@ -27,7 +27,7 @@ import com.google.protobuf.{ByteString, Duration => ProtoDuration} import org.joda.time.Duration import org.slf4j.{Logger, LoggerFactory} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try /** diff --git a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/RowSyntax.scala b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/RowSyntax.scala index e4b05f58d9..3355b1c51c 100644 --- a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/RowSyntax.scala +++ b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/RowSyntax.scala @@ -3,7 +3,7 @@ package com.spotify.scio.bigtable.syntax import com.google.bigtable.v2.Row import com.google.protobuf.ByteString -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.google.bigtable.v2.Cell /** Enhanced version of `Row` with convenience methods. */ diff --git a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/ScioContextSyntax.scala b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/ScioContextSyntax.scala index 4db050bce5..03e8007fc8 100644 --- a/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/ScioContextSyntax.scala +++ b/scio-bigtable/src/main/scala/com/spotify/scio/bigtable/syntax/ScioContextSyntax.scala @@ -28,7 +28,7 @@ import com.spotify.scio.values.SCollection import org.apache.beam.sdk.io.range.ByteKeyRange import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object ScioContextOps { private val DefaultSleepDuration = Duration.standardMinutes(20) diff --git a/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/BigtableDoFnTest.scala b/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/BigtableDoFnTest.scala index 793a8f0c41..c60cd852d9 100644 --- a/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/BigtableDoFnTest.scala +++ b/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/BigtableDoFnTest.scala @@ -25,7 +25,7 @@ import com.google.common.util.concurrent.{Futures, ListenableFuture} import com.spotify.scio.testing._ import com.spotify.scio.transforms.BaseAsyncLookupDoFn.CacheSupplier -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success} class BigtableDoFnTest extends PipelineSpec { diff --git a/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/RichRowTest.scala b/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/RichRowTest.scala index e22a3ce548..bed92d6ea2 100644 --- a/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/RichRowTest.scala +++ b/scio-bigtable/src/test/scala/com/spotify/scio/bigtable/RichRowTest.scala @@ -22,7 +22,7 @@ import com.google.protobuf.ByteString import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.immutable.ListMap class RichRowTest extends AnyFlatSpec with Matchers { diff --git a/scio-cassandra/cassandra3/src/it/scala/com/spotify/scio/cassandra/CassandraIT.scala b/scio-cassandra/cassandra3/src/it/scala/com/spotify/scio/cassandra/CassandraIT.scala index 5384211664..7f2b50116f 100644 --- a/scio-cassandra/cassandra3/src/it/scala/com/spotify/scio/cassandra/CassandraIT.scala +++ b/scio-cassandra/cassandra3/src/it/scala/com/spotify/scio/cassandra/CassandraIT.scala @@ -29,7 +29,7 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class CassandraIT extends AnyFlatSpec with Matchers with BeforeAndAfterAll { import CassandraIT._ diff --git a/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/BulkOperations.scala b/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/BulkOperations.scala index 759f8a3157..944dae9a82 100644 --- a/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/BulkOperations.scala +++ b/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/BulkOperations.scala @@ -26,7 +26,7 @@ import org.apache.cassandra.hadoop.cql3._ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.mapred.TaskAttemptContext -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[cassandra] class BulkOperations(val opts: CassandraOptions, val parallelism: Int) extends Serializable { diff --git a/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/DataTypeExternalizer.scala b/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/DataTypeExternalizer.scala index 795d2752a2..95473d2110 100644 --- a/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/DataTypeExternalizer.scala +++ b/scio-cassandra/cassandra3/src/main/scala/com/spotify/scio/cassandra/DataTypeExternalizer.scala @@ -24,7 +24,7 @@ import com.datastax.driver.core.DataType import com.google.common.collect.{ImmutableList, ImmutableSet} import com.twitter.chill._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[cassandra] object DataTypeExternalizer { final def apply(dt: DataType): DataTypeExternalizer = { diff --git a/scio-core/src/main/scala-2.12/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala b/scio-core/src/main/scala-2.12/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala index ff6e43acd0..da9a083290 100644 --- a/scio-core/src/main/scala-2.12/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala +++ b/scio-core/src/main/scala-2.12/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala @@ -21,7 +21,7 @@ import com.esotericsoftware.kryo.Kryo import com.esotericsoftware.kryo.io.{Input, InputChunked, Output, OutputChunked} import com.twitter.chill.KSerializer -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.generic.CanBuildFrom import scala.collection.mutable diff --git a/scio-core/src/main/scala-2.12/com/spotify/scio/util/JMapWrapper.scala b/scio-core/src/main/scala-2.12/com/spotify/scio/util/JMapWrapper.scala index faf04206c5..4a98a93173 100644 --- a/scio-core/src/main/scala-2.12/com/spotify/scio/util/JMapWrapper.scala +++ b/scio-core/src/main/scala-2.12/com/spotify/scio/util/JMapWrapper.scala @@ -20,7 +20,7 @@ package com.spotify.scio.util import java.lang.{Iterable => JIterable} import java.util.{Map => JMap} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Immutable wrappers for [[java.util.Map]]. diff --git a/scio-core/src/main/scala-2.13/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala b/scio-core/src/main/scala-2.13/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala index 5be8b1e2dd..3a2a4055e6 100644 --- a/scio-core/src/main/scala-2.13/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala +++ b/scio-core/src/main/scala-2.13/com/spotify/scio/coders/instances/kryo/JTraversableSerializer.scala @@ -21,7 +21,7 @@ import com.esotericsoftware.kryo.Kryo import com.esotericsoftware.kryo.io.{Input, InputChunked, Output, OutputChunked} import com.twitter.chill.KSerializer -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable import scala.collection.compat._ diff --git a/scio-core/src/main/scala-2.13/com/spotify/scio/util/JMapWrapper.scala b/scio-core/src/main/scala-2.13/com/spotify/scio/util/JMapWrapper.scala index b7f5cc9339..5bd4dfe32e 100644 --- a/scio-core/src/main/scala-2.13/com/spotify/scio/util/JMapWrapper.scala +++ b/scio-core/src/main/scala-2.13/com/spotify/scio/util/JMapWrapper.scala @@ -20,7 +20,7 @@ package com.spotify.scio.util import java.lang.{Iterable => JIterable} import java.util.{Map => JMap} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Immutable wrappers for [[java.util.Map]]. diff --git a/scio-core/src/main/scala/com/spotify/scio/Args.scala b/scio-core/src/main/scala/com/spotify/scio/Args.scala index f952a5838d..5c80e710aa 100644 --- a/scio-core/src/main/scala/com/spotify/scio/Args.scala +++ b/scio-core/src/main/scala/com/spotify/scio/Args.scala @@ -19,7 +19,7 @@ package com.spotify.scio import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Splitter -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.control.NonFatal /** diff --git a/scio-core/src/main/scala/com/spotify/scio/ScioContext.scala b/scio-core/src/main/scala/com/spotify/scio/ScioContext.scala index 3d72dc3494..d546a7a0b0 100644 --- a/scio-core/src/main/scala/com/spotify/scio/ScioContext.scala +++ b/scio-core/src/main/scala/com/spotify/scio/ScioContext.scala @@ -46,7 +46,7 @@ import org.joda.time.Instant import org.slf4j.LoggerFactory import scala.annotation.tailrec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable.{Buffer => MBuffer} import scala.concurrent.duration.Duration import scala.io.Source diff --git a/scio-core/src/main/scala/com/spotify/scio/ScioResult.scala b/scio-core/src/main/scala/com/spotify/scio/ScioResult.scala index 380b6f4653..4cf3036806 100644 --- a/scio-core/src/main/scala/com/spotify/scio/ScioResult.scala +++ b/scio-core/src/main/scala/com/spotify/scio/ScioResult.scala @@ -29,7 +29,7 @@ import org.apache.beam.sdk.metrics.{DistributionResult, GaugeResult} import org.apache.beam.sdk.util.MimeTypes import org.apache.beam.sdk.{PipelineResult, metrics => beam} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/SysProps.scala b/scio-core/src/main/scala/com/spotify/scio/SysProps.scala index 277f063e4f..ba47d1cd55 100644 --- a/scio-core/src/main/scala/com/spotify/scio/SysProps.scala +++ b/scio-core/src/main/scala/com/spotify/scio/SysProps.scala @@ -44,7 +44,7 @@ trait SysProps { } object SysProps { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ import scala.reflect.runtime.universe def properties: Iterable[SysProps] = { diff --git a/scio-core/src/main/scala/com/spotify/scio/VersionUtil.scala b/scio-core/src/main/scala/com/spotify/scio/VersionUtil.scala index b55d7f48b4..94e3874a33 100644 --- a/scio-core/src/main/scala/com/spotify/scio/VersionUtil.scala +++ b/scio-core/src/main/scala/com/spotify/scio/VersionUtil.scala @@ -26,7 +26,7 @@ import org.apache.beam.sdk.{PipelineResult, PipelineRunner} import org.slf4j.LoggerFactory import scala.io.AnsiColor._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/coders/AvroBytesUtil.scala b/scio-core/src/main/scala/com/spotify/scio/coders/AvroBytesUtil.scala index e31678e92b..a5d32c6aa7 100644 --- a/scio-core/src/main/scala/com/spotify/scio/coders/AvroBytesUtil.scala +++ b/scio-core/src/main/scala/com/spotify/scio/coders/AvroBytesUtil.scala @@ -24,7 +24,7 @@ import org.apache.avro.generic.{GenericData, GenericRecord} import org.apache.beam.sdk.coders.{Coder => BCoder} import org.apache.beam.sdk.util.CoderUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[scio] object AvroBytesUtil { val schema: ASchema = { diff --git a/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala b/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala index 9e521c3486..ab09c4a2c6 100644 --- a/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala +++ b/scio-core/src/main/scala/com/spotify/scio/coders/Coder.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.util.common.ElementByteSizeObserver import org.apache.beam.sdk.values.KV import scala.annotation.implicitNotFound -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.{BitSet, SortedSet, TraversableOnce, mutable => m} import scala.reflect.ClassTag import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/coders/KryoAtomicCoder.scala b/scio-core/src/main/scala/com/spotify/scio/coders/KryoAtomicCoder.scala index dee233d960..0a8a793d89 100644 --- a/scio-core/src/main/scala/com/spotify/scio/coders/KryoAtomicCoder.scala +++ b/scio-core/src/main/scala/com/spotify/scio/coders/KryoAtomicCoder.scala @@ -45,7 +45,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.reflect.ClassPat import org.joda.time.{DateTime, LocalDate, LocalDateTime, LocalTime} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable import scala.collection.compat.extra.Wrappers diff --git a/scio-core/src/main/scala/com/spotify/scio/coders/instances/ScalaCoders.scala b/scio-core/src/main/scala/com/spotify/scio/coders/instances/ScalaCoders.scala index 9422643384..13a3b32e9d 100644 --- a/scio-core/src/main/scala/com/spotify/scio/coders/instances/ScalaCoders.scala +++ b/scio-core/src/main/scala/com/spotify/scio/coders/instances/ScalaCoders.scala @@ -29,7 +29,7 @@ import org.apache.beam.sdk.util.common.ElementByteSizeObserver import org.apache.beam.sdk.util.BufferedElementCountingOutputStream import org.apache.beam.sdk.util.VarInt -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.collection.{BitSet, SortedSet, TraversableOnce, mutable => m} import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/io/BinaryIO.scala b/scio-core/src/main/scala/com/spotify/scio/io/BinaryIO.scala index 160f200bd8..beb7617c5a 100644 --- a/scio-core/src/main/scala/com/spotify/scio/io/BinaryIO.scala +++ b/scio-core/src/main/scala/com/spotify/scio/io/BinaryIO.scala @@ -27,7 +27,7 @@ import org.apache.beam.sdk.io._ import org.apache.beam.sdk.io.FileIO.Write.FileNaming import org.apache.beam.sdk.io.fs.MatchResult.Metadata import org.apache.commons.compress.compressors.CompressorStreamFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/io/FileStorage.scala b/scio-core/src/main/scala/com/spotify/scio/io/FileStorage.scala index e65cfe498c..eb7c985274 100644 --- a/scio-core/src/main/scala/com/spotify/scio/io/FileStorage.scala +++ b/scio-core/src/main/scala/com/spotify/scio/io/FileStorage.scala @@ -35,7 +35,7 @@ import org.apache.beam.sdk.io.fs.MatchResult.Metadata import org.apache.commons.compress.compressors.CompressorStreamFactory import org.apache.commons.io.IOUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag private[scio] object FileStorage { diff --git a/scio-core/src/main/scala/com/spotify/scio/io/PubsubIO.scala b/scio-core/src/main/scala/com/spotify/scio/io/PubsubIO.scala index 976ae26a91..25785b0433 100644 --- a/scio-core/src/main/scala/com/spotify/scio/io/PubsubIO.scala +++ b/scio-core/src/main/scala/com/spotify/scio/io/PubsubIO.scala @@ -31,7 +31,7 @@ import org.apache.beam.sdk.util.CoderUtils import org.apache.beam.sdk.values.{PCollection, PDone} import org.joda.time.Instant -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.{classTag, ClassTag} import com.spotify.scio.io.PubsubIO.Subscription import com.spotify.scio.io.PubsubIO.Topic diff --git a/scio-core/src/main/scala/com/spotify/scio/io/TextIO.scala b/scio-core/src/main/scala/com/spotify/scio/io/TextIO.scala index e113a03f06..9410c32900 100644 --- a/scio-core/src/main/scala/com/spotify/scio/io/TextIO.scala +++ b/scio-core/src/main/scala/com/spotify/scio/io/TextIO.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.io.{Compression, FileBasedSink, FileSystems, TextIO = import org.apache.commons.compress.compressors.CompressorStreamFactory import org.apache.commons.io.IOUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try import org.apache.beam.sdk.io.ShardNameTemplate diff --git a/scio-core/src/main/scala/com/spotify/scio/io/dynamic/syntax/SCollecionSyntax.scala b/scio-core/src/main/scala/com/spotify/scio/io/dynamic/syntax/SCollecionSyntax.scala index 45ab4b3117..6a671bb1df 100644 --- a/scio-core/src/main/scala/com/spotify/scio/io/dynamic/syntax/SCollecionSyntax.scala +++ b/scio-core/src/main/scala/com/spotify/scio/io/dynamic/syntax/SCollecionSyntax.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.io.AvroIO.RecordFormatter import org.apache.beam.sdk.io.{Compression, FileIO} import org.apache.beam.sdk.{io => beam} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import java.util.{HashMap => JHashMap} diff --git a/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowContext.scala b/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowContext.scala index 5b1d157e49..f5fe997798 100644 --- a/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowContext.scala +++ b/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowContext.scala @@ -22,7 +22,7 @@ import org.apache.beam.runners.dataflow.DataflowRunner import org.apache.beam.runners.dataflow.options.DataflowPipelineWorkerPoolOptions import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Dataflow runner specific context. */ case object DataflowContext extends RunnerContext { diff --git a/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowResult.scala b/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowResult.scala index acbd3178e0..b91510b2f7 100644 --- a/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowResult.scala +++ b/scio-core/src/main/scala/com/spotify/scio/runners/dataflow/DataflowResult.scala @@ -31,7 +31,7 @@ import org.apache.beam.sdk.transforms.PTransform import org.apache.beam.sdk.values.{PInput, POutput} import org.apache.beam.sdk.{Pipeline, PipelineResult} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Represent a Dataflow runner specific result. */ class DataflowResult(val internal: DataflowPipelineJob) extends RunnerResult { diff --git a/scio-core/src/main/scala/com/spotify/scio/runners/flink/FlinkContext.scala b/scio-core/src/main/scala/com/spotify/scio/runners/flink/FlinkContext.scala index aff2ae511c..85008f0fe8 100644 --- a/scio-core/src/main/scala/com/spotify/scio/runners/flink/FlinkContext.scala +++ b/scio-core/src/main/scala/com/spotify/scio/runners/flink/FlinkContext.scala @@ -20,7 +20,7 @@ import com.spotify.scio.RunnerContext import org.apache.beam.runners.flink.{FlinkPipelineOptions, FlinkRunner} import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Flink runner specific context. */ case object FlinkContext extends RunnerContext { diff --git a/scio-core/src/main/scala/com/spotify/scio/runners/spark/SparkContext.scala b/scio-core/src/main/scala/com/spotify/scio/runners/spark/SparkContext.scala index 25a96ce726..bc0ab79511 100644 --- a/scio-core/src/main/scala/com/spotify/scio/runners/spark/SparkContext.scala +++ b/scio-core/src/main/scala/com/spotify/scio/runners/spark/SparkContext.scala @@ -21,7 +21,7 @@ import com.spotify.scio.RunnerContext import org.apache.beam.runners.spark.{SparkPipelineOptions, SparkRunner} import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Spark runner specific context. */ case object SparkContext extends RunnerContext { diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/PrettyPrint.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/PrettyPrint.scala index 631bd6aadf..35354fcc12 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/PrettyPrint.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/PrettyPrint.scala @@ -16,7 +16,7 @@ */ package com.spotify.scio.schemas -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.apache.beam.sdk.schemas.{Schema => BSchema} private[scio] object PrettyPrint { diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/Schema.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/Schema.scala index 85a8938685..ca906e24d5 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/Schema.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/Schema.scala @@ -33,7 +33,7 @@ import org.apache.beam.sdk.transforms.SerializableFunction import org.apache.beam.sdk.values.{Row, TypeDescriptor} import com.twitter.chill.ClosureCleaner -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import org.apache.beam.sdk.values.TupleTag diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/SchemaMaterializer.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/SchemaMaterializer.scala index c05a4a4d7d..870ce85297 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/SchemaMaterializer.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/SchemaMaterializer.scala @@ -20,7 +20,7 @@ import java.util import java.util.function.BiConsumer import scala.reflect.ClassTag -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.apache.beam.sdk.schemas.{Schema => BSchema} import org.apache.beam.sdk.transforms.SerializableFunction import org.apache.beam.sdk.values.Row diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala index 41e20d3963..28dfda5419 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/To.scala @@ -22,7 +22,7 @@ import com.spotify.scio.util.ScioUtil import org.apache.beam.sdk.values._ import org.apache.beam.sdk.schemas.{SchemaCoder, Schema => BSchema} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.language.experimental.macros import scala.annotation.tailrec import scala.reflect.ClassTag diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/instances/AvroInstances.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/instances/AvroInstances.scala index 5c2b3ca5d0..c34d44203e 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/instances/AvroInstances.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/instances/AvroInstances.scala @@ -24,7 +24,7 @@ import org.apache.beam.sdk.schemas.{AvroRecordSchema, Schema => BSchema} import org.apache.beam.sdk.transforms.SerializableFunction import org.apache.beam.sdk.values.{Row, TypeDescriptor} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.{classTag, ClassTag} trait AvroInstances { diff --git a/scio-core/src/main/scala/com/spotify/scio/schemas/instances/ScalaInstances.scala b/scio-core/src/main/scala/com/spotify/scio/schemas/instances/ScalaInstances.scala index 481a37a37b..b72f99d50d 100644 --- a/scio-core/src/main/scala/com/spotify/scio/schemas/instances/ScalaInstances.scala +++ b/scio-core/src/main/scala/com/spotify/scio/schemas/instances/ScalaInstances.scala @@ -19,7 +19,7 @@ package com.spotify.scio.schemas.instances import com.spotify.scio.schemas._ import org.apache.beam.sdk.schemas.Schema.FieldType -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.collection.mutable import scala.collection.SortedSet diff --git a/scio-core/src/main/scala/com/spotify/scio/transforms/ScalaFutureHandlers.scala b/scio-core/src/main/scala/com/spotify/scio/transforms/ScalaFutureHandlers.scala index e4e4ea5e09..e79b680a77 100644 --- a/scio-core/src/main/scala/com/spotify/scio/transforms/ScalaFutureHandlers.scala +++ b/scio-core/src/main/scala/com/spotify/scio/transforms/ScalaFutureHandlers.scala @@ -20,7 +20,7 @@ package com.spotify.scio.transforms import java.lang import java.util.function.{Function => JFunction} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.{Await, ExecutionContext, Future} import scala.concurrent.duration.Duration diff --git a/scio-core/src/main/scala/com/spotify/scio/transforms/package.scala b/scio-core/src/main/scala/com/spotify/scio/transforms/package.scala index 761031ae50..1dd2d569e0 100644 --- a/scio-core/src/main/scala/com/spotify/scio/transforms/package.scala +++ b/scio-core/src/main/scala/com/spotify/scio/transforms/package.scala @@ -31,7 +31,7 @@ import org.apache.beam.sdk.transforms.{DoFn, ParDo} import org.apache.beam.sdk.values.{TupleTag, TupleTagList} import com.google.common.util.concurrent.ListenableFuture -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} /** diff --git a/scio-core/src/main/scala/com/spotify/scio/util/ArtisanJoin.scala b/scio-core/src/main/scala/com/spotify/scio/util/ArtisanJoin.scala index 6f179725ea..95fd4c5af3 100644 --- a/scio-core/src/main/scala/com/spotify/scio/util/ArtisanJoin.scala +++ b/scio-core/src/main/scala/com/spotify/scio/util/ArtisanJoin.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.transforms.{DoFn, ParDo} import org.apache.beam.sdk.values.{KV, TupleTag} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[scio] object ArtisanJoin { private val log = LoggerFactory.getLogger(this.getClass) diff --git a/scio-core/src/main/scala/com/spotify/scio/util/Functions.scala b/scio-core/src/main/scala/com/spotify/scio/util/Functions.scala index 8bb9a2bcbc..1cbaa4dfd1 100644 --- a/scio-core/src/main/scala/com/spotify/scio/util/Functions.scala +++ b/scio-core/src/main/scala/com/spotify/scio/util/Functions.scala @@ -32,7 +32,7 @@ import org.apache.beam.sdk.transforms.DoFn.ProcessElement import org.apache.beam.sdk.transforms.Partition.PartitionFn import org.apache.beam.sdk.transforms.{DoFn, ProcessFunction, SerializableFunction, SimpleFunction} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[scio] object Functions { private[this] val BufferSize = 20 diff --git a/scio-core/src/main/scala/com/spotify/scio/util/MultiJoin.scala b/scio-core/src/main/scala/com/spotify/scio/util/MultiJoin.scala index 5b9fea3607..76ef2248c1 100644 --- a/scio-core/src/main/scala/com/spotify/scio/util/MultiJoin.scala +++ b/scio-core/src/main/scala/com/spotify/scio/util/MultiJoin.scala @@ -32,7 +32,7 @@ import com.spotify.scio.values.SCollection import org.apache.beam.sdk.transforms.join.{CoGroupByKey, KeyedPCollectionTuple} import org.apache.beam.sdk.values.TupleTag -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ trait MultiJoin extends Serializable { diff --git a/scio-core/src/main/scala/com/spotify/scio/util/TupleFunctions.scala b/scio-core/src/main/scala/com/spotify/scio/util/TupleFunctions.scala index 02149b743c..8db5569199 100644 --- a/scio-core/src/main/scala/com/spotify/scio/util/TupleFunctions.scala +++ b/scio-core/src/main/scala/com/spotify/scio/util/TupleFunctions.scala @@ -22,7 +22,7 @@ import java.util.{List => JList} import org.apache.beam.sdk.values.KV -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ private[scio] object TupleFunctions { def kvToTuple[K, V](kv: KV[K, V]): (K, V) = (kv.getKey, kv.getValue) diff --git a/scio-core/src/main/scala/com/spotify/scio/values/DistCache.scala b/scio-core/src/main/scala/com/spotify/scio/values/DistCache.scala index 0348d322b4..e42a7918c7 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/DistCache.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/DistCache.scala @@ -23,7 +23,7 @@ import java.net.URI import com.spotify.scio.util.{RemoteFileUtil, ScioUtil} import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Encapsulate arbitrary data that can be distributed to all workers. Similar to Hadoop diff --git a/scio-core/src/main/scala/com/spotify/scio/values/SCollection.scala b/scio-core/src/main/scala/com/spotify/scio/values/SCollection.scala index 921e055e40..a02915fa52 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/SCollection.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/SCollection.scala @@ -46,7 +46,7 @@ import org.apache.beam.sdk.{io => beam} import org.joda.time.{Duration, Instant} import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.immutable.TreeMap import scala.reflect.ClassTag import scala.util.Try diff --git a/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideInput.scala b/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideInput.scala index baf5f16656..f5f0401f5c 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideInput.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideInput.scala @@ -27,7 +27,7 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow import org.apache.beam.sdk.transforms.{DoFn, ParDo} import org.apache.beam.sdk.values.{PCollection, TupleTag, TupleTagList} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try import com.twitter.chill.ClosureCleaner diff --git a/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideOutput.scala b/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideOutput.scala index aa2774d695..a2309f6eeb 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideOutput.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/SCollectionWithSideOutput.scala @@ -24,7 +24,7 @@ import com.spotify.scio.util.FunctionsWithSideOutput import org.apache.beam.sdk.transforms.{DoFn, ParDo} import org.apache.beam.sdk.values.{PCollection, TupleTag, TupleTagList} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * An enhanced SCollection that provides access to one or more [[SideOutput]]s for some transforms. diff --git a/scio-core/src/main/scala/com/spotify/scio/values/SideInput.scala b/scio-core/src/main/scala/com/spotify/scio/values/SideInput.scala index 098e3d6539..7f1b71a352 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/SideInput.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/SideInput.scala @@ -25,7 +25,7 @@ import org.apache.beam.sdk.transforms.DoFn import org.apache.beam.sdk.transforms.windowing.{BoundedWindow, GlobalWindow} import org.apache.beam.sdk.values.PCollectionView -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Encapsulate an SCollection when it is being used as a side input. */ trait SideInput[T] extends Serializable { diff --git a/scio-core/src/main/scala/com/spotify/scio/values/Views.scala b/scio-core/src/main/scala/com/spotify/scio/values/Views.scala index 053df0910e..069f0b3d16 100644 --- a/scio-core/src/main/scala/com/spotify/scio/values/Views.scala +++ b/scio-core/src/main/scala/com/spotify/scio/values/Views.scala @@ -45,7 +45,7 @@ import org.apache.beam.sdk.values.TypeDescriptor import org.apache.beam.sdk.values.TypeParameter import org.apache.beam.sdk.values.WindowingStrategy -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable import scala.util._ diff --git a/scio-elasticsearch/es5/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala b/scio-elasticsearch/es5/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala index 3ae4c5cbad..a80c5db67a 100644 --- a/scio-elasticsearch/es5/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala +++ b/scio-elasticsearch/es5/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.Write.BulkExecutionE import org.apache.beam.sdk.transforms.SerializableFunction import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final case class ElasticsearchIO[T](esOptions: ElasticsearchOptions) extends ScioIO[T] { override type ReadP = Nothing diff --git a/scio-elasticsearch/es5/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala b/scio-elasticsearch/es5/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala index e54753b177..da09ab8e10 100644 --- a/scio-elasticsearch/es5/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala +++ b/scio-elasticsearch/es5/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala @@ -28,7 +28,7 @@ import org.scalactic.Equality import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class CoderInstancesTest extends AnyFlatSpec with Matchers with CoderInstances { import com.spotify.scio.testing.CoderAssertions._ diff --git a/scio-elasticsearch/es6/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala b/scio-elasticsearch/es6/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala index 3ae4c5cbad..a80c5db67a 100644 --- a/scio-elasticsearch/es6/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala +++ b/scio-elasticsearch/es6/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.Write.BulkExecutionE import org.apache.beam.sdk.transforms.SerializableFunction import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final case class ElasticsearchIO[T](esOptions: ElasticsearchOptions) extends ScioIO[T] { override type ReadP = Nothing diff --git a/scio-elasticsearch/es6/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala b/scio-elasticsearch/es6/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala index 3d43f349d6..9d87bcce34 100644 --- a/scio-elasticsearch/es6/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala +++ b/scio-elasticsearch/es6/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala @@ -28,7 +28,7 @@ import org.scalactic.Equality import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class CoderInstancesTest extends AnyFlatSpec with Matchers with CoderInstances { import com.spotify.scio.testing.CoderAssertions._ diff --git a/scio-elasticsearch/es7/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala b/scio-elasticsearch/es7/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala index 9250dd8a05..8baadc42f8 100644 --- a/scio-elasticsearch/es7/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala +++ b/scio-elasticsearch/es7/src/main/scala/com/spotify/scio/elasticsearch/ElasticsearchIO.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.Write.BulkExecutionE import org.apache.beam.sdk.transforms.SerializableFunction import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final case class ElasticsearchIO[T](esOptions: ElasticsearchOptions) extends ScioIO[T] { override type ReadP = Nothing diff --git a/scio-elasticsearch/es7/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala b/scio-elasticsearch/es7/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala index 4acae3a5e7..a1986ad165 100644 --- a/scio-elasticsearch/es7/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala +++ b/scio-elasticsearch/es7/src/test/scala/com/spotify/scio/elasticsearch/CoderInstancesTest.scala @@ -28,7 +28,7 @@ import org.scalactic.Equality import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class CoderInstancesTest extends AnyFlatSpec with Matchers with CoderInstances { import com.spotify.scio.testing.CoderAssertions._ diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/DebuggingWordCount.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/DebuggingWordCount.scala index 2707a7e8ed..50d663adb2 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/DebuggingWordCount.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/DebuggingWordCount.scala @@ -31,7 +31,7 @@ import com.spotify.scio.examples.common.ExampleData import org.apache.beam.sdk.testing.PAssert import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object DebuggingWordCount { // Logger is an object instance, i.e. statically initialized and thus can be used safely in an diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/AutoComplete.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/AutoComplete.scala index fdb8a7b2d5..bbafa0222b 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/AutoComplete.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/AutoComplete.scala @@ -35,7 +35,7 @@ import org.apache.beam.sdk.options.StreamingOptions import org.apache.beam.sdk.transforms.windowing.{GlobalWindows, SlidingWindows} import org.joda.time.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object AutoComplete { case class Tag(tag: String, count: Long) diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/StreamingWordExtract.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/StreamingWordExtract.scala index aba70cfc21..3347322b07 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/StreamingWordExtract.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/StreamingWordExtract.scala @@ -31,7 +31,7 @@ import com.spotify.scio.examples.common.ExampleData import org.apache.beam.examples.common.{ExampleOptions, ExampleUtils} import org.apache.beam.sdk.options.StreamingOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object StreamingWordExtract { def main(cmdlineArgs: Array[String]): Unit = { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/TfIdf.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/TfIdf.scala index c54ffa2c0f..634de768bb 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/complete/TfIdf.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/complete/TfIdf.scala @@ -31,7 +31,7 @@ import com.spotify.scio.examples.common.ExampleData import com.spotify.scio.values.SCollection import org.apache.beam.sdk.io.FileSystems -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.io.Source object TfIdf { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/BigQueryTornadoes.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/BigQueryTornadoes.scala index 0dde737e27..ce511157ff 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/BigQueryTornadoes.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/BigQueryTornadoes.scala @@ -29,7 +29,7 @@ import com.spotify.scio._ import com.spotify.scio.bigquery._ import com.spotify.scio.examples.common.ExampleData -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object BigQueryTornadoes { def main(cmdlineArgs: Array[String]): Unit = { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/CombinePerKeyExamples.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/CombinePerKeyExamples.scala index f3705b3830..69b1392513 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/CombinePerKeyExamples.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/CombinePerKeyExamples.scala @@ -28,7 +28,7 @@ import com.spotify.scio.bigquery._ import com.spotify.scio._ import com.spotify.scio.examples.common.ExampleData -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.SortedSet object CombinePerKeyExamples { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/DistinctByKeyExample.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/DistinctByKeyExample.scala index 4e8b0f86f2..aa1151869f 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/DistinctByKeyExample.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/DistinctByKeyExample.scala @@ -28,7 +28,7 @@ import com.spotify.scio.ContextAndArgs import com.spotify.scio.bigquery._ import com.spotify.scio.examples.common.ExampleData -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object DistinctByKeyExample { def main(cmdlineArgs: Array[String]): Unit = { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/FilterExamples.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/FilterExamples.scala index 720b2d11c6..0d64df33a9 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/FilterExamples.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/FilterExamples.scala @@ -28,7 +28,7 @@ import com.spotify.scio.bigquery._ import com.spotify.scio._ import com.spotify.scio.examples.common.ExampleData -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ // Intermediate record type case class Record(year: Long, month: Long, day: Long, meanTemp: Double) diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/MaxPerKeyExamples.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/MaxPerKeyExamples.scala index 6fbaaab495..aef39b70d8 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/MaxPerKeyExamples.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/MaxPerKeyExamples.scala @@ -28,7 +28,7 @@ import com.spotify.scio.bigquery._ import com.spotify.scio._ import com.spotify.scio.examples.common.ExampleData -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object MaxPerKeyExamples { def main(cmdlineArgs: Array[String]): Unit = { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/StorageBigQueryTornadoes.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/StorageBigQueryTornadoes.scala index 37616e4c20..de39d92f44 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/StorageBigQueryTornadoes.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/cookbook/StorageBigQueryTornadoes.scala @@ -28,7 +28,7 @@ import com.spotify.scio.ContextAndArgs import com.spotify.scio.examples.common.ExampleData import com.google.api.services.bigquery.model.{TableFieldSchema, TableSchema} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object StorageBigQueryTornadoes { def main(cmdlineArgs: Array[String]): Unit = { diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/extra/AvroExample.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/extra/AvroExample.scala index 3c0432fff2..68d9bf1560 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/extra/AvroExample.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/extra/AvroExample.scala @@ -32,7 +32,7 @@ import com.spotify.scio.io.ClosedTap import org.apache.avro.Schema import org.apache.avro.generic.{GenericData, GenericRecord} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object AvroExample { @AvroType.fromSchema("""{ diff --git a/scio-examples/src/main/scala/com/spotify/scio/examples/extra/SortMergeBucketExample.scala b/scio-examples/src/main/scala/com/spotify/scio/examples/extra/SortMergeBucketExample.scala index 5b2b41cda5..5193ec41c8 100644 --- a/scio-examples/src/main/scala/com/spotify/scio/examples/extra/SortMergeBucketExample.scala +++ b/scio-examples/src/main/scala/com/spotify/scio/examples/extra/SortMergeBucketExample.scala @@ -37,7 +37,7 @@ import org.apache.beam.sdk.extensions.smb.AvroSortedBucketIO import org.apache.beam.sdk.extensions.smb.BucketMetadata.HashType import org.apache.beam.sdk.values.TupleTag -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Random object SortMergeBucketExample { diff --git a/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AnnoyIndexSaveExampleTest.scala b/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AnnoyIndexSaveExampleTest.scala index 8ab0190921..2affec3830 100644 --- a/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AnnoyIndexSaveExampleTest.scala +++ b/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AnnoyIndexSaveExampleTest.scala @@ -22,7 +22,7 @@ import java.nio.file.Files import com.spotify.annoy.ANNIndex import com.spotify.scio.testing._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class AnnoyIndexSaveExampleTest extends PipelineSpec { "AnnoyIndexSaveExample" should "work" in { diff --git a/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AvroInOutTest.scala b/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AvroInOutTest.scala index a79ca0f555..b7c6044928 100644 --- a/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AvroInOutTest.scala +++ b/scio-examples/src/test/scala/com/spotify/scio/examples/extra/AvroInOutTest.scala @@ -20,7 +20,7 @@ package com.spotify.scio.examples.extra import com.spotify.scio.avro._ import com.spotify.scio.testing._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class AvroInOutTest extends PipelineSpec { val input = Seq( diff --git a/scio-extra/src/it/scala/com/spotify/scio/extra/annoy/AnnoyIT.scala b/scio-extra/src/it/scala/com/spotify/scio/extra/annoy/AnnoyIT.scala index cf841f8c40..74a12dd3d2 100644 --- a/scio-extra/src/it/scala/com/spotify/scio/extra/annoy/AnnoyIT.scala +++ b/scio-extra/src/it/scala/com/spotify/scio/extra/annoy/AnnoyIT.scala @@ -24,7 +24,7 @@ import com.spotify.scio.testing.util.ItUtils import org.apache.beam.sdk.io.FileSystems import org.apache.beam.sdk.util.MimeTypes -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Random class AnnoyIT extends PipelineSpec { diff --git a/scio-extra/src/it/scala/com/spotify/scio/extra/sparkey/SparkeyIT.scala b/scio-extra/src/it/scala/com/spotify/scio/extra/sparkey/SparkeyIT.scala index d2e3d5e43e..e7cae3fc09 100644 --- a/scio-extra/src/it/scala/com/spotify/scio/extra/sparkey/SparkeyIT.scala +++ b/scio-extra/src/it/scala/com/spotify/scio/extra/sparkey/SparkeyIT.scala @@ -24,7 +24,7 @@ import com.spotify.scio.testing.util.ItUtils import org.apache.beam.sdk.io.FileSystems import org.apache.beam.sdk.util.MimeTypes -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class SparkeyIT extends PipelineSpec { diff --git a/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala b/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala index fcb3eb4be6..77f92e3e6e 100644 --- a/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala +++ b/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala @@ -2,7 +2,7 @@ package com.spotify.scio.extra.sparkey.instances import com.spotify.sparkey.SparkeyReader -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Enhanced version of `SparkeyReader` that mimics a `Map`. */ class StringSparkeyReader(self: SparkeyReader) extends Map[String, String] { diff --git a/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala b/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala index 36417775ed..920c3ca3dd 100644 --- a/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala +++ b/scio-extra/src/main/scala-2.12/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala @@ -5,7 +5,7 @@ import java.nio.charset.Charset import com.spotify.scio.util.Cache import com.spotify.sparkey.SparkeyReader -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * A wrapper around `SparkeyReader` that includes both a decoder (to map from each byte array diff --git a/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala b/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala index 2b2033661c..ff84a52582 100644 --- a/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala +++ b/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/StringSparkeyReader.scala @@ -2,7 +2,7 @@ package com.spotify.scio.extra.sparkey.instances import com.spotify.sparkey.SparkeyReader -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** Enhanced version of `SparkeyReader` that mimics a `Map`. */ class StringSparkeyReader(self: SparkeyReader) extends Map[String, String] { diff --git a/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala b/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala index f768e5025e..5ae0aa78e6 100644 --- a/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala +++ b/scio-extra/src/main/scala-2.13/com/spotify/scio/extra/sparkey/instances/TypedSparkeyReader.scala @@ -5,7 +5,7 @@ import java.nio.charset.Charset import com.spotify.scio.util.Cache import com.spotify.sparkey.SparkeyReader -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * A wrapper around `SparkeyReader` that includes both a decoder (to map from each byte array diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/Collections.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/Collections.scala index 86e3a19e0f..567a53e965 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/Collections.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/Collections.scala @@ -19,7 +19,7 @@ package com.spotify.scio.extra import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.MinMaxPriorityQueue -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Utilities for Scala collection library. diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/annoy/package.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/annoy/package.scala index 48fd41bd6b..1a4d2be34f 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/annoy/package.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/annoy/package.scala @@ -26,7 +26,7 @@ import org.apache.beam.sdk.transforms.{DoFn, View} import org.apache.beam.sdk.values.PCollectionView import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Main package for Annoy side input APIs. Import all. diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/AvroConverters.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/AvroConverters.scala index 8d0cbc2b3f..c51a0a2abe 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/AvroConverters.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/AvroConverters.scala @@ -23,7 +23,7 @@ import com.spotify.scio.bigquery.TableRow import org.apache.avro.Schema import org.apache.avro.generic.IndexedRecord -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object AvroConverters extends ToTableRow with ToTableSchema { diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableRow.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableRow.scala index 92657a931c..d9f9383060 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableRow.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableRow.scala @@ -30,7 +30,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.BaseEncoding import org.joda.time.format.DateTimeFormat import org.joda.time.{DateTime, LocalDate, LocalTime} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Converts an [[org.apache.avro.generic.IndexedRecord IndexedRecord]] into a diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableSchema.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableSchema.scala index d1ee52bbae..7797bd1482 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableSchema.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/bigquery/ToTableSchema.scala @@ -25,7 +25,7 @@ import org.apache.avro.Schema.Type import org.apache.avro.Schema.Type._ import org.apache.avro.{LogicalType, Schema} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Converts a [[org.apache.avro.Schema Schema]] object into a diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/nn/NearestNeighbor.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/nn/NearestNeighbor.scala index 6b2fc4aa38..9b3c733a65 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/nn/NearestNeighbor.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/nn/NearestNeighbor.scala @@ -22,7 +22,7 @@ import breeze.math._ import info.debatty.java.lsh.LSHSuperBit import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.MinMaxPriorityQueue -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.mutable.{Buffer => MBuffer, Map => MMap, Set => MSet} import scala.reflect.ClassTag import scala.{specialized => sp} diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/sorter/syntax/SCollectionSyntax.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/sorter/syntax/SCollectionSyntax.scala index 4f9c8f1327..b45a7f6731 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/sorter/syntax/SCollectionSyntax.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/sorter/syntax/SCollectionSyntax.scala @@ -29,7 +29,7 @@ import org.apache.beam.sdk.extensions.sorter.{BufferedExternalSorter, SortValues import org.apache.beam.sdk.values.KV import scala.collection.AbstractIterator -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final class SorterOps[K1, K2: SortingKey, V](self: SCollection[(K1, Iterable[(K2, V)])]) { diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/ShardedSparkeyUri.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/ShardedSparkeyUri.scala index d25d7b7de8..1467e7aef5 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/ShardedSparkeyUri.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/ShardedSparkeyUri.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.io.FileSystems import org.apache.beam.sdk.io.fs.{EmptyMatchTreatment, MatchResult} import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Sharded Sparkey support diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/SparkeyUri.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/SparkeyUri.scala index 195cb1726c..dfb60118bf 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/SparkeyUri.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/SparkeyUri.scala @@ -27,7 +27,7 @@ import com.spotify.sparkey.extra.ThreadLocalSparkeyReader import com.spotify.sparkey.{Sparkey, SparkeyReader} import org.apache.beam.sdk.options.PipelineOptions -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Represents the base URI for a Sparkey index and log file, either on the local or a remote file diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/instances/ShardedSparkeyReader.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/instances/ShardedSparkeyReader.scala index 84a1ef5cf5..a915c0b0a8 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/instances/ShardedSparkeyReader.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/instances/ShardedSparkeyReader.scala @@ -5,7 +5,7 @@ import java.util import com.spotify.sparkey.{IndexHeader, LogHeader, SparkeyReader} import scala.util.hashing.MurmurHash3 -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * A wrapper class around SparkeyReader that allows the reading of multiple Sparkey files, diff --git a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/package.scala b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/package.scala index bd8c5f0d82..960d104e9a 100644 --- a/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/package.scala +++ b/scio-extra/src/main/scala/com/spotify/scio/extra/sparkey/package.scala @@ -36,7 +36,7 @@ import org.apache.beam.sdk.transforms.{DoFn, Reify, View} import org.apache.beam.sdk.values.PCollectionView import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.hashing.MurmurHash3 import java.lang.Math.floorMod diff --git a/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableRowTest.scala b/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableRowTest.scala index 5284b3e326..997f20b9c3 100644 --- a/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableRowTest.scala +++ b/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableRowTest.scala @@ -28,7 +28,7 @@ import org.joda.time.{DateTime, LocalDate, LocalTime} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ToTableRowTest extends AnyFlatSpec with Matchers { val expectedOutput: TableRow = new TableRow() diff --git a/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableSchemaTest.scala b/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableSchemaTest.scala index 4fba8b9410..1e08cd39f6 100644 --- a/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableSchemaTest.scala +++ b/scio-extra/src/test/scala/com/spotify/scio/extra/bigquery/ToTableSchemaTest.scala @@ -21,7 +21,7 @@ import com.google.api.services.bigquery.model.{TableFieldSchema, TableSchema} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ToTableSchemaTest extends AnyFlatSpec with Matchers { "toTableSchema" should "convert an Avro Schema to a BigQuery TableSchema" in { diff --git a/scio-extra/src/test/scala/com/spotify/scio/extra/csv/CsvIOTest.scala b/scio-extra/src/test/scala/com/spotify/scio/extra/csv/CsvIOTest.scala index a11ccd5372..ebdb56dd7b 100644 --- a/scio-extra/src/test/scala/com/spotify/scio/extra/csv/CsvIOTest.scala +++ b/scio-extra/src/test/scala/com/spotify/scio/extra/csv/CsvIOTest.scala @@ -29,7 +29,7 @@ import org.apache.beam.sdk.util.SerializableUtils import org.apache.commons.io.FileUtils import org.scalatest.BeforeAndAfterEach -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import kantan.csv._ object CsvIOTest { diff --git a/scio-extra/src/test/scala/com/spotify/scio/extra/json/JsonIOTest.scala b/scio-extra/src/test/scala/com/spotify/scio/extra/json/JsonIOTest.scala index 2415a3bfcd..157951e682 100644 --- a/scio-extra/src/test/scala/com/spotify/scio/extra/json/JsonIOTest.scala +++ b/scio-extra/src/test/scala/com/spotify/scio/extra/json/JsonIOTest.scala @@ -27,7 +27,7 @@ import com.spotify.scio.util.ScioUtil import org.apache.beam.sdk.Pipeline.PipelineExecutionException import org.apache.commons.io.FileUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.io.Source object JsonIOTest { diff --git a/scio-extra/src/test/scala/com/spotify/scio/extra/sparkey/SparkeyTest.scala b/scio-extra/src/test/scala/com/spotify/scio/extra/sparkey/SparkeyTest.scala index 5a92de0056..6905cfe992 100644 --- a/scio-extra/src/test/scala/com/spotify/scio/extra/sparkey/SparkeyTest.scala +++ b/scio-extra/src/test/scala/com/spotify/scio/extra/sparkey/SparkeyTest.scala @@ -29,7 +29,7 @@ import com.spotify.sparkey._ import org.apache.beam.sdk.io.FileSystems import org.apache.commons.io.FileUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final case class TestCache[K, V](testId: String) extends CacheT[K, V, CCache[K, V]] { @transient private lazy val cache = diff --git a/scio-jmh/src/test/scala/com/spotify/scio/jmh/FunctionsBenchmark.scala b/scio-jmh/src/test/scala/com/spotify/scio/jmh/FunctionsBenchmark.scala index 0397a6fd00..26563bd02a 100644 --- a/scio-jmh/src/test/scala/com/spotify/scio/jmh/FunctionsBenchmark.scala +++ b/scio-jmh/src/test/scala/com/spotify/scio/jmh/FunctionsBenchmark.scala @@ -27,7 +27,7 @@ import org.apache.beam.sdk.testing.CombineFnTester import org.apache.beam.sdk.transforms.Combine.CombineFn import org.openjdk.jmh.annotations._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.NANOSECONDS) diff --git a/scio-jmh/src/test/scala/com/spotify/scio/jmh/GroupByBenchmark.scala b/scio-jmh/src/test/scala/com/spotify/scio/jmh/GroupByBenchmark.scala index 3e939b93a6..24bb4c711c 100644 --- a/scio-jmh/src/test/scala/com/spotify/scio/jmh/GroupByBenchmark.scala +++ b/scio-jmh/src/test/scala/com/spotify/scio/jmh/GroupByBenchmark.scala @@ -30,7 +30,7 @@ import org.apache.avro.Schema import org.apache.avro.generic.GenericRecord import org.openjdk.jmh.annotations._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) diff --git a/scio-jmh/src/test/scala/com/spotify/scio/jmh/JoinBenchmark.scala b/scio-jmh/src/test/scala/com/spotify/scio/jmh/JoinBenchmark.scala index b265e79055..ca9d376c6f 100644 --- a/scio-jmh/src/test/scala/com/spotify/scio/jmh/JoinBenchmark.scala +++ b/scio-jmh/src/test/scala/com/spotify/scio/jmh/JoinBenchmark.scala @@ -24,7 +24,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Abstract import org.openjdk.jmh.annotations._ import org.openjdk.jmh.infra.Blackhole -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Thread) diff --git a/scio-parquet/src/main/scala/com/spotify/scio/parquet/avro/ParquetAvroIO.scala b/scio-parquet/src/main/scala/com/spotify/scio/parquet/avro/ParquetAvroIO.scala index 0a222b9650..b9ade864db 100644 --- a/scio-parquet/src/main/scala/com/spotify/scio/parquet/avro/ParquetAvroIO.scala +++ b/scio-parquet/src/main/scala/com/spotify/scio/parquet/avro/ParquetAvroIO.scala @@ -40,7 +40,7 @@ import org.apache.parquet.filter2.predicate.FilterPredicate import org.apache.parquet.hadoop.ParquetInputFormat import org.apache.parquet.hadoop.metadata.CompressionCodecName -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag final case class ParquetAvroIO[T: ClassTag: Coder](path: String) extends ScioIO[T] { diff --git a/scio-parquet/src/main/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIO.scala b/scio-parquet/src/main/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIO.scala index 3a2d27ffad..ae2cb48cd3 100644 --- a/scio-parquet/src/main/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIO.scala +++ b/scio-parquet/src/main/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIO.scala @@ -46,7 +46,7 @@ import org.apache.parquet.hadoop.ParquetInputFormat import org.apache.parquet.hadoop.metadata.CompressionCodecName import org.tensorflow.example.Example -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ final case class ParquetExampleIO(path: String) extends ScioIO[Example] { override type ReadP = ParquetExampleIO.ReadParam diff --git a/scio-parquet/src/test/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIOTest.scala b/scio-parquet/src/test/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIOTest.scala index ff4b7d1aaa..d5015c24b8 100644 --- a/scio-parquet/src/test/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIOTest.scala +++ b/scio-parquet/src/test/scala/com/spotify/scio/parquet/tensorflow/ParquetExampleIOTest.scala @@ -27,7 +27,7 @@ import org.apache.parquet.filter2.predicate.FilterApi import org.scalatest.BeforeAndAfterAll import org.tensorflow.example.{BytesList, Example, Feature, Features, FloatList, Int64List} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ParquetExampleIOTest extends ScioIOSpec with TapSpec with BeforeAndAfterAll { private val dir = tmpDir diff --git a/scio-repl/src/main/scala/com/spotify/scio/repl/IoCommands.scala b/scio-repl/src/main/scala/com/spotify/scio/repl/IoCommands.scala index 044e3153ea..d7570375e7 100644 --- a/scio-repl/src/main/scala/com/spotify/scio/repl/IoCommands.scala +++ b/scio-repl/src/main/scala/com/spotify/scio/repl/IoCommands.scala @@ -33,7 +33,7 @@ import org.apache.beam.sdk.util.MimeTypes import org.apache.commons.io.IOUtils import org.slf4j.LoggerFactory -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag /** Commands for simple file I/O in the REPL. */ diff --git a/scio-schemas/src/main/scala/com/spotify/scio/avro/AvroUtils.scala b/scio-schemas/src/main/scala/com/spotify/scio/avro/AvroUtils.scala index 2fadfc5394..f8e9da74e5 100644 --- a/scio-schemas/src/main/scala/com/spotify/scio/avro/AvroUtils.scala +++ b/scio-schemas/src/main/scala/com/spotify/scio/avro/AvroUtils.scala @@ -20,7 +20,7 @@ package com.spotify.scio.avro import org.apache.avro.Schema import org.apache.avro.generic.{GenericData, GenericRecord} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object AvroUtils { private def f(name: String, tpe: Schema.Type) = diff --git a/scio-smb/src/it/scala/com/spotify/scio/smb/SortMergeBucketParityIT.scala b/scio-smb/src/it/scala/com/spotify/scio/smb/SortMergeBucketParityIT.scala index c32169ef6c..69b90889c3 100644 --- a/scio-smb/src/it/scala/com/spotify/scio/smb/SortMergeBucketParityIT.scala +++ b/scio-smb/src/it/scala/com/spotify/scio/smb/SortMergeBucketParityIT.scala @@ -33,7 +33,7 @@ import org.scalatest.Assertion import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Random /** diff --git a/scio-smb/src/main/scala/com/spotify/scio/smb/syntax/SortMergeBucketScioContextSyntax.scala b/scio-smb/src/main/scala/com/spotify/scio/smb/syntax/SortMergeBucketScioContextSyntax.scala index ebefef7f8d..2c96e9d077 100644 --- a/scio-smb/src/main/scala/com/spotify/scio/smb/syntax/SortMergeBucketScioContextSyntax.scala +++ b/scio-smb/src/main/scala/com/spotify/scio/smb/syntax/SortMergeBucketScioContextSyntax.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.transforms.join.CoGbkResult import org.apache.beam.sdk.transforms.{DoFn, ParDo} import org.apache.beam.sdk.values.KV -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ trait SortMergeBucketScioContextSyntax { implicit def asSMBScioContext(sc: ScioContext): SortedBucketScioContext = diff --git a/scio-spanner/src/it/scala/com/spotify/scio/spanner/SpannerIOIT.scala b/scio-spanner/src/it/scala/com/spotify/scio/spanner/SpannerIOIT.scala index c83714e145..79fae61903 100644 --- a/scio-spanner/src/it/scala/com/spotify/scio/spanner/SpannerIOIT.scala +++ b/scio-spanner/src/it/scala/com/spotify/scio/spanner/SpannerIOIT.scala @@ -26,7 +26,7 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Random diff --git a/scio-spanner/src/main/scala/com/spotify/scio/spanner/SpannerIO.scala b/scio-spanner/src/main/scala/com/spotify/scio/spanner/SpannerIO.scala index da917887c7..78b4c2126e 100644 --- a/scio-spanner/src/main/scala/com/spotify/scio/spanner/SpannerIO.scala +++ b/scio-spanner/src/main/scala/com/spotify/scio/spanner/SpannerIO.scala @@ -24,7 +24,7 @@ import com.spotify.scio.values.SCollection import org.apache.beam.sdk.io.gcp.spanner.SpannerIO.FailureMode import org.apache.beam.sdk.io.gcp.spanner.{SpannerConfig, SpannerIO => BSpannerIO} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ sealed trait SpannerIO[T] extends ScioIO[T] { final override val tapT = EmptyTapOf[T] diff --git a/scio-sql/src/main/scala/com/spotify/scio/sql/Sql.scala b/scio-sql/src/main/scala/com/spotify/scio/sql/Sql.scala index 57bdcea3af..a483a9c5ca 100644 --- a/scio-sql/src/main/scala/com/spotify/scio/sql/Sql.scala +++ b/scio-sql/src/main/scala/com/spotify/scio/sql/Sql.scala @@ -35,7 +35,7 @@ import org.apache.beam.sdk.schemas.{SchemaCoder, Schema => BSchema} import org.apache.beam.sdk.values._ import org.apache.commons.lang3.exception.ExceptionUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import scala.util.Try diff --git a/scio-tensorflow/src/main/scala/com/spotify/scio/tensorflow/TensorFlowDoFns.scala b/scio-tensorflow/src/main/scala/com/spotify/scio/tensorflow/TensorFlowDoFns.scala index 6d89778157..b7b7256bb6 100644 --- a/scio-tensorflow/src/main/scala/com/spotify/scio/tensorflow/TensorFlowDoFns.scala +++ b/scio-tensorflow/src/main/scala/com/spotify/scio/tensorflow/TensorFlowDoFns.scala @@ -28,7 +28,7 @@ import org.apache.beam.sdk.transforms.DoFn.{ProcessElement, Setup, Teardown} import org.slf4j.LoggerFactory import org.tensorflow._ import org.tensorflow.example.Example -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.spotify.scio.transforms.DoFnWithResource import com.spotify.scio.transforms.DoFnWithResource.ResourceType diff --git a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/MetadataSchemaTest.scala b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/MetadataSchemaTest.scala index dc407bd824..b89869ae55 100644 --- a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/MetadataSchemaTest.scala +++ b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/MetadataSchemaTest.scala @@ -20,7 +20,7 @@ package com.spotify.scio.tensorflow import com.google.protobuf.ByteString import org.tensorflow.example._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object MetadataSchemaTest { // Keep byte list the same length across examples to be parsed as a fixed shape. diff --git a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFExampleTest.scala b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFExampleTest.scala index e56f87d80b..bfd54a2d11 100644 --- a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFExampleTest.scala +++ b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFExampleTest.scala @@ -76,7 +76,7 @@ class TFExampleTest extends PipelineSpec { } "MultiSpecFeatranJob" should "work" in { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ JobTest[MultiSpecFeatranJob.type] .args("--output=out") .output(TFExampleIO("out")) { out => diff --git a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFSequenceExampleIOTest.scala b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFSequenceExampleIOTest.scala index d063b34c88..cc6d15249b 100644 --- a/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFSequenceExampleIOTest.scala +++ b/scio-tensorflow/src/test/scala/com/spotify/scio/tensorflow/TFSequenceExampleIOTest.scala @@ -21,7 +21,7 @@ import com.google.protobuf.ByteString import com.spotify.scio.testing.ScioIOSpec import org.tensorflow.example._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object TFSequenceExampleIOTest { case class Record(i: Int, ss: Seq[String]) diff --git a/scio-test/src/it/scala/com/spotify/DataflowIT.scala b/scio-test/src/it/scala/com/spotify/DataflowIT.scala index 816623438e..25636e2b46 100644 --- a/scio-test/src/it/scala/com/spotify/DataflowIT.scala +++ b/scio-test/src/it/scala/com/spotify/DataflowIT.scala @@ -23,7 +23,7 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.scalatest.tagobjects.Slow -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object DataflowIT { val projectId = "data-integration-test" diff --git a/scio-test/src/it/scala/com/spotify/scio/PopulateTestData.scala b/scio-test/src/it/scala/com/spotify/scio/PopulateTestData.scala index 482b33c4b5..78d86765e6 100644 --- a/scio-test/src/it/scala/com/spotify/scio/PopulateTestData.scala +++ b/scio-test/src/it/scala/com/spotify/scio/PopulateTestData.scala @@ -31,7 +31,7 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory import org.apache.beam.sdk.util.MimeTypes import org.joda.time._ -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.control.NonFatal object PopulateTestData { diff --git a/scio-test/src/it/scala/com/spotify/scio/values/DistCacheIT.scala b/scio-test/src/it/scala/com/spotify/scio/values/DistCacheIT.scala index b7895e4674..e414846536 100644 --- a/scio-test/src/it/scala/com/spotify/scio/values/DistCacheIT.scala +++ b/scio-test/src/it/scala/com/spotify/scio/values/DistCacheIT.scala @@ -25,7 +25,7 @@ import com.spotify.scio.{ScioContext, ScioResult} import org.apache.beam.sdk.io.FileSystems import org.apache.beam.sdk.util.MimeTypes -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag class DistCacheIT extends PipelineSpec { diff --git a/scio-test/src/main/scala/com/spotify/scio/testing/Pretty.scala b/scio-test/src/main/scala/com/spotify/scio/testing/Pretty.scala index 523c479489..d200db917c 100644 --- a/scio-test/src/main/scala/com/spotify/scio/testing/Pretty.scala +++ b/scio-test/src/main/scala/com/spotify/scio/testing/Pretty.scala @@ -18,7 +18,7 @@ package com.spotify.scio.testing import org.apache.avro.generic.GenericRecord import org.apache.avro.specific.SpecificRecordBase -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.spotify.scio.{registerSysProps, SysProp} import scala.util.Try diff --git a/scio-test/src/main/scala/com/spotify/scio/testing/SCollectionMatchers.scala b/scio-test/src/main/scala/com/spotify/scio/testing/SCollectionMatchers.scala index 6b826d82c0..1241afaf1d 100644 --- a/scio-test/src/main/scala/com/spotify/scio/testing/SCollectionMatchers.scala +++ b/scio-test/src/main/scala/com/spotify/scio/testing/SCollectionMatchers.scala @@ -33,7 +33,7 @@ import org.{hamcrest => h} import org.hamcrest.Matchers import org.hamcrest.MatcherAssert.assertThat -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import com.twitter.chill.ClosureCleaner import cats.kernel.Eq diff --git a/scio-test/src/test/scala/com/spotify/scio/ArgsTest.scala b/scio-test/src/test/scala/com/spotify/scio/ArgsTest.scala index a4e3b98341..2733b34cae 100644 --- a/scio-test/src/test/scala/com/spotify/scio/ArgsTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/ArgsTest.scala @@ -129,21 +129,21 @@ class ArgsTest extends AnyFlatSpec with Matchers { val rawArgs = Array("--input=value1", "--output=value2") val result = TypedParser[Arguments]().parse(rawArgs) - result should be a 'success + result should be a Symbol("success") } it should "fail on missing args" in { val rawArgs = Array("--input=value1") val result = TypedParser[Arguments]().parse(rawArgs) - result should be a 'failure + result should be a Symbol("failure") } it should "fail on unused args" in { val rawArgs = Array("--input=value1", "--output=value2", "--unused") val result = TypedParser[Arguments]().parse(rawArgs) - result should be a 'failure + result should be a Symbol("failure") } @AppName("Scio Examples") @@ -162,13 +162,13 @@ class ArgsTest extends AnyFlatSpec with Matchers { it should "#1436: support camelCase" in { val rawArgs = Array("--output=/path/to/output", "--camelCaseTest=value1") val result = TypedParser[CamelCaseArguments]().parse(rawArgs) - result should be a 'success + result should be a Symbol("success") } it should "#1770: fail kebab-case" in { val rawArgs = Array("--output=/path/to/output", "--camel-case-test=value1") val result = TypedParser[CamelCaseArguments]().parse(rawArgs) - result should be a 'failure + result should be a Symbol("failure") } it should "print camelCase in help messages" in { diff --git a/scio-test/src/test/scala/com/spotify/scio/ScioContextTest.scala b/scio-test/src/test/scala/com/spotify/scio/ScioContextTest.scala index 3618c4ef9a..51fca0a76b 100644 --- a/scio-test/src/test/scala/com/spotify/scio/ScioContextTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/ScioContextTest.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.options.{PipelineOptions, PipelineOptionsFactory} import org.apache.beam.sdk.testing.PAssert import org.apache.beam.sdk.transforms.Create import scala.concurrent.duration.Duration -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ScioContextTest extends PipelineSpec { "ScioContext" should "support pipeline" in { diff --git a/scio-test/src/test/scala/com/spotify/scio/coders/CoderTest.scala b/scio-test/src/test/scala/com/spotify/scio/coders/CoderTest.scala index 3397d75a38..c4608eae6f 100644 --- a/scio-test/src/test/scala/com/spotify/scio/coders/CoderTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/coders/CoderTest.scala @@ -28,7 +28,7 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.apache.beam.sdk.util.SerializableUtils -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.{mutable => mut} import java.io.ByteArrayInputStream import org.apache.beam.sdk.testing.CoderProperties diff --git a/scio-test/src/test/scala/com/spotify/scio/coders/KryoAtomicCoderTest.scala b/scio-test/src/test/scala/com/spotify/scio/coders/KryoAtomicCoderTest.scala index 048c99d161..a549288478 100644 --- a/scio-test/src/test/scala/com/spotify/scio/coders/KryoAtomicCoderTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/coders/KryoAtomicCoderTest.scala @@ -34,7 +34,7 @@ import org.apache.beam.sdk.util.CoderUtils import org.apache.beam.sdk.values.KV import org.joda.time.Instant -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag import org.apache.beam.sdk.testing.CoderProperties diff --git a/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/GrpcSerializersTest.scala b/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/GrpcSerializersTest.scala index fab406d81a..bd956432bd 100644 --- a/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/GrpcSerializersTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/GrpcSerializersTest.scala @@ -23,7 +23,7 @@ import org.apache.beam.sdk.util.CoderUtils import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class GrpcSerializersTest extends AnyFlatSpec with Matchers { diff --git a/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/JodaSerializerTest.scala b/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/JodaSerializerTest.scala index b611003ae3..ad5be4fc68 100644 --- a/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/JodaSerializerTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/coders/instances/kryo/JodaSerializerTest.scala @@ -23,7 +23,7 @@ import org.scalacheck._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatestplus.scalacheck.Checkers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.util.Try class JodaSerializerTest extends AnyFlatSpec with Checkers { diff --git a/scio-test/src/test/scala/com/spotify/scio/io/ScioIOTest.scala b/scio-test/src/test/scala/com/spotify/scio/io/ScioIOTest.scala index 6599e4e64d..bddb921447 100644 --- a/scio-test/src/test/scala/com/spotify/scio/io/ScioIOTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/io/ScioIOTest.scala @@ -37,7 +37,7 @@ import org.apache.beam.sdk.values.PValue import org.apache.commons.io.FileUtils import scala.collection.mutable -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object ScioIOTest { @AvroType.toSchema diff --git a/scio-test/src/test/scala/com/spotify/scio/io/dynamic/DynamicFileTest.scala b/scio-test/src/test/scala/com/spotify/scio/io/dynamic/DynamicFileTest.scala index eb817bd825..b544dc7ae3 100644 --- a/scio-test/src/test/scala/com/spotify/scio/io/dynamic/DynamicFileTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/io/dynamic/DynamicFileTest.scala @@ -30,7 +30,7 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory import org.apache.commons.io.FileUtils import org.joda.time.{Duration, Instant} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class DynamicFileTest extends PipelineSpec { private def verifyOutput(path: Path, expected: String*): Unit = { diff --git a/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaCompatTest.scala b/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaCompatTest.scala index 02f9004215..c887661788 100644 --- a/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaCompatTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaCompatTest.scala @@ -52,25 +52,25 @@ class SchemaCompatTest extends AnyFlatSpec with Matchers { } it should "fail incompatible schemas" in { - check[Required, Nullable] should be('left) - check[Required, Repeated] should be('left) - check[Required, MapField] should be('left) + check[Required, Nullable] should be(Symbol("left")) + check[Required, Repeated] should be(Symbol("left")) + check[Required, MapField] should be(Symbol("left")) } it should "support projection" in { check[Required, RequiredP] shouldBe Right(()) - check[RequiredP, Required] should be('left) + check[RequiredP, Required] should be(Symbol("left")) check[Nullable, NullableP] shouldBe Right(()) - check[NullableP, Nullable] should be('left) + check[NullableP, Nullable] should be(Symbol("left")) check[Repeated, RepeatedP] shouldBe Right(()) - check[RepeatedP, Repeated] should be('left) + check[RepeatedP, Repeated] should be(Symbol("left")) check[MapField, MapFieldP] shouldBe Right(()) - check[MapFieldP, MapField] should be('left) + check[MapFieldP, MapField] should be(Symbol("left")) check[Nested, NestedP] shouldBe Right(()) - check[NestedP, Nested] should be('left) + check[NestedP, Nested] should be(Symbol("left")) } } diff --git a/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaMaterializerTest.scala b/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaMaterializerTest.scala index c341bd4a67..87685ba62e 100644 --- a/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaMaterializerTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/schemas/SchemaMaterializerTest.scala @@ -20,7 +20,7 @@ import org.apache.beam.sdk.schemas.Schema.{Field, FieldType} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.apache.beam.sdk.values.Row import org.apache.beam.sdk.schemas.{Schema => BSchema, SchemaCoder} import org.apache.beam.sdk.util.SerializableUtils.ensureSerializable diff --git a/scio-test/src/test/scala/com/spotify/scio/sql/BeamSQLTest.scala b/scio-test/src/test/scala/com/spotify/scio/sql/BeamSQLTest.scala index 632c5c01dd..149eaea59c 100644 --- a/scio-test/src/test/scala/com/spotify/scio/sql/BeamSQLTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/sql/BeamSQLTest.scala @@ -33,7 +33,7 @@ import org.joda.time.{DateTime, Instant} import org.joda.time.DateTimeZone.UTC import org.scalatest.Assertion -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.spotify.scio.avro import com.spotify.scio.avro.MessageRecord import org.apache.avro.generic.GenericRecord @@ -423,26 +423,26 @@ class BeamSQLTest extends PipelineSpec { it should "provide a typecheck method for tests" in { object checkOK { def apply[A: Schema, B: Schema](q: String): Assertion = - Query1.typecheck(Query1[A, B](q, Sql.defaultTag)) should be('right) + Query1.typecheck(Query1[A, B](q, Sql.defaultTag)) should be(Symbol("right")) def apply[A: Schema, B: Schema, C: Schema]( q: String, a: TupleTag[A], b: TupleTag[B] ): Assertion = - Query2.typecheck(Query2[A, B, C](q, a, b)) should be('right) + Query2.typecheck(Query2[A, B, C](q, a, b)) should be(Symbol("right")) } object checkNOK { def apply[A: Schema, B: Schema](q: String): Assertion = - Query1.typecheck(Query1[A, B](q, Sql.defaultTag)) should be('left) + Query1.typecheck(Query1[A, B](q, Sql.defaultTag)) should be(Symbol("left")) def apply[A: Schema, B: Schema, C: Schema]( q: String, a: TupleTag[A], b: TupleTag[B] ): Assertion = - Query2.typecheck(Query2[A, B, C](q, a, b)) should be('left) + Query2.typecheck(Query2[A, B, C](q, a, b)) should be(Symbol("left")) } checkOK[Bar, Long]("select l from SCOLLECTION") diff --git a/scio-test/src/test/scala/com/spotify/scio/transforms/AsyncLookupDoFnTest.scala b/scio-test/src/test/scala/com/spotify/scio/transforms/AsyncLookupDoFnTest.scala index 2473c1d9b0..b42127b31a 100644 --- a/scio-test/src/test/scala/com/spotify/scio/transforms/AsyncLookupDoFnTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/transforms/AsyncLookupDoFnTest.scala @@ -26,7 +26,7 @@ import com.spotify.scio.coders.Coder import com.spotify.scio.testing._ import com.spotify.scio.transforms.BaseAsyncLookupDoFn.CacheSupplier -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.concurrent.Future import scala.util.{Failure, Success, Try} diff --git a/scio-test/src/test/scala/com/spotify/scio/transforms/FileDownloadDoFnTest.scala b/scio-test/src/test/scala/com/spotify/scio/transforms/FileDownloadDoFnTest.scala index 5f99e0991c..321f1339ed 100644 --- a/scio-test/src/test/scala/com/spotify/scio/transforms/FileDownloadDoFnTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/transforms/FileDownloadDoFnTest.scala @@ -23,7 +23,7 @@ import com.spotify.scio.testing._ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.{Files => GFiles} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class FileDownloadDoFnTest extends PipelineSpec { "FileDownloadDoFn" should "work" in { diff --git a/scio-test/src/test/scala/com/spotify/scio/util/FunctionsTest.scala b/scio-test/src/test/scala/com/spotify/scio/util/FunctionsTest.scala index a75698cce6..8ea1c94025 100644 --- a/scio-test/src/test/scala/com/spotify/scio/util/FunctionsTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/util/FunctionsTest.scala @@ -23,7 +23,7 @@ import org.apache.beam.sdk.transforms.Combine.CombineFn import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class FunctionsTest extends AnyFlatSpec with Matchers { private def testFn[VA](fn: CombineFn[Int, VA, Int]) = { diff --git a/scio-test/src/test/scala/com/spotify/scio/util/ProtobufUtilTest.scala b/scio-test/src/test/scala/com/spotify/scio/util/ProtobufUtilTest.scala index ecfed49f2e..792286debf 100644 --- a/scio-test/src/test/scala/com/spotify/scio/util/ProtobufUtilTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/util/ProtobufUtilTest.scala @@ -31,7 +31,7 @@ import org.apache.beam.sdk.io.{FileSystems, LocalResources} import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class ProtobufUtilTest extends AnyFlatSpec with Matchers { diff --git a/scio-test/src/test/scala/com/spotify/scio/values/DistCacheTest.scala b/scio-test/src/test/scala/com/spotify/scio/values/DistCacheTest.scala index 5c675d7255..07fb4d2491 100644 --- a/scio-test/src/test/scala/com/spotify/scio/values/DistCacheTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/values/DistCacheTest.scala @@ -26,7 +26,7 @@ import com.spotify.scio.avro._ import com.spotify.sparkey.SparkeyReader.Entry import com.spotify.sparkey.{IndexHeader, LogHeader, Sparkey, SparkeyReader} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.io.Source // ======================================================================= diff --git a/scio-test/src/test/scala/com/spotify/scio/values/SCollectionTest.scala b/scio-test/src/test/scala/com/spotify/scio/values/SCollectionTest.scala index 3e09c2bf88..d6d6af24c1 100644 --- a/scio-test/src/test/scala/com/spotify/scio/values/SCollectionTest.scala +++ b/scio-test/src/test/scala/com/spotify/scio/values/SCollectionTest.scala @@ -37,7 +37,7 @@ import org.apache.beam.sdk.transforms.windowing.{ import org.apache.beam.sdk.values.KV import org.joda.time.{DateTimeConstants, Duration, Instant} -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.spotify.scio.coders.Coder class SCollectionTest extends PipelineSpec { diff --git a/scripts/multijoin.py b/scripts/multijoin.py index 91cb391739..f819a150a8 100755 --- a/scripts/multijoin.py +++ b/scripts/multijoin.py @@ -189,7 +189,7 @@ def main(out): import org.apache.beam.sdk.transforms.join.{CoGroupByKey, KeyedPCollectionTuple} # NOQA import org.apache.beam.sdk.values.TupleTag - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ trait MultiJoin extends Serializable {