From d64a8d1dd03e5160c6a2afdf74d17405866e42ce Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 16:57:10 +0200 Subject: [PATCH 1/6] Add back Scala 2.12 * build --- build.sbt | 12 ++++++------ project/Dependencies.scala | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index de0fbc528e..c2a817a888 100644 --- a/build.sbt +++ b/build.sbt @@ -92,7 +92,7 @@ lazy val alpakka = project // springWeb triggers an esoteric ScalaDoc bug (from Java code) springWeb ), - licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/main/v4.1.0/ when released + licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/master/v4.1.0/ when released crossScalaVersions := List() // workaround for https://github.com/sbt/sbt/issues/3465 ) @@ -433,8 +433,9 @@ def alpakkaProject(projectId: String, moduleName: String, additionalSettings: sb .disablePlugins(SitePlugin) .settings( name := s"akka-stream-alpakka-$projectId", - licenses := List(License.Apache2), + licenses := Seq(("BUSL-1.1", url("https://raw.githubusercontent.com/akka/alpakka/master/LICENSE"))), // FIXME change s/master/v4.1.0/ when released AutomaticModuleName.settings(s"akka.stream.alpakka.$moduleName"), + scalacOptions += "-Wconf:cat=deprecation&msg=.*JavaConverters.*:s", mimaPreviousArtifacts := Set( organization.value %% name.value % previousStableVersion.value .getOrElse(throw new Error("Unable to determine previous version")) @@ -454,10 +455,9 @@ def internalProject(projectId: String, additionalSettings: sbt.Def.SettingsDefin Project(id = projectId, base = file(projectId)) .enablePlugins(AutomateHeaderPlugin) .disablePlugins(SitePlugin, MimaPlugin) - .settings( - name := s"akka-stream-alpakka-$projectId", - publish / skip := true - ) + .settings(name := s"akka-stream-alpakka-$projectId", + publish / skip := true, + scalacOptions += "-Wconf:cat=deprecation&msg=.*JavaConverters.*:s") .settings(additionalSettings: _*) Global / onLoad := (Global / onLoad).value.andThen { s => diff --git a/project/Dependencies.scala b/project/Dependencies.scala index eafec6b9fe..827a7d4f36 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,8 @@ object Dependencies { val CronBuild = sys.env.get("GITHUB_EVENT_NAME").contains("schedule") val Scala213 = "2.13.8" // update even in link-validator.conf - val ScalaVersions = Seq(Scala213) + val Scala212 = "2.12.16" + val ScalaVersions = Seq(Scala213, Scala212) val AkkaVersion = "2.6.19" val AkkaBinaryVersion = "2.6" @@ -125,7 +126,7 @@ object Dependencies { libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion, "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test, - "com.typesafe.akka" %% "akka-stream-kafka" % "3.0.0" % Test, + "com.typesafe.akka" %% "akka-stream-kafka" % "3.1.0-M1" % Test, "junit" % "junit" % "4.13.2" % Test, // Eclipse Public License 1.0 "org.scalatest" %% "scalatest" % "3.2.11" % Test // ApacheV2 ) From 9a20986a454e38a31d02a5cfc0f62b9c20e8c1ea Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 17:01:44 +0200 Subject: [PATCH 2/6] CollectionConverters --- .../akka/stream/alpakka/amqp/AmqpConnectionProvider.scala | 6 +++--- .../akka/stream/alpakka/amqp/AmqpConnectorSettings.scala | 2 +- .../akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala | 2 +- .../akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala | 2 +- .../azure/storagequeue/impl/AzureQueueSourceStage.scala | 2 +- .../src/test/scala/docs/scaladsl/AzureQueueSpec.scala | 2 +- .../stream/alpakka/cassandra/CassandraMetricsRegistry.scala | 2 +- .../stream/alpakka/cassandra/javadsl/CassandraSession.scala | 2 +- .../stream/alpakka/cassandra/scaladsl/CassandraFlow.scala | 2 +- .../cassandra/scaladsl/CassandraSessionRegistry.scala | 2 +- .../alpakka/cassandra/scaladsl/CassandraLifecycle.scala | 2 +- .../src/test/scala/docs/javadsl/CassandraSessionSpec.scala | 2 +- .../main/scala/akka/stream/alpakka/couchbase/model.scala | 2 +- .../stream/alpakka/couchbase/testing/CouchbaseSupport.scala | 2 +- .../test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala | 2 +- .../test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala | 2 +- .../test/scala/akka/stream/alpakka/dynamodb/TestOps.scala | 2 +- .../elasticsearch/ElasticsearchConnectionSettings.scala | 2 +- .../akka/stream/alpakka/elasticsearch/WriteMessage.scala | 2 +- .../alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala | 2 +- .../alpakka/elasticsearch/javadsl/ElasticsearchSource.scala | 2 +- .../akka/stream/alpakka/file/javadsl/LogRotatorSink.scala | 2 +- file/src/test/scala/docs/scaladsl/ArchiveSpec.scala | 2 +- file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala | 2 +- .../scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala | 2 +- .../googlecloud/bigquery/storage/ProtobufConverters.scala | 2 +- .../googlecloud/bigquery/storage/impl/ArrowSource.scala | 2 +- .../bigquery/storage/javadsl/BigQueryArrowStorage.scala | 2 +- .../bigquery/storage/javadsl/BigQueryAvroStorage.scala | 2 +- .../bigquery/storage/javadsl/BigQueryStorage.scala | 2 +- .../bigquery/storage/javadsl/AvroByteStringDecoder.scala | 2 +- .../bigquery/storage/scaladsl/ArrowByteStringDecoder.scala | 2 +- .../alpakka/googlecloud/bigquery/javadsl/BigQuery.scala | 2 +- .../googlecloud/bigquery/model/DatasetJsonProtocol.scala | 2 +- .../googlecloud/bigquery/model/JobJsonProtocol.scala | 2 +- .../googlecloud/bigquery/model/QueryJsonProtocol.scala | 2 +- .../googlecloud/bigquery/model/TableDataJsonProtocol.scala | 2 +- .../googlecloud/bigquery/model/TableJsonProtocol.scala | 2 +- .../akka/stream/alpakka/googlecloud/bigquery/e2e/A.scala | 2 +- .../googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala | 2 +- .../alpakka/googlecloud/pubsub/javadsl/GooglePubSub.scala | 2 +- .../akka/stream/alpakka/googlecloud/pubsub/model.scala | 2 +- .../stream/alpakka/googlecloud/storage/FailedUpload.scala | 2 +- .../stream/alpakka/googlecloud/storage/StorageObject.scala | 2 +- .../alpakka/googlecloud/storage/javadsl/GCStorage.scala | 2 +- .../stream/alpakka/googlecloud/storage/GCSExtSpec.scala | 2 +- .../alpakka/googlecloud/storage/GCSSettingsSpec.scala | 2 +- .../alpakka/googlecloud/storage/GCStorageExtSpec.scala | 2 +- .../alpakka/googlecloud/storage/GCStorageSettingsSpec.scala | 2 +- .../alpakka/google/auth/ServiceAccountCredentials.scala | 2 +- .../scala/akka/stream/alpakka/hbase/HTableSettings.scala | 2 +- .../scala/akka/stream/alpakka/hdfs/util/TestUtils.scala | 2 +- .../alpakka/influxdb/impl/AlpakkaResultMapperHelper.scala | 2 +- .../stream/alpakka/influxdb/impl/InfluxDbSourceStage.scala | 2 +- .../akka/stream/alpakka/influxdb/javadsl/InfluxDbFlow.scala | 2 +- influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala | 2 +- .../main/scala/akka/stream/alpakka/jms/JmsMessages.scala | 2 +- .../akka/stream/alpakka/jms/impl/JmsMessageReader.scala | 2 +- .../scala/akka/stream/alpakka/jms/javadsl/JmsConsumer.scala | 2 +- .../scala/akka/stream/alpakka/jms/javadsl/JmsProducer.scala | 2 +- .../akka/stream/alpakka/jms/scaladsl/JmsConsumer.scala | 2 +- jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala | 2 +- .../stream/alpakka/kinesis/impl/KinesisSourceStage.scala | 2 +- .../akka/stream/alpakka/kinesis/impl/ShardProcessor.scala | 2 +- .../akka/stream/alpakka/kinesis/javadsl/KinesisSource.scala | 2 +- .../akka/stream/alpakka/kinesis/scaladsl/KinesisFlow.scala | 2 +- .../kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala | 2 +- .../scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala | 2 +- .../stream/alpakka/kinesis/KinesisSchedulerSourceSpec.scala | 2 +- .../alpakka/kinesisfirehose/KinesisFirehoseFlowSpec.scala | 2 +- .../scala/akka/stream/alpakka/kudu/impl/KuduFlowStage.scala | 2 +- kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala | 2 +- .../akka/stream/alpakka/mongodb/javadsl/MongoFlow.scala | 2 +- .../akka/stream/alpakka/mongodb/scaladsl/MongoFlow.scala | 2 +- mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala | 2 +- mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala | 2 +- .../scala/akka/stream/alpakka/mqtt/streaming/model.scala | 2 +- mqtt/src/main/scala/akka/stream/alpakka/mqtt/settings.scala | 2 +- .../stream/alpakka/orientdb/impl/OrientDbSourceStage.scala | 2 +- .../akka/stream/alpakka/orientdb/javadsl/OrientDbFlow.scala | 2 +- .../main/scala/akka/stream/alpakka/reference/model.scala | 2 +- .../stream/alpakka/reference/testkit/MessageFactory.scala | 2 +- s3/src/main/scala/akka/stream/alpakka/s3/S3Headers.scala | 2 +- s3/src/main/scala/akka/stream/alpakka/s3/javadsl/S3.scala | 2 +- s3/src/main/scala/akka/stream/alpakka/s3/model.scala | 2 +- .../scala/akka/stream/alpakka/s3/scaladsl/S3ExtSpec.scala | 2 +- .../akka/stream/alpakka/s3/scaladsl/S3IntegrationSpec.scala | 2 +- .../main/scala/akka/stream/alpakka/solr/SolrMessages.scala | 2 +- .../scala/akka/stream/alpakka/solr/impl/SolrFlowStage.scala | 2 +- .../scala/akka/stream/alpakka/solr/javadsl/SolrFlow.scala | 2 +- .../scala/akka/stream/alpakka/sqs/SqsSourceSettings.scala | 2 +- .../akka/stream/alpakka/sqs/javadsl/SqsPublishFlow.scala | 2 +- .../akka/stream/alpakka/sqs/javadsl/SqsPublishSink.scala | 2 +- .../scala/akka/stream/alpakka/sqs/scaladsl/SqsAckFlow.scala | 2 +- .../akka/stream/alpakka/sqs/scaladsl/SqsPublishFlow.scala | 2 +- .../scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala | 2 +- .../stream/alpakka/sqs/scaladsl/DefaultTestContext.scala | 2 +- sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala | 2 +- sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala | 2 +- sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala | 2 +- .../akka/stream/alpakka/testkit/CapturingAppender.scala | 2 +- .../alpakka/text/scaladsl/CharsetCodingFlowsSpec.scala | 2 +- .../test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala | 2 +- .../scala/akka/stream/alpakka/xml/javadsl/XmlParsing.scala | 2 +- xml/src/main/scala/akka/stream/alpakka/xml/model.scala | 2 +- 105 files changed, 107 insertions(+), 107 deletions(-) diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectionProvider.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectionProvider.scala index c2758232ed..c5ce782462 100644 --- a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectionProvider.scala +++ b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectionProvider.scala @@ -13,7 +13,7 @@ import javax.net.ssl.{SSLContext, TrustManager} import scala.annotation.tailrec import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Only for internal implementations @@ -121,7 +121,7 @@ final class AmqpDetailsConnectionProvider private ( copy(connectionName = Option(name)) override def get: Connection = { - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val factory = new ConnectionFactory credentials.foreach { credentials => factory.setUsername(credentials.username) @@ -331,7 +331,7 @@ final class AmqpConnectionFactoryConnectionProvider private (val factory: Connec copy(hostAndPorts = hostAndPorts.asScala.map(_.toScala).toIndexedSeq) override def get: Connection = { - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ factory.newConnection(hostAndPortList.map(hp => new Address(hp._1, hp._2)).asJava) } diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectorSettings.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectorSettings.scala index 95223fb989..5f03dee3d3 100644 --- a/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectorSettings.scala +++ b/amqp/src/main/scala/akka/stream/alpakka/amqp/AmqpConnectorSettings.scala @@ -7,7 +7,7 @@ package akka.stream.alpakka.amqp import akka.annotation.InternalApi import akka.util.JavaDurationConverters._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.duration._ diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala index bf93f56a2a..c22539e23f 100644 --- a/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala +++ b/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpConnectorLogic.scala @@ -32,7 +32,7 @@ private trait AmqpConnectorLogic { this: GraphStageLogic => connection.addShutdownListener(shutdownListener) channel.addShutdownListener(shutdownListener) - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ settings.declarations.foreach { case d: QueueDeclaration => diff --git a/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala b/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala index bb01248d90..7a3690aa70 100644 --- a/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala +++ b/amqp/src/main/scala/akka/stream/alpakka/amqp/impl/AmqpSourceStage.scala @@ -50,7 +50,7 @@ private[amqp] final class AmqpSourceStage(settings: AmqpSourceSettings, bufferSi private var unackedMessages = 0 override def whenConnected(): Unit = { - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ channel.basicQos(bufferSize) val consumerCallback = getAsyncCallback(handleDelivery) diff --git a/azure-storage-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/impl/AzureQueueSourceStage.scala b/azure-storage-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/impl/AzureQueueSourceStage.scala index b727f0849a..e75ed32489 100644 --- a/azure-storage-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/impl/AzureQueueSourceStage.scala +++ b/azure-storage-queue/src/main/scala/akka/stream/alpakka/azure/storagequeue/impl/AzureQueueSourceStage.scala @@ -35,7 +35,7 @@ import scala.collection.mutable.Queue retrieveMessages() def retrieveMessages(): Unit = { - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val res = cloudQueueBuilt .retrieveMessages(settings.batchSize, settings.initialVisibilityTimeout, null, null) .asScala diff --git a/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala b/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala index df2b8d940f..879b72a782 100644 --- a/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala +++ b/azure-storage-queue/src/test/scala/docs/scaladsl/AzureQueueSpec.scala @@ -15,7 +15,7 @@ import com.microsoft.azure.storage._ import com.microsoft.azure.storage.queue._ import org.scalatest._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent._ import scala.concurrent.duration._ import scala.util.Properties diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraMetricsRegistry.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraMetricsRegistry.scala index 2b32180d3f..7cfca3e5dc 100644 --- a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraMetricsRegistry.scala +++ b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/CassandraMetricsRegistry.scala @@ -8,7 +8,7 @@ import akka.actor.{ClassicActorSystemProvider, ExtendedActorSystem, Extension, E import akka.annotation.InternalApi import com.codahale.metrics.MetricRegistry -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Retrieves Cassandra metrics registry for an actor system diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSession.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSession.scala index 991c47d23a..2f5a125291 100644 --- a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSession.scala +++ b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/javadsl/CassandraSession.scala @@ -10,7 +10,7 @@ import java.util.concurrent.{CompletionStage, Executor} import java.util.function.{Function => JFunction} import scala.annotation.varargs -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ import scala.concurrent.ExecutionContext diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraFlow.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraFlow.scala index 695a6f5d06..50e617c7f6 100644 --- a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraFlow.scala +++ b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraFlow.scala @@ -10,7 +10,7 @@ import akka.stream.alpakka.cassandra.CassandraWriteSettings import akka.stream.scaladsl.{Flow, FlowWithContext} import com.datastax.oss.driver.api.core.cql.{BatchStatement, BoundStatement, PreparedStatement} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.Future /** diff --git a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSessionRegistry.scala b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSessionRegistry.scala index 3c5c71a586..86ca7a4d24 100644 --- a/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSessionRegistry.scala +++ b/cassandra/src/main/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraSessionRegistry.scala @@ -6,7 +6,7 @@ package akka.stream.alpakka.cassandra.scaladsl import java.util.concurrent.ConcurrentHashMap -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.ExecutionContext import scala.concurrent.Future import akka.Done diff --git a/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraLifecycle.scala b/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraLifecycle.scala index 75010305ca..712c3e7253 100644 --- a/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraLifecycle.scala +++ b/cassandra/src/test/scala/akka/stream/alpakka/cassandra/scaladsl/CassandraLifecycle.scala @@ -13,7 +13,7 @@ import com.datastax.oss.driver.api.core.cql._ import org.scalatest._ import org.scalatest.concurrent.{PatienceConfiguration, ScalaFutures} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{Await, Future} diff --git a/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala b/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala index b968de452d..f23414bc0f 100644 --- a/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala +++ b/cassandra/src/test/scala/docs/javadsl/CassandraSessionSpec.scala @@ -19,7 +19,7 @@ import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped import akka.stream.testkit.scaladsl.TestSink import com.datastax.oss.driver.api.core.cql.Row -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ diff --git a/couchbase/src/main/scala/akka/stream/alpakka/couchbase/model.scala b/couchbase/src/main/scala/akka/stream/alpakka/couchbase/model.scala index 71696d05b6..80e4563a80 100644 --- a/couchbase/src/main/scala/akka/stream/alpakka/couchbase/model.scala +++ b/couchbase/src/main/scala/akka/stream/alpakka/couchbase/model.scala @@ -13,7 +13,7 @@ import com.couchbase.client.java.env.CouchbaseEnvironment import com.couchbase.client.java.{PersistTo, ReplicateTo} import com.typesafe.config.Config -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.Future import scala.compat.java8.FutureConverters._ diff --git a/couchbase/src/test/scala/akka/stream/alpakka/couchbase/testing/CouchbaseSupport.scala b/couchbase/src/test/scala/akka/stream/alpakka/couchbase/testing/CouchbaseSupport.scala index 587e348541..c8c3d821c4 100644 --- a/couchbase/src/test/scala/akka/stream/alpakka/couchbase/testing/CouchbaseSupport.scala +++ b/couchbase/src/test/scala/akka/stream/alpakka/couchbase/testing/CouchbaseSupport.scala @@ -17,7 +17,7 @@ import com.couchbase.client.java.document.{BinaryDocument, JsonDocument, RawJson import org.slf4j.LoggerFactory import play.api.libs.json.Json -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ diff --git a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala index 86e57e1a9e..9f88ab3522 100644 --- a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala +++ b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/ItemSpec.scala @@ -19,7 +19,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient import software.amazon.awssdk.services.dynamodb.model.TableStatus import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.ExecutionContext class ItemSpec extends TestKit(ActorSystem("ItemSpec")) with AsyncWordSpecLike with Matchers with BeforeAndAfterAll { diff --git a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala index fafc2c2d7e..0c7498044e 100644 --- a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala +++ b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TableSpec.scala @@ -15,7 +15,7 @@ import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCrede import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AsyncWordSpecLike diff --git a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TestOps.scala b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TestOps.scala index 91093b3a68..9c83752edd 100644 --- a/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TestOps.scala +++ b/dynamodb/src/test/scala/akka/stream/alpakka/dynamodb/TestOps.scala @@ -6,7 +6,7 @@ package akka.stream.alpakka.dynamodb import software.amazon.awssdk.services.dynamodb.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ trait TestOps { diff --git a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/ElasticsearchConnectionSettings.scala b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/ElasticsearchConnectionSettings.scala index d0bf6cd2dd..4f18a05b17 100644 --- a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/ElasticsearchConnectionSettings.scala +++ b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/ElasticsearchConnectionSettings.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.model.HttpHeader import akka.http.scaladsl.model.HttpHeader.ParsingResult import akka.japi.Util -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import javax.net.ssl.SSLContext import scala.compat.java8.OptionConverters diff --git a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/WriteMessage.scala b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/WriteMessage.scala index 2b17533da3..8a81dc78e3 100644 --- a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/WriteMessage.scala +++ b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/WriteMessage.scala @@ -7,7 +7,7 @@ package akka.stream.alpakka.elasticsearch import akka.NotUsed import akka.annotation.InternalApi -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ /** diff --git a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala index 8f19c4a968..da847224ae 100644 --- a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala +++ b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchFlow.scala @@ -9,7 +9,7 @@ import akka.annotation.ApiMayChange import akka.stream.alpakka.elasticsearch.{scaladsl, _} import com.fasterxml.jackson.databind.ObjectMapper -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Java API to create Elasticsearch flows. diff --git a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchSource.scala b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchSource.scala index dd1c48427c..3b14f8c249 100644 --- a/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchSource.scala +++ b/elasticsearch/src/main/scala/akka/stream/alpakka/elasticsearch/javadsl/ElasticsearchSource.scala @@ -13,7 +13,7 @@ import akka.stream.{Attributes, Materializer} import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.{ArrayNode, NumericNode} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.ExecutionContext /** diff --git a/file/src/main/scala/akka/stream/alpakka/file/javadsl/LogRotatorSink.scala b/file/src/main/scala/akka/stream/alpakka/file/javadsl/LogRotatorSink.scala index 93c302971d..29148f7724 100644 --- a/file/src/main/scala/akka/stream/alpakka/file/javadsl/LogRotatorSink.scala +++ b/file/src/main/scala/akka/stream/alpakka/file/javadsl/LogRotatorSink.scala @@ -15,7 +15,7 @@ import akka.stream.javadsl.Sink import akka.util.ByteString import akka.japi.function -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.Future import scala.compat.java8.FutureConverters._ diff --git a/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala b/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala index f0466361bf..2cceb69971 100644 --- a/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala +++ b/file/src/test/scala/docs/scaladsl/ArchiveSpec.scala @@ -20,7 +20,7 @@ import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.{ExecutionContext, Future} class ArchiveSpec diff --git a/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala b/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala index eedc566eef..bc72fe30c5 100644 --- a/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala +++ b/file/src/test/scala/docs/scaladsl/TarArchiveSpec.scala @@ -22,7 +22,7 @@ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.{ExecutionContext, Future} diff --git a/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala b/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala index 6bd5473b59..546eafc275 100644 --- a/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala +++ b/ftp/src/main/scala/akka/stream/alpakka/ftp/impl/SftpOperations.scala @@ -19,7 +19,7 @@ import net.schmizz.sshj.userauth.password.{PasswordFinder, PasswordUtils, Resour import net.schmizz.sshj.xfer.FilePermission import org.apache.commons.net.DefaultSocketFactory -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.util.{Failure, Try} diff --git a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/ProtobufConverters.scala b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/ProtobufConverters.scala index a2b8b897c7..b66171e889 100644 --- a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/ProtobufConverters.scala +++ b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/ProtobufConverters.scala @@ -9,7 +9,7 @@ import com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions import com.google.cloud.bigquery.storage.v1.stream.ReadSession import scalapb.UnknownFieldSet -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Internal API diff --git a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/impl/ArrowSource.scala b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/impl/ArrowSource.scala index df5b5f7d52..66e0cdd768 100644 --- a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/impl/ArrowSource.scala +++ b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/impl/ArrowSource.scala @@ -18,7 +18,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel import scala.collection.mutable import scala.collection.mutable.ListBuffer -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object ArrowSource { diff --git a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala index 446bad22e4..64b74e4a32 100644 --- a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala +++ b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryArrowStorage.scala @@ -12,7 +12,7 @@ import akka.stream.alpakka.googlecloud.bigquery.storage.{scaladsl => scstorage} import com.google.cloud.bigquery.storage.v1.arrow.{ArrowRecordBatch, ArrowSchema} import java.util.concurrent.CompletionStage -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters.FutureOps /** diff --git a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala index 135391d7f5..681f7c716c 100644 --- a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala +++ b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryAvroStorage.scala @@ -11,7 +11,7 @@ import com.google.cloud.bigquery.storage.v1.avro.{AvroRows, AvroSchema} import com.google.cloud.bigquery.storage.v1.stream.ReadSession.TableReadOptions import java.util.concurrent.CompletionStage -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters.FutureOps /** diff --git a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala index af1f024320..2d7ab9397e 100644 --- a/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala +++ b/google-cloud-bigquery-storage/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/BigQueryStorage.scala @@ -18,7 +18,7 @@ import com.google.cloud.bigquery.storage.v1.stream.ReadSession import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters.FutureOps -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Google BigQuery Storage Api Akka Stream operator factory. diff --git a/google-cloud-bigquery-storage/src/test/java/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala b/google-cloud-bigquery-storage/src/test/java/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala index 6b8f653f3e..0b0dc10585 100644 --- a/google-cloud-bigquery-storage/src/test/java/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala +++ b/google-cloud-bigquery-storage/src/test/java/akka/stream/alpakka/googlecloud/bigquery/storage/javadsl/AvroByteStringDecoder.scala @@ -16,7 +16,7 @@ import org.apache.avro.io.DecoderFactory import java.util import scala.collection.mutable.ListBuffer import scala.concurrent.{ExecutionContext, Future} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class AvroByteStringDecoder(schema: Schema) extends FromByteStringUnmarshaller[java.util.List[BigQueryRecord]] { diff --git a/google-cloud-bigquery-storage/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala b/google-cloud-bigquery-storage/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala index ac17d940b6..16e7dcbbda 100644 --- a/google-cloud-bigquery-storage/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala +++ b/google-cloud-bigquery-storage/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/storage/scaladsl/ArrowByteStringDecoder.scala @@ -18,7 +18,7 @@ import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel import scala.collection.mutable import scala.collection.mutable.ListBuffer import scala.concurrent.{ExecutionContext, Future} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class ArrowByteStringDecoder(val schema: ArrowSchema) extends FromByteStringUnmarshaller[List[BigQueryRecord]] { diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/javadsl/BigQuery.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/javadsl/BigQuery.scala index 73052e0aea..8f2a3b8ea4 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/javadsl/BigQuery.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/javadsl/BigQuery.scala @@ -34,7 +34,7 @@ import java.util.concurrent.CompletionStage import java.{lang, util} import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ import scala.concurrent.duration.{FiniteDuration, MILLISECONDS} diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/DatasetJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/DatasetJsonProtocol.scala index 75c6e29c61..331735281a 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/DatasetJsonProtocol.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/DatasetJsonProtocol.scala @@ -9,7 +9,7 @@ import akka.stream.alpakka.googlecloud.bigquery.scaladsl.spray.BigQueryRestJsonP import spray.json.{JsonFormat, RootJsonFormat} import java.util -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.compat.java8.OptionConverters._ diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/JobJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/JobJsonProtocol.scala index e7181e9198..366d8872d1 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/JobJsonProtocol.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/JobJsonProtocol.scala @@ -11,7 +11,7 @@ import spray.json.{JsonFormat, RootJsonFormat} import java.util import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.compat.java8.OptionConverters._ diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/QueryJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/QueryJsonProtocol.scala index aaf0353ebf..737edf32fb 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/QueryJsonProtocol.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/QueryJsonProtocol.scala @@ -16,7 +16,7 @@ import java.{lang, util} import scala.annotation.nowarn import scala.annotation.unchecked.uncheckedVariance -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.compat.java8.OptionConverters._ import scala.concurrent.duration.FiniteDuration diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableDataJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableDataJsonProtocol.scala index 7e553cba37..f88359ed2e 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableDataJsonProtocol.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableDataJsonProtocol.scala @@ -15,7 +15,7 @@ import java.{lang, util} import scala.annotation.nowarn import scala.annotation.unchecked.uncheckedVariance -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.compat.java8.OptionConverters._ diff --git a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableJsonProtocol.scala b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableJsonProtocol.scala index bef5a1561b..db18312635 100644 --- a/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableJsonProtocol.scala +++ b/google-cloud-bigquery/src/main/scala/akka/stream/alpakka/googlecloud/bigquery/model/TableJsonProtocol.scala @@ -15,7 +15,7 @@ import scala.annotation.nowarn import scala.annotation.varargs import scala.collection.immutable.Seq import scala.compat.java8.OptionConverters._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Table resource model diff --git a/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/A.scala b/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/A.scala index 56510d79ba..616f1b1ba7 100644 --- a/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/A.scala +++ b/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/A.scala @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import java.time.{Instant, LocalDate, LocalDateTime, LocalTime} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ @JsonPropertyOrder(alphabetic = true) case class A(integer: Int, long: Long, float: Float, double: Double, string: String, boolean: Boolean, record: B) { diff --git a/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala b/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala index 39661d2413..bdf6ca0915 100644 --- a/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala +++ b/google-cloud-bigquery/src/test/scala/akka/stream/alpakka/googlecloud/bigquery/e2e/javadsl/EndToEndHelper.scala @@ -5,7 +5,7 @@ package akka.stream.alpakka.googlecloud.bigquery.e2e.javadsl import akka.stream.alpakka.googlecloud.bigquery.e2e.scaladsl; -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ abstract class EndToEndHelper extends scaladsl.EndToEndHelper { diff --git a/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/javadsl/GooglePubSub.scala b/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/javadsl/GooglePubSub.scala index b1a052a6e6..74071b97d8 100644 --- a/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/javadsl/GooglePubSub.scala +++ b/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/javadsl/GooglePubSub.scala @@ -13,7 +13,7 @@ import akka.{Done, NotUsed} import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters._ import scala.concurrent.Future -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Java DSL for Google Pub/Sub diff --git a/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/model.scala b/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/model.scala index 044c9dc7c7..a5f1a16c6d 100644 --- a/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/model.scala +++ b/google-cloud-pub-sub/src/main/scala/akka/stream/alpakka/googlecloud/pubsub/model.scala @@ -12,7 +12,7 @@ import akka.stream.alpakka.google.auth.ServiceAccountCredentials import scala.annotation.nowarn import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * @param projectId (deprecated) the project Id in the google account diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala index d348accb1b..13ed61a653 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/FailedUpload.scala @@ -5,7 +5,7 @@ package akka.stream.alpakka.googlecloud.storage import scala.collection.immutable.Seq -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ final class FailedUpload private ( val reasons: Seq[Throwable] diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala index 32618b4794..c11f2b18b7 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/StorageObject.scala @@ -9,7 +9,7 @@ import java.util.Optional import akka.http.scaladsl.model.ContentType import scala.compat.java8.OptionConverters._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Represents an object within Google Cloud Storage. diff --git a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/javadsl/GCStorage.scala b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/javadsl/GCStorage.scala index 9c3f57b90f..237fea7e0c 100644 --- a/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/javadsl/GCStorage.scala +++ b/google-cloud-storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/javadsl/GCStorage.scala @@ -17,7 +17,7 @@ import akka.stream.{Attributes, Materializer} import akka.util.ByteString import akka.{Done, NotUsed} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSExtSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSExtSpec.scala index 6386655da4..d0267fe6a9 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSExtSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSExtSpec.scala @@ -10,7 +10,7 @@ import com.typesafe.config.ConfigFactory import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class GCSExtSpec extends AnyFlatSpec with Matchers with LogCapturing { "GCSExt" should "reuse application config from actor system" in { diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSSettingsSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSSettingsSpec.scala index 32620f1f6c..bbc5a0664c 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSSettingsSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCSSettingsSpec.scala @@ -9,7 +9,7 @@ import com.typesafe.config.ConfigFactory import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class GCSSettingsSpec extends AnyFlatSpec with Matchers with LogCapturing { "GCSSettings" should "create settings from application config" in { diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageExtSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageExtSpec.scala index 4dbabe3889..b70a3f4974 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageExtSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageExtSpec.scala @@ -11,7 +11,7 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class GCStorageExtSpec extends AnyFlatSpec with Matchers with LogCapturing { "GCStorageExt" should "reuse application config from actor system" in { diff --git a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageSettingsSpec.scala b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageSettingsSpec.scala index b0f1daaf0a..0f442de276 100644 --- a/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageSettingsSpec.scala +++ b/google-cloud-storage/src/test/scala/akka/stream/alpakka/googlecloud/storage/GCStorageSettingsSpec.scala @@ -10,7 +10,7 @@ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class GCStorageSettingsSpec extends AnyFlatSpec with Matchers with LogCapturing { "GCStorageSettings" should "create settings from application config" in { diff --git a/google-common/src/main/scala/akka/stream/alpakka/google/auth/ServiceAccountCredentials.scala b/google-common/src/main/scala/akka/stream/alpakka/google/auth/ServiceAccountCredentials.scala index 4982002ea8..68dc3516ea 100644 --- a/google-common/src/main/scala/akka/stream/alpakka/google/auth/ServiceAccountCredentials.scala +++ b/google-common/src/main/scala/akka/stream/alpakka/google/auth/ServiceAccountCredentials.scala @@ -13,7 +13,7 @@ import spray.json.DefaultJsonProtocol._ import spray.json.{JsonParser, RootJsonFormat} import java.time.Clock -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.Future import scala.io.Source diff --git a/hbase/src/main/scala/akka/stream/alpakka/hbase/HTableSettings.scala b/hbase/src/main/scala/akka/stream/alpakka/hbase/HTableSettings.scala index eaa563a342..733b838620 100644 --- a/hbase/src/main/scala/akka/stream/alpakka/hbase/HTableSettings.scala +++ b/hbase/src/main/scala/akka/stream/alpakka/hbase/HTableSettings.scala @@ -9,7 +9,7 @@ import org.apache.hadoop.hbase.TableName import org.apache.hadoop.hbase.client.Mutation import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FunctionConverters._ final class HTableSettings[T] private (val conf: Configuration, diff --git a/hdfs/src/test/scala/akka/stream/alpakka/hdfs/util/TestUtils.scala b/hdfs/src/test/scala/akka/stream/alpakka/hdfs/util/TestUtils.scala index 7b410d9e9d..42f914216c 100644 --- a/hdfs/src/test/scala/akka/stream/alpakka/hdfs/util/TestUtils.scala +++ b/hdfs/src/test/scala/akka/stream/alpakka/hdfs/util/TestUtils.scala @@ -178,7 +178,7 @@ object JavaTestUtils extends TestUtils { import org.junit.Assert._ - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val books: util.List[ByteString] = ScalaTestUtils.books.asJava diff --git a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/AlpakkaResultMapperHelper.scala b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/AlpakkaResultMapperHelper.scala index f0c0b861e5..045314feb6 100644 --- a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/AlpakkaResultMapperHelper.scala +++ b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/AlpakkaResultMapperHelper.scala @@ -17,7 +17,7 @@ import akka.annotation.InternalApi import org.influxdb.InfluxDBMapperException import org.influxdb.dto.Point -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Internal API. diff --git a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/InfluxDbSourceStage.scala b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/InfluxDbSourceStage.scala index 3eff57d175..5318af0978 100644 --- a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/InfluxDbSourceStage.scala +++ b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/impl/InfluxDbSourceStage.scala @@ -11,7 +11,7 @@ import akka.stream.stage.{GraphStage, GraphStageLogic, OutHandler} import org.influxdb.{InfluxDB, InfluxDBException} import org.influxdb.dto.{Query, QueryResult} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * INTERNAL API diff --git a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/javadsl/InfluxDbFlow.scala b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/javadsl/InfluxDbFlow.scala index 5bdc6216f3..de19f90bea 100644 --- a/influxdb/src/main/scala/akka/stream/alpakka/influxdb/javadsl/InfluxDbFlow.scala +++ b/influxdb/src/main/scala/akka/stream/alpakka/influxdb/javadsl/InfluxDbFlow.scala @@ -12,7 +12,7 @@ import akka.stream.javadsl.Flow import akka.stream.alpakka.influxdb.scaladsl import org.influxdb.dto.Point -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * API may change. diff --git a/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala b/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala index c4d4b1526d..3057494005 100644 --- a/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala +++ b/influxdb/src/test/scala/docs/scaladsl/InfluxDbSpec.scala @@ -18,7 +18,7 @@ import akka.testkit.TestKit import docs.javadsl.TestUtils._ import akka.stream.scaladsl.Sink -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import docs.javadsl.TestConstants.{INFLUXDB_URL, PASSWORD, USERNAME} import org.scalatest.matchers.must.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/jms/src/main/scala/akka/stream/alpakka/jms/JmsMessages.scala b/jms/src/main/scala/akka/stream/alpakka/jms/JmsMessages.scala index eae5b7e113..a6fd022239 100644 --- a/jms/src/main/scala/akka/stream/alpakka/jms/JmsMessages.scala +++ b/jms/src/main/scala/akka/stream/alpakka/jms/JmsMessages.scala @@ -9,7 +9,7 @@ import javax.jms import akka.NotUsed import akka.stream.alpakka.jms.impl.JmsMessageReader._ import akka.util.ByteString -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ /** diff --git a/jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsMessageReader.scala b/jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsMessageReader.scala index 6d326ccb74..87b9af41c0 100644 --- a/jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsMessageReader.scala +++ b/jms/src/main/scala/akka/stream/alpakka/jms/impl/JmsMessageReader.scala @@ -10,7 +10,7 @@ import akka.annotation.InternalApi import akka.stream.alpakka.jms._ import akka.util.ByteString import scala.annotation.tailrec -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ @InternalApi private[jms] object JmsMessageReader { diff --git a/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsConsumer.scala b/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsConsumer.scala index 4cb9d3f46c..73236884f7 100644 --- a/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsConsumer.scala +++ b/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsConsumer.scala @@ -9,7 +9,7 @@ import akka.NotUsed import akka.stream.alpakka.jms._ import akka.stream.javadsl.Source -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Factory methods to create JMS consumers. diff --git a/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsProducer.scala b/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsProducer.scala index cbe405f2ef..7e4302abbd 100644 --- a/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsProducer.scala +++ b/jms/src/main/scala/akka/stream/alpakka/jms/javadsl/JmsProducer.scala @@ -12,7 +12,7 @@ import akka.stream.scaladsl.{Flow, Keep} import akka.util.ByteString import akka.{Done, NotUsed} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters /** diff --git a/jms/src/main/scala/akka/stream/alpakka/jms/scaladsl/JmsConsumer.scala b/jms/src/main/scala/akka/stream/alpakka/jms/scaladsl/JmsConsumer.scala index f5c3bce5ff..6925d030db 100644 --- a/jms/src/main/scala/akka/stream/alpakka/jms/scaladsl/JmsConsumer.scala +++ b/jms/src/main/scala/akka/stream/alpakka/jms/scaladsl/JmsConsumer.scala @@ -10,7 +10,7 @@ import akka.stream.alpakka.jms.impl._ import akka.stream.scaladsl.Source import javax.jms -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Factory methods to create JMS consumers. diff --git a/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala b/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala index 25e52a3216..8ac242a3d4 100644 --- a/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala +++ b/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala @@ -24,7 +24,7 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import scala.annotation.tailrec -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.collection.mutable import scala.concurrent.Future diff --git a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/KinesisSourceStage.scala b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/KinesisSourceStage.scala index 4bd2dd662c..bbd6422167 100644 --- a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/KinesisSourceStage.scala +++ b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/KinesisSourceStage.scala @@ -15,7 +15,7 @@ import software.amazon.awssdk.services.kinesis.KinesisAsyncClient import software.amazon.awssdk.services.kinesis.model._ import scala.collection.mutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.util.{Failure, Success, Try} import scala.compat.java8.FutureConverters._ diff --git a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/ShardProcessor.scala b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/ShardProcessor.scala index 7a70aa2e1d..43b6bfd798 100644 --- a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/ShardProcessor.scala +++ b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/impl/ShardProcessor.scala @@ -14,7 +14,7 @@ import software.amazon.kinesis.lifecycle.events._ import software.amazon.kinesis.processor.{RecordProcessorCheckpointer, ShardRecordProcessor} import software.amazon.kinesis.retrieval.KinesisClientRecord -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ @InternalApi private[kinesis] class ShardProcessor( diff --git a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/javadsl/KinesisSource.scala b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/javadsl/KinesisSource.scala index bb63028a58..c0a9d8e9ad 100644 --- a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/javadsl/KinesisSource.scala +++ b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/javadsl/KinesisSource.scala @@ -10,7 +10,7 @@ import akka.stream.javadsl.Source import software.amazon.awssdk.services.kinesis.KinesisAsyncClient import software.amazon.awssdk.services.kinesis.model.Record -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object KinesisSource { diff --git a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/scaladsl/KinesisFlow.scala b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/scaladsl/KinesisFlow.scala index 2b4f55c734..433d8a20ab 100644 --- a/kinesis/src/main/scala/akka/stream/alpakka/kinesis/scaladsl/KinesisFlow.scala +++ b/kinesis/src/main/scala/akka/stream/alpakka/kinesis/scaladsl/KinesisFlow.scala @@ -22,7 +22,7 @@ import software.amazon.awssdk.services.kinesis.model.{ PutRecordsResultEntry } -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Queue import scala.concurrent.duration._ import scala.compat.java8.FutureConverters._ diff --git a/kinesis/src/main/scala/akka/stream/alpakka/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala b/kinesis/src/main/scala/akka/stream/alpakka/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala index 34be3bd690..4b2b028dd7 100644 --- a/kinesis/src/main/scala/akka/stream/alpakka/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala +++ b/kinesis/src/main/scala/akka/stream/alpakka/kinesisfirehose/scaladsl/KinesisFirehoseFlow.scala @@ -13,7 +13,7 @@ import akka.stream.scaladsl.Flow import software.amazon.awssdk.services.firehose.FirehoseAsyncClient import software.amazon.awssdk.services.firehose.model.{PutRecordBatchRequest, PutRecordBatchResponseEntry, Record} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Queue import scala.concurrent.duration._ diff --git a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala index b855e7c525..0de72e1355 100644 --- a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala +++ b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala @@ -22,7 +22,7 @@ import org.scalatest.matchers.should.Matchers import software.amazon.awssdk.core.SdkBytes import software.amazon.awssdk.services.kinesis.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class KinesisFlowSpec extends AnyWordSpec with Matchers with KinesisMock with LogCapturing { diff --git a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisSchedulerSourceSpec.scala b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisSchedulerSourceSpec.scala index 9072650631..f7c1a55a46 100644 --- a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisSchedulerSourceSpec.scala +++ b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisSchedulerSourceSpec.scala @@ -37,7 +37,7 @@ import software.amazon.kinesis.processor.{ import software.amazon.kinesis.retrieval.KinesisClientRecord import software.amazon.kinesis.retrieval.kpl.ExtendedSequenceNumber -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Random diff --git a/kinesis/src/test/scala/akka/stream/alpakka/kinesisfirehose/KinesisFirehoseFlowSpec.scala b/kinesis/src/test/scala/akka/stream/alpakka/kinesisfirehose/KinesisFirehoseFlowSpec.scala index 2945a8a129..b70cefec51 100644 --- a/kinesis/src/test/scala/akka/stream/alpakka/kinesisfirehose/KinesisFirehoseFlowSpec.scala +++ b/kinesis/src/test/scala/akka/stream/alpakka/kinesisfirehose/KinesisFirehoseFlowSpec.scala @@ -22,7 +22,7 @@ import org.scalatest.matchers.should.Matchers import software.amazon.awssdk.core.SdkBytes import software.amazon.awssdk.services.firehose.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class KinesisFirehoseFlowSpec extends AnyWordSpec with Matchers with KinesisFirehoseMock with LogCapturing { diff --git a/kudu/src/main/scala/akka/stream/alpakka/kudu/impl/KuduFlowStage.scala b/kudu/src/main/scala/akka/stream/alpakka/kudu/impl/KuduFlowStage.scala index ad26864c01..a1f898896a 100644 --- a/kudu/src/main/scala/akka/stream/alpakka/kudu/impl/KuduFlowStage.scala +++ b/kudu/src/main/scala/akka/stream/alpakka/kudu/impl/KuduFlowStage.scala @@ -12,7 +12,7 @@ import org.apache.kudu.Schema import org.apache.kudu.Type._ import org.apache.kudu.client.{KuduClient, KuduTable, PartialRow} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.util.control.NonFatal /** diff --git a/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala b/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala index 7b9d54e9d8..af02cabb0a 100644 --- a/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala +++ b/kudu/src/test/scala/docs/scaladsl/KuduTableSpec.scala @@ -16,7 +16,7 @@ import org.apache.kudu.{ColumnSchema, Schema, Type} import org.scalatest.concurrent.ScalaFutures import org.scalatest.BeforeAndAfterAll -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.Future import scala.concurrent.duration._ import org.scalatest.matchers.should.Matchers diff --git a/mongodb/src/main/scala/akka/stream/alpakka/mongodb/javadsl/MongoFlow.scala b/mongodb/src/main/scala/akka/stream/alpakka/mongodb/javadsl/MongoFlow.scala index c772df42ec..702d68d251 100644 --- a/mongodb/src/main/scala/akka/stream/alpakka/mongodb/javadsl/MongoFlow.scala +++ b/mongodb/src/main/scala/akka/stream/alpakka/mongodb/javadsl/MongoFlow.scala @@ -19,7 +19,7 @@ import com.mongodb.client.result.{DeleteResult, UpdateResult} import com.mongodb.reactivestreams.client.MongoCollection import org.bson.conversions.Bson -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object MongoFlow { diff --git a/mongodb/src/main/scala/akka/stream/alpakka/mongodb/scaladsl/MongoFlow.scala b/mongodb/src/main/scala/akka/stream/alpakka/mongodb/scaladsl/MongoFlow.scala index 946afcf688..6795f6e496 100644 --- a/mongodb/src/main/scala/akka/stream/alpakka/mongodb/scaladsl/MongoFlow.scala +++ b/mongodb/src/main/scala/akka/stream/alpakka/mongodb/scaladsl/MongoFlow.scala @@ -13,7 +13,7 @@ import com.mongodb.client.result.{DeleteResult, UpdateResult} import com.mongodb.reactivestreams.client.MongoCollection import org.bson.conversions.Bson -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object MongoFlow { diff --git a/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala b/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala index 635831d8fb..74ea315602 100644 --- a/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala +++ b/mongodb/src/test/scala/docs/scaladsl/MongoSinkSpec.scala @@ -19,7 +19,7 @@ import org.mongodb.scala.bson.codecs.Macros._ import org.scalatest._ import org.scalatest.concurrent.ScalaFutures -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.duration._ import org.scalatest.matchers.must.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala b/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala index 2a9741c4a8..4206433953 100644 --- a/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala +++ b/mongodb/src/test/scala/docs/scaladsl/MongoSourceSpec.scala @@ -15,7 +15,7 @@ import org.bson.Document import org.scalatest._ import org.scalatest.concurrent.ScalaFutures -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable.Seq import scala.concurrent._ import scala.concurrent.duration._ diff --git a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/model.scala b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/model.scala index 13028a12e9..d0ae342527 100644 --- a/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/model.scala +++ b/mqtt-streaming/src/main/scala/akka/stream/alpakka/mqtt/streaming/model.scala @@ -16,7 +16,7 @@ import akka.util.{ByteIterator, ByteString, ByteStringBuilder} import scala.annotation.tailrec import scala.concurrent.duration._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ import scala.concurrent.{ExecutionContext, Promise} diff --git a/mqtt/src/main/scala/akka/stream/alpakka/mqtt/settings.scala b/mqtt/src/main/scala/akka/stream/alpakka/mqtt/settings.scala index 4254e5ff86..0d8524c712 100644 --- a/mqtt/src/main/scala/akka/stream/alpakka/mqtt/settings.scala +++ b/mqtt/src/main/scala/akka/stream/alpakka/mqtt/settings.scala @@ -7,7 +7,7 @@ package akka.stream.alpakka.mqtt import akka.util.JavaDurationConverters._ import org.eclipse.paho.client.mqttv3.{MqttClientPersistence, MqttConnectOptions} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.collection.immutable.Map import scala.concurrent.duration.{FiniteDuration, _} diff --git a/orientdb/src/main/scala/akka/stream/alpakka/orientdb/impl/OrientDbSourceStage.scala b/orientdb/src/main/scala/akka/stream/alpakka/orientdb/impl/OrientDbSourceStage.scala index 7c14e7bedc..e6d1197db8 100644 --- a/orientdb/src/main/scala/akka/stream/alpakka/orientdb/impl/OrientDbSourceStage.scala +++ b/orientdb/src/main/scala/akka/stream/alpakka/orientdb/impl/OrientDbSourceStage.scala @@ -14,7 +14,7 @@ import com.orientechnologies.orient.`object`.db.OObjectDatabaseTx import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * INTERNAL API diff --git a/orientdb/src/main/scala/akka/stream/alpakka/orientdb/javadsl/OrientDbFlow.scala b/orientdb/src/main/scala/akka/stream/alpakka/orientdb/javadsl/OrientDbFlow.scala index 13902f8d9e..feac3f4a7c 100644 --- a/orientdb/src/main/scala/akka/stream/alpakka/orientdb/javadsl/OrientDbFlow.scala +++ b/orientdb/src/main/scala/akka/stream/alpakka/orientdb/javadsl/OrientDbFlow.scala @@ -9,7 +9,7 @@ import akka.stream.alpakka.orientdb._ import akka.stream.javadsl.Flow import com.orientechnologies.orient.core.record.impl.ODocument -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Java API. diff --git a/reference/src/main/scala/akka/stream/alpakka/reference/model.scala b/reference/src/main/scala/akka/stream/alpakka/reference/model.scala index f635c99201..00f0e20bb9 100644 --- a/reference/src/main/scala/akka/stream/alpakka/reference/model.scala +++ b/reference/src/main/scala/akka/stream/alpakka/reference/model.scala @@ -10,7 +10,7 @@ import akka.annotation.InternalApi import akka.util.ByteString import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ import scala.util.{Success, Try} diff --git a/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala b/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala index 95a5cf63cb..6060a67659 100644 --- a/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala +++ b/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala @@ -8,7 +8,7 @@ import akka.stream.alpakka.reference.{ReferenceReadResult, ReferenceWriteMessage import akka.util.ByteString import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.util.{Failure, Success, Try} @ApiMayChange diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/S3Headers.scala b/s3/src/main/scala/akka/stream/alpakka/s3/S3Headers.scala index 2a340c25eb..aba85da44c 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/S3Headers.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/S3Headers.scala @@ -13,7 +13,7 @@ import akka.stream.alpakka.s3.headers.{CannedAcl, ServerSideEncryption, StorageC import akka.stream.alpakka.s3.impl.S3Request import scala.collection.immutable.Seq -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ final class MetaHeaders private (val metaHeaders: Map[String, String]) { diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/javadsl/S3.scala b/s3/src/main/scala/akka/stream/alpakka/s3/javadsl/S3.scala index 9628d3d249..9a698b27a4 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/javadsl/S3.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/javadsl/S3.scala @@ -20,7 +20,7 @@ import akka.stream.alpakka.s3.impl._ import akka.stream.javadsl.{RunnableGraph, Sink, Source} import akka.util.ByteString -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ import scala.compat.java8.FutureConverters._ diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/model.scala b/s3/src/main/scala/akka/stream/alpakka/s3/model.scala index 47c432f14a..6fd5e071b9 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/model.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/model.scala @@ -13,7 +13,7 @@ import akka.stream.alpakka.s3.AccessStyle.PathAccessStyle import scala.annotation.nowarn import scala.collection.immutable.Seq import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ final class MultipartUpload private (val bucket: String, val key: String, val uploadId: String) { diff --git a/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3ExtSpec.scala b/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3ExtSpec.scala index 2b81c956fc..b2c5251900 100644 --- a/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3ExtSpec.scala +++ b/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3ExtSpec.scala @@ -11,7 +11,7 @@ import com.typesafe.config.ConfigFactory import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.matchers.should.Matchers -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ class S3ExtSpec extends AnyFlatSpecLike with Matchers { it should "reuse application config from actor system" in { diff --git a/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3IntegrationSpec.scala b/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3IntegrationSpec.scala index 4c5a6103b2..ac2caf1cf9 100644 --- a/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3IntegrationSpec.scala +++ b/s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3IntegrationSpec.scala @@ -30,7 +30,7 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{Await, ExecutionContext, Future} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ trait S3IntegrationSpec extends AnyFlatSpecLike diff --git a/solr/src/main/scala/akka/stream/alpakka/solr/SolrMessages.scala b/solr/src/main/scala/akka/stream/alpakka/solr/SolrMessages.scala index d91c9b26a7..f17ea9fd2f 100644 --- a/solr/src/main/scala/akka/stream/alpakka/solr/SolrMessages.scala +++ b/solr/src/main/scala/akka/stream/alpakka/solr/SolrMessages.scala @@ -7,7 +7,7 @@ package akka.stream.alpakka.solr import akka.NotUsed import akka.annotation.InternalApi -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object WriteMessage { def createUpsertMessage[T](source: T): WriteMessage[T, NotUsed] = diff --git a/solr/src/main/scala/akka/stream/alpakka/solr/impl/SolrFlowStage.scala b/solr/src/main/scala/akka/stream/alpakka/solr/impl/SolrFlowStage.scala index 0a637d8a70..b44de4ea11 100644 --- a/solr/src/main/scala/akka/stream/alpakka/solr/impl/SolrFlowStage.scala +++ b/solr/src/main/scala/akka/stream/alpakka/solr/impl/SolrFlowStage.scala @@ -19,7 +19,7 @@ import scala.annotation.tailrec import scala.util.control.NonFatal import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Internal API diff --git a/solr/src/main/scala/akka/stream/alpakka/solr/javadsl/SolrFlow.scala b/solr/src/main/scala/akka/stream/alpakka/solr/javadsl/SolrFlow.scala index 5b12c22a75..e6d6f9f049 100644 --- a/solr/src/main/scala/akka/stream/alpakka/solr/javadsl/SolrFlow.scala +++ b/solr/src/main/scala/akka/stream/alpakka/solr/javadsl/SolrFlow.scala @@ -13,7 +13,7 @@ import akka.stream.scaladsl.Flow import org.apache.solr.client.solrj.SolrClient import org.apache.solr.common.SolrInputDocument -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable /** diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/SqsSourceSettings.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/SqsSourceSettings.scala index 0545a131f5..e46792bab5 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/SqsSourceSettings.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/SqsSourceSettings.scala @@ -9,7 +9,7 @@ import java.time.temporal.ChronoUnit import software.amazon.awssdk.services.sqs.model import scala.collection.immutable -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.duration.FiniteDuration final class SqsSourceSettings private ( diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishFlow.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishFlow.scala index a6ce6d5a38..9c33eeeb77 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishFlow.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishFlow.scala @@ -18,7 +18,7 @@ import akka.stream.scaladsl.{Flow => SFlow} import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.SendMessageRequest -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ /** * Java API to create SQS flows. diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishSink.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishSink.scala index 5d1500c7b4..2b16ddacfa 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishSink.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/javadsl/SqsPublishSink.scala @@ -13,7 +13,7 @@ import akka.stream.scaladsl.{Flow, Keep} import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.SendMessageRequest -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters.FutureOps /** diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsAckFlow.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsAckFlow.scala index 7744b92b08..31ec9273db 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsAckFlow.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsAckFlow.scala @@ -18,7 +18,7 @@ import akka.stream.scaladsl.{Flow, GraphDSL, Merge, Partition} import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.compat.java8.FutureConverters._ import scala.concurrent.Future diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsPublishFlow.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsPublishFlow.scala index b408a0e5f6..d779939986 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsPublishFlow.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsPublishFlow.scala @@ -14,7 +14,7 @@ import akka.stream.scaladsl.{Flow, Source} import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters._ /** diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala index 6f8d86a3be..ab74fa353b 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala @@ -12,7 +12,7 @@ import akka.stream.scaladsl.{Flow, Source} import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.FutureConverters._ /** diff --git a/sqs/src/test/scala/akka/stream/alpakka/sqs/scaladsl/DefaultTestContext.scala b/sqs/src/test/scala/akka/stream/alpakka/sqs/scaladsl/DefaultTestContext.scala index 4b8575ba3d..70e33620e5 100644 --- a/sqs/src/test/scala/akka/stream/alpakka/sqs/scaladsl/DefaultTestContext.scala +++ b/sqs/src/test/scala/akka/stream/alpakka/sqs/scaladsl/DefaultTestContext.scala @@ -22,7 +22,7 @@ import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.CreateQueueRequest //#init-client -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.duration._ import scala.util.Random diff --git a/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala index 590c2b625f..f5f94d565a 100644 --- a/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala +++ b/sqs/src/test/scala/docs/scaladsl/SqsAckSpec.scala @@ -22,7 +22,7 @@ import org.scalatestplus.mockito.MockitoSugar.mock import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model._ -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.duration._ class SqsAckSpec extends AnyFlatSpec with Matchers with DefaultTestContext with LogCapturing { diff --git a/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala index 418b789fe8..240a0fa673 100644 --- a/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala +++ b/sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala @@ -16,7 +16,7 @@ import org.scalatest.matchers.should.Matchers import software.amazon.awssdk.services.sqs.SqsAsyncClient import software.amazon.awssdk.services.sqs.model.{Message, ReceiveMessageRequest, SendMessageRequest} -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.concurrent.duration._ class SqsPublishSpec extends AnyFlatSpec with Matchers with DefaultTestContext with LogCapturing { diff --git a/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala b/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala index ea0b042f9d..ae340b84cc 100644 --- a/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala +++ b/sqs/src/test/scala/docs/scaladsl/SqsSourceSpec.scala @@ -29,7 +29,7 @@ import software.amazon.awssdk.services.sqs.model.{ SendMessageRequest } -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.Future import scala.concurrent.duration._ diff --git a/testkit/src/main/scala/akka/stream/alpakka/testkit/CapturingAppender.scala b/testkit/src/main/scala/akka/stream/alpakka/testkit/CapturingAppender.scala index 47ab1ce0af..02192edd13 100644 --- a/testkit/src/main/scala/akka/stream/alpakka/testkit/CapturingAppender.scala +++ b/testkit/src/main/scala/akka/stream/alpakka/testkit/CapturingAppender.scala @@ -90,7 +90,7 @@ import org.slf4j.LoggerFactory * Also clears the buffer.. */ def flush(sourceActorSystem: Option[String]): Unit = synchronized { - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val logbackLogger = getLogbackLogger(classOf[CapturingAppender].getName + "Delegate") val appenders = logbackLogger.iteratorForAppenders().asScala.filterNot(_ == this).toList for (event <- buffer; appender <- appenders) { diff --git a/text/src/test/scala/akka/stream/alpakka/text/scaladsl/CharsetCodingFlowsSpec.scala b/text/src/test/scala/akka/stream/alpakka/text/scaladsl/CharsetCodingFlowsSpec.scala index e728c8c450..ce46a84f68 100644 --- a/text/src/test/scala/akka/stream/alpakka/text/scaladsl/CharsetCodingFlowsSpec.scala +++ b/text/src/test/scala/akka/stream/alpakka/text/scaladsl/CharsetCodingFlowsSpec.scala @@ -65,7 +65,7 @@ class CharsetCodingFlowsSpec import akka.stream.scaladsl.FileIO // #encoding - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val targetFile = Paths.get("target/outdata.txt") val strings = System.getProperties.asScala.map(p => p._1 + " -> " + p._2).toList val stringSource: Source[String, _] = Source(strings) diff --git a/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala b/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala index 9c844ececd..7b0cb2f469 100644 --- a/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala +++ b/text/src/test/scala/docs/scaladsl/CharsetCodingFlowsDoc.scala @@ -42,7 +42,7 @@ class CharsetCodingFlowsDoc import akka.stream.scaladsl.FileIO // #encoding - import scala.jdk.CollectionConverters._ + import scala.collection.JavaConverters._ val targetFile = Paths.get("target/outdata.txt") val strings = System.getProperties.asScala.map(p => p._1 + " -> " + p._2).toList // #encoding diff --git a/xml/src/main/scala/akka/stream/alpakka/xml/javadsl/XmlParsing.scala b/xml/src/main/scala/akka/stream/alpakka/xml/javadsl/XmlParsing.scala index be34815d45..85826fc6ec 100644 --- a/xml/src/main/scala/akka/stream/alpakka/xml/javadsl/XmlParsing.scala +++ b/xml/src/main/scala/akka/stream/alpakka/xml/javadsl/XmlParsing.scala @@ -13,7 +13,7 @@ import org.w3c.dom.Element import java.util.function.Consumer -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object XmlParsing { diff --git a/xml/src/main/scala/akka/stream/alpakka/xml/model.scala b/xml/src/main/scala/akka/stream/alpakka/xml/model.scala index cb0fdbf194..e1983546f5 100644 --- a/xml/src/main/scala/akka/stream/alpakka/xml/model.scala +++ b/xml/src/main/scala/akka/stream/alpakka/xml/model.scala @@ -6,7 +6,7 @@ package akka.stream.alpakka.xml import java.util.Optional -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ import scala.compat.java8.OptionConverters._ /** From 0e923db7ee8eebf51ae04a77665113f1ccebeb45 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 17:08:07 +0200 Subject: [PATCH 3/6] LazyList --- file/src/test/scala/docs/scaladsl/ExecutableUtils.scala | 6 ++++-- .../akka/stream/alpakka/kinesis/KinesisFlowSpec.scala | 8 +++++--- .../scala/akka/stream/alpakka/s3/impl/S3Stream.scala | 9 ++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/file/src/test/scala/docs/scaladsl/ExecutableUtils.scala b/file/src/test/scala/docs/scaladsl/ExecutableUtils.scala index eccb7bd175..89651d7fae 100644 --- a/file/src/test/scala/docs/scaladsl/ExecutableUtils.scala +++ b/file/src/test/scala/docs/scaladsl/ExecutableUtils.scala @@ -7,8 +7,9 @@ package docs.scaladsl import java.io.{BufferedInputStream, InputStream, OutputStream, File => JavaFile} import java.nio.file.{Files, Path, Paths} -import akka.util.ByteString +import scala.annotation.nowarn +import akka.util.ByteString import scala.concurrent.Future import scala.sys.process.{BasicIO, Process} @@ -48,9 +49,10 @@ object ExecutableUtils { finally stream.close() } + @nowarn("msg=deprecated") // Stream => LazyList private def readStream(stream: InputStream): ByteString = { val reader = new BufferedInputStream(stream) - try ByteString(LazyList.continually(reader.read).takeWhile(_ != -1).map(_.toByte).toArray) + try ByteString(Stream.continually(reader.read).takeWhile(_ != -1).map(_.toByte).toArray) finally reader.close() } diff --git a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala index 0de72e1355..3c3814419e 100644 --- a/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala +++ b/kinesis/src/test/scala/akka/stream/alpakka/kinesis/KinesisFlowSpec.scala @@ -6,6 +6,8 @@ package akka.stream.alpakka.kinesis import java.util.concurrent.CompletableFuture +import scala.annotation.nowarn + import akka.stream.alpakka.kinesis.KinesisErrors.FailurePublishingRecords import akka.stream.alpakka.kinesis.scaladsl.KinesisFlow import akka.stream.alpakka.testkit.scaladsl.LogCapturing @@ -21,7 +23,6 @@ import org.scalatest.wordspec.AnyWordSpec import org.scalatest.matchers.should.Matchers import software.amazon.awssdk.core.SdkBytes import software.amazon.awssdk.services.kinesis.model._ - import scala.collection.JavaConverters._ class KinesisFlowSpec extends AnyWordSpec with Matchers with KinesisMock with LogCapturing { @@ -92,9 +93,10 @@ class KinesisFlowSpec extends AnyWordSpec with Matchers with KinesisMock with Lo .run() } + @nowarn("msg=deprecated") // Stream => Stream trait KinesisFlowWithContextProbe { self: Settings => val streamName = "stream-name" - val recordStream = LazyList + val recordStream = Stream .from(1) .map( i => @@ -105,7 +107,7 @@ class KinesisFlowSpec extends AnyWordSpec with Matchers with KinesisMock with Lo .build(), i) ) - val resultStream = LazyList + val resultStream = Stream .from(1) .map(i => (PutRecordsResultEntry.builder().build(), i)) diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala b/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala index 8285aeb7be..7e9e8f928c 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala @@ -7,6 +7,8 @@ package akka.stream.alpakka.s3.impl import java.net.InetSocketAddress import java.time.{Instant, ZoneOffset, ZonedDateTime} +import scala.annotation.nowarn + import akka.actor.ActorSystem import akka.annotation.InternalApi import akka.dispatch.ExecutionContexts @@ -25,7 +27,6 @@ import akka.stream.{Attributes, Materializer} import akka.util.ByteString import akka.{Done, NotUsed} import software.amazon.awssdk.regions.Region - import scala.collection.immutable import scala.concurrent.{Future, Promise} import scala.util.{Failure, Success, Try} @@ -1058,13 +1059,14 @@ import scala.util.{Failure, Success, Try} /** * Initiates a multipart upload. Returns a source of the initiated upload with upload part indicess */ + @nowarn("msg=deprecated") // Stream => LazyList private def initiateUpload(s3Location: S3Location, contentType: ContentType, s3Headers: Seq[HttpHeader]): Source[(MultipartUpload, Int), NotUsed] = Source .single(s3Location) .flatMapConcat(initiateMultipartUpload(_, contentType, s3Headers)) - .mapConcat(r => LazyList.continually(r)) + .mapConcat(r => Stream.continually(r)) .zip(Source.fromIterator(() => Iterator.from(1))) private def poolSettings(implicit settings: S3Settings, system: ActorSystem) = @@ -1312,6 +1314,7 @@ import scala.util.{Failure, Success, Try} .mapMaterializedValue(_ => NotUsed) } + @nowarn("msg=deprecated") // Stream => LazyList private def requestInfoOrUploadState(s3Location: S3Location, contentType: ContentType, s3Headers: S3Headers, @@ -1323,7 +1326,7 @@ import scala.util.{Failure, Success, Try} Source .single(s3Location) .flatMapConcat(_ => Source.single(MultipartUpload(s3Location.bucket, s3Location.key, uploadId))) - .mapConcat(r => LazyList.continually(r)) + .mapConcat(r => Stream.continually(r)) .zip(Source.fromIterator(() => Iterator.from(initialIndex))) case None => // First step of the multi part upload process is made. From b7d4ec4e5b57ba1015170a67eb33ff62ac81ce56 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 17:10:48 +0200 Subject: [PATCH 4/6] view.mapValues --- csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala | 2 +- .../src/main/scala/akka/stream/alpakka/reference/model.scala | 2 +- .../akka/stream/alpakka/reference/testkit/MessageFactory.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala b/csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala index 230460345a..a7af7b0e4b 100644 --- a/csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala +++ b/csv/src/test/scala/docs/scaladsl/CsvParsingSpec.scala @@ -180,7 +180,7 @@ class CsvParsingSpec extends CsvSpec { .fromPath(Paths.get("csv/src/test/resources/correctness.csv")) .via(CsvParsing.lineScanner()) .via(CsvToMap.toMap()) - .map(_.view.mapValues(_.utf8String).toIndexedSeq) + .map(_.iterator.map { case (k, v) => k -> v.utf8String }.toIndexedSeq) .runWith(Sink.seq) val res = fut.futureValue res(0) should contain allElementsOf ( diff --git a/reference/src/main/scala/akka/stream/alpakka/reference/model.scala b/reference/src/main/scala/akka/stream/alpakka/reference/model.scala index 00f0e20bb9..2eff177d5e 100644 --- a/reference/src/main/scala/akka/stream/alpakka/reference/model.scala +++ b/reference/src/main/scala/akka/stream/alpakka/reference/model.scala @@ -88,7 +88,7 @@ final class ReferenceWriteMessage private ( * Java setter needs to take Java Long class and convert to Scala Long. */ def withMetrics(metrics: java.util.Map[String, java.lang.Long]): ReferenceWriteMessage = - copy(metrics = metrics.asScala.view.mapValues(Long.unbox).toMap) + copy(metrics = metrics.asScala.iterator.map { case (k, v) => k -> Long.unbox(v) }.toMap) /** * Java API diff --git a/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala b/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala index 6060a67659..0d7c97308d 100644 --- a/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala +++ b/reference/src/main/scala/akka/stream/alpakka/reference/testkit/MessageFactory.scala @@ -43,6 +43,6 @@ object MessageFactory { def createWriteResult(message: ReferenceWriteMessage, metrics: java.util.Map[String, java.lang.Long], status: Int): ReferenceWriteResult = - new ReferenceWriteResult(message, metrics.asScala.view.mapValues(Long.unbox).toMap, status) + new ReferenceWriteResult(message, metrics.asScala.iterator.map { case (k, v) => k -> Long.unbox(v) }.toMap, status) } From 9a28797d97651d122faa8969941546493debc039 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 17:46:38 +0200 Subject: [PATCH 5/6] double nowarn --- .../src/test/scala/docs/scaladsl/GoogleCommonDoc.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-common/src/test/scala/docs/scaladsl/GoogleCommonDoc.scala b/google-common/src/test/scala/docs/scaladsl/GoogleCommonDoc.scala index efa81fb31a..a6a206951f 100644 --- a/google-common/src/test/scala/docs/scaladsl/GoogleCommonDoc.scala +++ b/google-common/src/test/scala/docs/scaladsl/GoogleCommonDoc.scala @@ -11,8 +11,7 @@ import akka.stream.scaladsl.Source import scala.annotation.nowarn -@nowarn("msg=never used") -@nowarn("msg=dead code") +@nowarn class GoogleCommonDoc { implicit val system: ActorSystem = ??? From 1584bd5ac58c4f0066dfd9e8e11efb6163380d3e Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 20 Sep 2022 17:47:21 +0200 Subject: [PATCH 6/6] immutable.Seq --- .../stream/alpakka/s3/impl/S3Stream.scala | 71 +++++++++++-------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala b/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala index 7e9e8f928c..97f16fe118 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/impl/S3Stream.scala @@ -48,13 +48,15 @@ import scala.util.{Failure, Success, Try} versionId: Option[String] = None) /** Internal Api */ -@InternalApi private[impl] final case class ListBucketsResult(buckets: Seq[ListBucketsResultContents]) +@InternalApi private[impl] final case class ListBucketsResult(buckets: immutable.Seq[ListBucketsResultContents]) /** Internal Api */ -@InternalApi private[impl] final case class ListBucketResult(isTruncated: Boolean, - continuationToken: Option[String], - contents: Seq[ListBucketResultContents], - commonPrefixes: Seq[ListBucketResultCommonPrefixes]) +@InternalApi private[impl] final case class ListBucketResult( + isTruncated: Boolean, + continuationToken: Option[String], + contents: immutable.Seq[ListBucketResultContents], + commonPrefixes: immutable.Seq[ListBucketResultCommonPrefixes] +) /** Internal Api */ @InternalApi private[impl] final case class ListMultipartUploadContinuationToken(nextKeyMarker: Option[String], @@ -70,8 +72,8 @@ import scala.util.{Failure, Success, Try} delimiter: Option[String], maxUploads: Int, isTruncated: Boolean, - uploads: Seq[ListMultipartUploadResultUploads], - commonPrefixes: Seq[CommonPrefixes] + uploads: immutable.Seq[ListMultipartUploadResultUploads], + commonPrefixes: immutable.Seq[CommonPrefixes] ) { /** @@ -103,9 +105,9 @@ import scala.util.{Failure, Success, Try} delimiter: Option[String], maxKeys: Int, isTruncated: Boolean, - versions: Seq[ListObjectVersionsResultVersions], - commonPrefixes: Seq[CommonPrefixes], - deleteMarkers: Seq[DeleteMarkers] + versions: immutable.Seq[ListObjectVersionsResultVersions], + commonPrefixes: immutable.Seq[CommonPrefixes], + deleteMarkers: immutable.Seq[DeleteMarkers] ) { /** @@ -128,7 +130,7 @@ import scala.util.{Failure, Success, Try} nextPartNumberMarker: Option[Int], maxParts: Int, isTruncated: Boolean, - parts: Seq[ListPartsResultParts], + parts: immutable.Seq[ListPartsResultParts], initiator: Option[AWSIdentity], owner: Option[AWSIdentity], storageClass: String) { @@ -284,7 +286,7 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListBucketState, Seq[ListBucketResultContents]](Starting()) { + .unfoldAsync[ListBucketState, immutable.Seq[ListBucketResultContents]](Starting()) { case Finished() => Future.successful(None) case Starting() => listBucketCallOnlyContents(None) case Running(token) => listBucketCallOnlyContents(Some(token)) @@ -314,7 +316,8 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListBucketState, (Seq[ListBucketResultContents], Seq[ListBucketResultCommonPrefixes])]( + .unfoldAsync[ListBucketState, + (immutable.Seq[ListBucketResultContents], immutable.Seq[ListBucketResultCommonPrefixes])]( Starting() ) { case Finished() => Future.successful(None) @@ -391,7 +394,8 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListMultipartUploadState, (Seq[ListMultipartUploadResultUploads], Seq[CommonPrefixes])]( + .unfoldAsync[ListMultipartUploadState, + (immutable.Seq[ListMultipartUploadResultUploads], immutable.Seq[CommonPrefixes])]( Starting() ) { case Finished() => Future.successful(None) @@ -416,7 +420,7 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListMultipartUploadState, Seq[ListMultipartUploadResultUploads]](Starting()) { + .unfoldAsync[ListMultipartUploadState, immutable.Seq[ListMultipartUploadResultUploads]](Starting()) { case Finished() => Future.successful(None) case Starting() => listMultipartUploadCallOnlyUploads(None) case Running(token) => listMultipartUploadCallOnlyUploads(Some(token)) @@ -466,7 +470,7 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListPartsState, Seq[ListPartsResultParts]](Starting()) { + .unfoldAsync[ListPartsState, immutable.Seq[ListPartsResultParts]](Starting()) { case Finished() => Future.successful(None) case Starting() => listMultipartUploadCallOnlyUploads(None) case Running(token) => listMultipartUploadCallOnlyUploads(Some(token)) @@ -532,7 +536,9 @@ import scala.util.{Failure, Success, Try} implicit val attributes: Attributes = attr Source .unfoldAsync[ListObjectVersionsState, - (Seq[ListObjectVersionsResultVersions], Seq[DeleteMarkers], Seq[CommonPrefixes])]( + (immutable.Seq[ListObjectVersionsResultVersions], + immutable.Seq[DeleteMarkers], + immutable.Seq[CommonPrefixes])]( Starting() ) { case Finished() => Future.successful(None) @@ -566,7 +572,8 @@ import scala.util.{Failure, Success, Try} implicit val materializer: Materializer = mat implicit val attributes: Attributes = attr Source - .unfoldAsync[ListObjectVersionsState, (Seq[ListObjectVersionsResultVersions], Seq[DeleteMarkers])](Starting()) { + .unfoldAsync[ListObjectVersionsState, + (immutable.Seq[ListObjectVersionsResultVersions], immutable.Seq[DeleteMarkers])](Starting()) { case Finished() => Future.successful(None) case Starting() => listObjectVersionsCallOnlyVersions(None) case Running(token) => listObjectVersionsCallOnlyVersions(Some(token)) @@ -697,7 +704,7 @@ import scala.util.{Failure, Success, Try} method: HttpMethod = HttpMethods.GET, rangeOption: Option[ByteRange] = None, versionId: Option[String] = None, - s3Headers: Seq[HttpHeader] = Seq.empty): Source[HttpResponse, NotUsed] = + s3Headers: immutable.Seq[HttpHeader] = immutable.Seq.empty): Source[HttpResponse, NotUsed] = Source .fromMaterializer { (mat, attr) => issueRequest(s3Location, method, rangeOption, versionId, s3Headers)(mat, attr) @@ -709,7 +716,7 @@ import scala.util.{Failure, Success, Try} method: HttpMethod = HttpMethods.GET, rangeOption: Option[ByteRange] = None, versionId: Option[String], - s3Headers: Seq[HttpHeader] + s3Headers: immutable.Seq[HttpHeader] )(implicit mat: Materializer, attr: Attributes): Source[HttpResponse, NotUsed] = { implicit val sys: ActorSystem = mat.system implicit val conf: S3Settings = resolveSettings(attr, sys) @@ -801,7 +808,7 @@ import scala.util.{Failure, Success, Try} bucket: String, method: HttpMethod, httpRequest: (HttpMethod, S3Settings) => HttpRequest, - headers: Seq[HttpHeader], + headers: immutable.Seq[HttpHeader], process: (HttpResponse, Materializer) => Future[T], httpEntity: Option[Future[RequestEntity]] = None ): Source[T, NotUsed] = @@ -961,7 +968,7 @@ import scala.util.{Failure, Success, Try} private def initiateMultipartUpload(s3Location: S3Location, contentType: ContentType, - s3Headers: Seq[HttpHeader]): Source[MultipartUpload, NotUsed] = + s3Headers: immutable.Seq[HttpHeader]): Source[MultipartUpload, NotUsed] = Source .fromMaterializer { (mat, attr) => implicit val materializer: Materializer = mat @@ -1011,10 +1018,10 @@ import scala.util.{Failure, Success, Try} .toMat(completionSink(targetLocation, s3Headers))(Keep.right) } - private def computeMetaData(headers: Seq[HttpHeader], entity: ResponseEntity): ObjectMetadata = + private def computeMetaData(headers: immutable.Seq[HttpHeader], entity: ResponseEntity): ObjectMetadata = ObjectMetadata( headers ++ - Seq( + immutable.Seq( `Content-Length`(entity.contentLengthOption.getOrElse(0)), `Content-Type`(entity.contentType), CustomContentTypeHeader(entity.contentType) @@ -1033,12 +1040,14 @@ import scala.util.{Failure, Success, Try} override def renderInResponses(): Boolean = true } - private def completeMultipartUpload(s3Location: S3Location, parts: Seq[SuccessfulUploadPart], s3Headers: S3Headers)( + private def completeMultipartUpload(s3Location: S3Location, + parts: immutable.Seq[SuccessfulUploadPart], + s3Headers: S3Headers)( implicit mat: Materializer, attr: Attributes ): Future[CompleteMultipartUploadResult] = { def populateResult(result: CompleteMultipartUploadResult, - headers: Seq[HttpHeader]): CompleteMultipartUploadResult = { + headers: immutable.Seq[HttpHeader]): CompleteMultipartUploadResult = { val versionId = headers.find(_.lowercaseName() == "x-amz-version-id").map(_.value()) result.copy(versionId = versionId) } @@ -1062,7 +1071,7 @@ import scala.util.{Failure, Success, Try} @nowarn("msg=deprecated") // Stream => LazyList private def initiateUpload(s3Location: S3Location, contentType: ContentType, - s3Headers: Seq[HttpHeader]): Source[(MultipartUpload, Int), NotUsed] = + s3Headers: immutable.Seq[HttpHeader]): Source[(MultipartUpload, Int), NotUsed] = Source .single(s3Location) .flatMapConcat(initiateMultipartUpload(_, contentType, s3Headers)) @@ -1387,9 +1396,9 @@ import scala.util.{Failure, Success, Try} import mat.executionContext Sink .seq[UploadPartResponse] - .mapMaterializedValue { responseFuture: Future[Seq[UploadPartResponse]] => + .mapMaterializedValue { responseFuture: Future[immutable.Seq[UploadPartResponse]] => responseFuture - .flatMap { responses: Seq[UploadPartResponse] => + .flatMap { responses: immutable.Seq[UploadPartResponse] => val successes = responses.collect { case r: SuccessfulUploadPart => r } val failures = responses.collect { case r: FailedUploadPart => r } if (responses.isEmpty) { @@ -1420,7 +1429,7 @@ import scala.util.{Failure, Success, Try} private def signAndGetAs[T]( request: HttpRequest, - f: (T, Seq[HttpHeader]) => T + f: (T, immutable.Seq[HttpHeader]) => T )(implicit um: Unmarshaller[ResponseEntity, T], mat: Materializer, attr: Attributes): Source[T, NotUsed] = { import mat.executionContext implicit val sys: ActorSystem = mat.system @@ -1466,7 +1475,7 @@ import scala.util.{Failure, Success, Try} private def entityForSuccess( resp: HttpResponse - )(implicit mat: Materializer): Future[(ResponseEntity, Seq[HttpHeader])] = { + )(implicit mat: Materializer): Future[(ResponseEntity, immutable.Seq[HttpHeader])] = { resp match { case HttpResponse(status, headers, entity, _) if status.isSuccess() && !status.isRedirection() => Future.successful((entity, headers))