From 8254acc0e8c924b6bd223bbc5c18c7c0b1281d9c Mon Sep 17 00:00:00 2001 From: "He-Pin(kerr)" Date: Sat, 20 Sep 2025 01:12:16 +0800 Subject: [PATCH] chore: Remove ccompat.JavaConverters (#2234) --- .../actor/testkit/typed/LoggingEvent.scala | 5 +-- .../typed/internal/BehaviorTestKitImpl.scala | 2 +- .../typed/internal/CapturingAppender.scala | 2 +- .../typed/internal/LoggingTestKitImpl.scala | 2 +- .../typed/internal/StubbedActorContext.scala | 2 +- .../testkit/typed/internal/TestAppender.scala | 2 +- .../typed/internal/TestProbeImpl.scala | 2 +- .../testkit/typed/javadsl/TestInbox.scala | 2 +- .../pekko/actor/ActorSelectionSpec.scala | 4 +- .../apache/pekko/actor/ExtensionSpec.scala | 4 +- .../org/apache/pekko/actor/FSMActorSpec.scala | 2 +- .../pekko/actor/dispatch/ActorModelSpec.scala | 2 +- .../actor/dispatch/DispatchersSpec.scala | 4 +- .../pekko/event/LoggingReceiveSpec.scala | 2 +- .../pekko/io/dns/DockerBindDnsService.scala | 2 +- .../pekko/util/BoundedBlockingQueueSpec.scala | 2 +- .../apache/pekko/util/ByteStringSpec.scala | 2 +- .../org/apache/pekko/actor/typed/Props.scala | 2 +- .../actor/typed/internal/ExtensionsImpl.scala | 2 +- .../receptionist/ReceptionistMessages.scala | 2 +- .../pekko/actor/typed/javadsl/Behaviors.scala | 2 +- .../typed/receptionist/Receptionist.scala | 2 +- .../remove-scala-2.12-support.excludes | 3 ++ .../org/apache/pekko/actor/ActorPath.scala | 2 +- .../org/apache/pekko/actor/ActorSystem.scala | 2 +- .../pekko/actor/CoordinatedShutdown.scala | 4 +- .../org/apache/pekko/actor/Deployer.scala | 2 +- .../apache/pekko/actor/dungeon/Children.scala | 2 +- .../apache/pekko/dispatch/Dispatchers.scala | 4 +- .../org/apache/pekko/dispatch/Mailboxes.scala | 4 +- .../org/apache/pekko/event/Logging.scala | 8 ++-- .../main/scala/org/apache/pekko/io/Tcp.scala | 2 +- .../main/scala/org/apache/pekko/io/Udp.scala | 2 +- .../org/apache/pekko/io/UdpConnected.scala | 2 +- .../org/apache/pekko/io/dns/DnsProtocol.scala | 2 +- .../org/apache/pekko/io/dns/DnsSettings.scala | 2 +- .../io/dns/internal/ResolvConfParser.scala | 3 +- .../pattern/CircuitBreakersRegistry.scala | 2 +- .../internal/CircuitBreakerTelemetry.scala | 2 +- .../apache/pekko/routing/ConsistentHash.scala | 2 +- .../org/apache/pekko/routing/Router.scala | 2 +- .../apache/pekko/routing/RouterConfig.scala | 2 +- .../pekko/serialization/Serialization.scala | 2 +- .../serialization/SerializationSetup.scala | 2 +- .../scala/org/apache/pekko/util/Index.scala | 2 +- .../apache/pekko/util/ccompat/package.scala | 40 ------------------- .../scala/org/apache/pekko/BenchRunner.scala | 2 +- .../metrics/ClusterMetricsCollector.scala | 2 +- .../apache/pekko/cluster/metrics/Metric.scala | 2 +- .../metrics/protobuf/MessageSerializer.scala | 2 +- .../typed/ReplicatedEntityProvider.scala | 2 +- .../delivery/ShardingProducerController.scala | 4 +- .../ReplicatedShardingExtensionImpl.scala | 2 +- .../cluster/sharding/ClusterSharding.scala | 2 +- .../sharding/ClusterShardingHealthCheck.scala | 2 +- .../apache/pekko/cluster/sharding/Shard.scala | 2 +- .../cluster/sharding/ShardCoordinator.scala | 4 +- .../pekko/cluster/sharding/ShardRegion.scala | 14 +++---- .../sharding/external/ShardLocations.scala | 2 +- .../ExternalShardAllocationClientImpl.scala | 2 +- .../ClusterShardingMessageSerializer.scala | 2 +- .../simulator/SimulatorSettings.scala | 2 +- .../pekko/cluster/client/ClusterClient.scala | 2 +- .../ClusterClientMessageSerializer.scala | 2 +- .../pubsub/DistributedPubSubMediator.scala | 2 +- .../DistributedPubSubMessageSerializer.scala | 2 +- .../delivery/ReliableDeliverySerializer.scala | 2 +- .../org/apache/pekko/cluster/Cluster.scala | 2 +- .../apache/pekko/cluster/ClusterEvent.scala | 2 +- .../pekko/cluster/ClusterSettings.scala | 8 ++-- .../org/apache/pekko/cluster/ConfigUtil.scala | 4 +- .../cluster/JoinConfigCompatChecker.scala | 2 +- .../org/apache/pekko/cluster/Member.scala | 2 +- .../protobuf/ClusterMessageSerializer.scala | 2 +- .../cluster/routing/ClusterRouterConfig.scala | 2 +- .../org/apache/pekko/cluster/StressSpec.scala | 2 +- .../pekko/coordination/lease/TestLease.scala | 2 +- .../pekko/discovery/ServiceDiscovery.scala | 2 +- .../aggregate/AggregateServiceDiscovery.scala | 2 +- .../config/ConfigServiceDiscovery.scala | 2 +- .../org/apache/pekko/cluster/ddata/GSet.scala | 2 +- .../org/apache/pekko/cluster/ddata/GSet.scala | 2 +- .../pekko/cluster/ddata/DurableStore.scala | 4 +- .../apache/pekko/cluster/ddata/LWWMap.scala | 2 +- .../apache/pekko/cluster/ddata/ORMap.scala | 2 +- .../pekko/cluster/ddata/ORMultiMap.scala | 4 +- .../apache/pekko/cluster/ddata/ORSet.scala | 2 +- .../pekko/cluster/ddata/PNCounterMap.scala | 2 +- .../pekko/cluster/ddata/Replicator.scala | 6 +-- .../protobuf/ReplicatedDataSerializer.scala | 2 +- .../ReplicatorMessageSerializer.scala | 2 +- .../ddata/protobuf/SerializationSupport.scala | 2 +- .../docs/ddata/DistributedDataDocSpec.scala | 2 +- .../protobuf/TwoPhaseSetSerializer.scala | 2 +- .../scala/docs/io/ScalaUdpMulticastSpec.scala | 2 +- .../query/PersistenceQueryDocSpec.scala | 2 +- .../scala/docs/routing/RouterDocSpec.scala | 2 +- .../pekko/remote/testkit/MultiNodeSpec.scala | 4 +- .../osgi/BundleDelegatingClassLoader.scala | 2 +- .../apache/pekko/osgi/PojoSRTestSupport.scala | 2 +- .../pekko/persistence/query/Offset.scala | 2 +- .../query/journal/leveldb/Buffer.scala | 2 +- .../persistence/testkit/EventStorage.scala | 2 +- .../testkit/PersistenceTestKitPlugin.scala | 6 +-- .../javadsl/EventSourcedBehaviorTestKit.scala | 2 +- .../testkit/javadsl/PersistenceTestKit.scala | 2 +- .../testkit/javadsl/SnapshotTestKit.scala | 2 +- .../PersistenceTestKitReadJournal.scala | 2 +- .../PersistenceTestKitDurableStateStore.scala | 2 +- .../persistence/testkit/CommonUtils.scala | 2 +- .../testkit/javadsl/CommonSnapshotTests.scala | 2 +- .../testkit/javadsl/CommonTestKitTests.scala | 2 +- .../persistence/typed/EventAdapter.scala | 2 +- .../pekko/persistence/typed/crdt/ORSet.scala | 6 +-- .../typed/internal/ReplicationSetup.scala | 2 +- .../persistence/typed/javadsl/Effect.scala | 2 +- .../typed/javadsl/EventSourcedBehavior.scala | 2 +- .../javadsl/ReplicatedEventSourcing.scala | 2 +- .../ReplicatedEventSourcingSerializer.scala | 2 +- .../persistence/AtLeastOnceDelivery.scala | 4 +- .../pekko/persistence/Persistence.scala | 2 +- .../persistence/journal/EventAdapters.scala | 4 +- .../pekko/persistence/journal/Tagged.scala | 3 +- .../journal/japi/AsyncWriteJournal.scala | 2 +- .../journal/leveldb/LeveldbStore.scala | 2 +- .../serialization/MessageSerializer.scala | 4 +- .../pekko/remote/artery/TestMessage.scala | 2 +- .../apache/pekko/remote/RemoteDaemon.scala | 2 +- .../apache/pekko/remote/RemoteDeployer.scala | 2 +- .../apache/pekko/remote/RemoteSettings.scala | 2 +- .../pekko/remote/RemotingLifecycleEvent.scala | 2 +- .../pekko/remote/artery/ArterySettings.scala | 2 +- .../remote/artery/RemoteInstrument.scala | 2 +- .../artery/compress/CompressionTable.scala | 4 +- .../artery/compress/InboundCompressions.scala | 2 +- .../artery/tcp/ssl/SSLEngineConfig.scala | 2 +- .../remote/artery/tcp/ssl/X509Readers.scala | 2 +- .../remote/routing/RemoteRouterConfig.scala | 2 +- .../ArteryMessageSerializer.scala | 2 +- .../DaemonMsgCreateSerializer.scala | 4 +- .../MessageContainerSerializer.scala | 2 +- .../serialization/MiscMessageSerializer.scala | 2 +- .../serialization/ProtobufSerializer.scala | 2 +- .../serialization/ThrowableSupport.scala | 2 +- .../remote/transport/PekkoPduCodec.scala | 2 +- .../transport/netty/NettySSLSupport.scala | 3 +- .../transport/netty/NettyTransport.scala | 2 +- .../apache/pekko/remote/DaemonicSpec.scala | 2 +- .../artery/tcp/ssl/TlsResourcesSpec.scala | 2 +- .../remote/classic/RemoteInitErrorSpec.scala | 2 +- .../jackson/JacksonObjectMapperProvider.scala | 6 +-- .../jackson/JacksonSerializer.scala | 4 +- .../pekko/stream/testkit/StreamTestKit.scala | 2 +- .../pekko/stream/javadsl/CollectionUtil.scala | 2 +- .../pekko/stream/javadsl/CollectionUtil.scala | 2 +- .../org/apache/pekko/stream/Attributes.scala | 2 +- .../scala/org/apache/pekko/stream/Shape.scala | 2 +- .../pekko/stream/UniformFanInShape.scala | 2 +- .../org/apache/pekko/stream/impl/Sinks.scala | 4 +- .../stream/impl/fusing/FlattenConcat.scala | 2 +- .../stream/impl/fusing/StreamOfStreams.scala | 2 +- .../stream/impl/io/FileOutputStage.scala | 2 +- .../apache/pekko/stream/javadsl/FileIO.scala | 2 +- .../apache/pekko/stream/javadsl/Flow.scala | 2 +- .../stream/javadsl/FlowWithContext.scala | 2 +- .../apache/pekko/stream/javadsl/Graph.scala | 4 +- .../pekko/stream/javadsl/MergeLatest.scala | 2 +- .../apache/pekko/stream/javadsl/Sink.scala | 8 ++-- .../apache/pekko/stream/javadsl/Source.scala | 4 +- .../stream/javadsl/SourceWithContext.scala | 2 +- .../apache/pekko/stream/javadsl/SubFlow.scala | 2 +- .../pekko/stream/javadsl/SubSource.scala | 2 +- .../apache/pekko/stream/scaladsl/Sink.scala | 4 +- .../StatefulMapConcatAccumulator.scala | 6 +-- .../pekko/stream/stage/GraphStage.scala | 6 +-- .../ExplicitlyTriggeredScheduler.scala | 2 +- .../org/apache/pekko/testkit/TestKit.scala | 2 +- .../pekko/testkit/javadsl/TestKit.scala | 2 +- .../org/apache/pekko/testkit/PekkoSpec.scala | 2 +- .../apache/pekko/testkit/PekkoSpecSpec.scala | 2 +- .../metrics/FileDescriptorMetricSet.scala | 2 +- .../pekko/testkit/metrics/MetricsKit.scala | 6 +-- .../pekko/testkit/metrics/MetricsKitOps.scala | 2 +- .../reporter/PekkoConsoleReporter.scala | 2 +- 184 files changed, 237 insertions(+), 278 deletions(-) delete mode 100644 actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala index cb893fdb91..6fd5c79ad8 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala @@ -18,8 +18,7 @@ import java.util.Optional import org.slf4j.Marker import org.slf4j.event.Level -import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ object LoggingEvent { @@ -81,7 +80,7 @@ final case class LoggingEvent( * Java API */ def getMdc: java.util.Map[String, String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ mdc.asJava } diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala index c2ce9f96fa..0b5e0e7027 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala @@ -29,7 +29,7 @@ import pekko.actor.typed.{ ActorRef, Behavior, BehaviorInterceptor, PostStop, Si import pekko.actor.typed.receptionist.Receptionist import pekko.actor.typed.scaladsl.Behaviors import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala index 23130b6083..5afa793ace 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala @@ -81,7 +81,7 @@ import pekko.annotation.InternalApi * Also clears the buffer.. */ def flush(): Unit = synchronized { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val logbackLogger = getLogbackLogger(classOf[CapturingAppender].getName + "Delegate") val appenders = logbackLogger.iteratorForAppenders().asScala.filterNot(_ == this).toList for (event <- buffer; appender <- appenders) { diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala index 06e4499665..0c4b5568e6 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala @@ -156,7 +156,7 @@ import pekko.testkit.TestKit copy(mdc = newMdc) override def withMdc(newMdc: java.util.Map[String, String]): javadsl.LoggingTestKit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ withMdc(newMdc.asScala.toMap) } diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala index cc2bce6020..6a0450fefd 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala @@ -238,7 +238,7 @@ private[pekko] final class FunctionRef[-T](override val path: ActorPath, send: ( * this method. */ def logEntries: List[CapturedLogEvent] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ substituteLoggerFactory.getEventQueue .iterator() .asScala diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala index 45c193041c..8b143ad6e7 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala @@ -82,7 +82,7 @@ import java.util.Collections // invocations are synchronized via doAppend in AppenderBase override def append(event: ILoggingEvent): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val throwable = event.getThrowableProxy match { case p: ThrowableProxy => diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala index ff7077dcfe..d4b9f75d08 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala @@ -45,7 +45,7 @@ import pekko.japi.function.Creator import pekko.util.BoxedType import scala.jdk.DurationConverters._ import pekko.util.PrettyDuration._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ @InternalApi private[pekko] object TestProbeImpl { diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala index 6bd0a30f5a..dbf462f0c5 100644 --- a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala +++ b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala @@ -21,7 +21,7 @@ import org.apache.pekko import pekko.actor.testkit.typed.internal.TestInboxImpl import pekko.actor.typed.ActorRef import pekko.annotation.DoNotInherit -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object TestInbox { import pekko.actor.testkit.typed.scaladsl.TestInbox.address diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala index c74d783bda..a8e9108e1d 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala @@ -107,7 +107,7 @@ class ActorSelectionSpec extends PekkoSpec with DefaultTimeout { identify(system.child("c2").child("c21")) should ===(Some(c21)) // test Java API identify(system / Seq("c2", "c21")) should ===(Some(c21)) - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ identify(system.descendant(Seq("c2", "c21").asJava)) // test Java API } @@ -256,7 +256,7 @@ class ActorSelectionSpec extends PekkoSpec with DefaultTimeout { } "return deadLetters or ActorIdentity(None), respectively, for non-existing paths" in { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def checkOne(looker: ActorRef, query: Query, result: Option[ActorRef]): Unit = { val lookup = askNode(looker, query) diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala index a5b6ca78ec..28975a7f23 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala @@ -120,7 +120,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { } "allow for auto-loading of library-extensions from reference.conf" in { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ // could be initialized by other tests, but assuming tests are not running in parallel val countBefore = InstanceCountingExtension.createCount.get() val system = ActorSystem("extensions") @@ -133,7 +133,7 @@ class ExtensionSpec extends AnyWordSpec with Matchers { } "not create duplicate instances when auto-loading of library-extensions" in { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ // could be initialized by other tests, but assuming tests are not running in parallel val countBefore = InstanceCountingExtension.createCount.get() val system = ActorSystem( diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala index e04ebdaa4e..ecc8579999 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala @@ -260,7 +260,7 @@ class FSMActorSpec extends PekkoSpec(Map("pekko.actor.debug.fsm" -> true)) with } "log events and transitions if asked to do so" in { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val config = ConfigFactory .parseMap(Map("pekko.loglevel" -> "DEBUG", "pekko.actor.debug.fsm" -> true).asJava) .withFallback(system.settings.config) diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala index 102e01448f..02e6b8f894 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala @@ -436,7 +436,7 @@ abstract class ActorModelSpec(config: String) extends PekkoSpec(config) with Def val f6 = a ? Reply("bar2") val c = system.scheduler.scheduleOnce(2.seconds) { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ Thread.getAllStackTraces().asScala.foreach { case (thread, stack) => println(s"$thread:") diff --git a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala index 46ad5c8d36..b52868b585 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala @@ -135,7 +135,7 @@ class DispatchersSpec extends PekkoSpec(DispatchersSpec.config) with ImplicitSen val defaultDispatcherConfig = settings.config.getConfig("pekko.actor.default-dispatcher") lazy val allDispatchers: Map[String, MessageDispatcher] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ validTypes .map(t => (t, from(ConfigFactory.parseMap(Map(tipe -> t, id -> t).asJava).withFallback(defaultDispatcherConfig)))) @@ -175,7 +175,7 @@ class DispatchersSpec extends PekkoSpec(DispatchersSpec.config) with ImplicitSen } "throw ConfigurationException if type does not exist" in { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ intercept[ConfigurationException] { from( ConfigFactory diff --git a/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala index d89e8af6d7..b0418cca8c 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala @@ -23,7 +23,7 @@ import org.scalatest.wordspec.AnyWordSpec import org.apache.pekko import pekko.actor._ import pekko.testkit._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object LoggingReceiveSpec { class TestLogActor extends Actor { diff --git a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala index 066f27fb39..97fe875866 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala @@ -28,7 +28,7 @@ import org.scalatest.concurrent.Eventually import org.apache.pekko import pekko.testkit.PekkoSpec -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ abstract class DockerBindDnsService(config: Config) extends PekkoSpec(config) with Eventually { diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala index 1302cae07a..cb7c433992 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala @@ -33,7 +33,7 @@ import org.scalatest.wordspec.AnyWordSpec import org.apache.pekko import pekko.testkit.TimingTest import pekko.util.DefaultExecutionContext._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ class BoundedBlockingQueueSpec extends AnyWordSpec diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala index 8dcdf626ef..27ee54ae69 100644 --- a/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala +++ b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala @@ -1020,7 +1020,7 @@ class ByteStringSpec extends AnyWordSpec with Matchers with Checkers { a.asByteBuffers.forall(_.isReadOnly) } check { (a: ByteString) => - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ a.asByteBuffers.zip(a.getByteBuffers().asScala).forall(x => x._1 == x._2) } } diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala index 3c8a8d23f3..0fd9c10318 100644 --- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala +++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala @@ -21,7 +21,7 @@ import org.apache.pekko import pekko.actor.typed.internal.PropsImpl._ import pekko.annotation.DoNotInherit import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object Props { diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala index 5df8cf615a..bdd09534a5 100644 --- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala +++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala @@ -22,7 +22,7 @@ import org.apache.pekko import pekko.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions } import pekko.actor.typed.ExtensionSetup import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala index 175a9debae..3676e528fa 100644 --- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala +++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala @@ -18,7 +18,7 @@ import pekko.actor.typed.ActorRef import pekko.actor.typed.receptionist.{ Receptionist, ServiceKey } import pekko.actor.typed.receptionist.Receptionist.Command import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Internal API diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala index 7805ac9c44..9a754a8e50 100644 --- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala +++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala @@ -23,7 +23,7 @@ import pekko.actor.typed._ import pekko.actor.typed.internal.{ BehaviorImpl, StashBufferImpl, TimerSchedulerImpl, WithMdcBehaviorInterceptor } import pekko.japi.function.{ Effect, Function2 => JapiFunction2 } import pekko.japi.pf.PFBuilder -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.util.unused /** diff --git a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala index 57c995d00a..d04aaa498e 100644 --- a/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala +++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala @@ -19,7 +19,7 @@ import org.apache.pekko import pekko.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, ExtensionSetup } import pekko.actor.typed.internal.receptionist._ import pekko.annotation.DoNotInherit -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Register and discover actors that implement a service with a protocol defined by a [[ServiceKey]]. diff --git a/actor/src/main/mima-filters/2.0.x.backwards.excludes/remove-scala-2.12-support.excludes b/actor/src/main/mima-filters/2.0.x.backwards.excludes/remove-scala-2.12-support.excludes index c1818cb74f..82ee634ab9 100644 --- a/actor/src/main/mima-filters/2.0.x.backwards.excludes/remove-scala-2.12-support.excludes +++ b/actor/src/main/mima-filters/2.0.x.backwards.excludes/remove-scala-2.12-support.excludes @@ -21,3 +21,6 @@ ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.compat.PartialFunc ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.util.ccompat.ccompatUsedUntil213") ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.compat.Future") ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.compat.Future$") +ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.util.ccompat.package") +ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.util.ccompat.package$") +ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.util.ccompat.package$JavaConverters$") diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala index f2509559c5..21cb084168 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala @@ -21,7 +21,7 @@ import scala.collection.immutable import scala.annotation.nowarn import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Java API diff --git a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala index db075805c2..5f02c3d9c4 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala @@ -43,7 +43,7 @@ import pekko.util._ import scala.jdk.FutureConverters._ import scala.jdk.OptionConverters._ import pekko.util.Helpers.toRootLowerCase -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object BootstrapSetup { diff --git a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala index b012eacbea..80976cf646 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala @@ -308,7 +308,7 @@ object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with Extensi * INTERNAL API */ private[pekko] def phasesFromConfig(conf: Config): Map[String, Phase] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val defaultPhaseTimeout = conf.getString("default-phase-timeout") val phasesConf = conf.getConfig("phases") val defaultPhaseConfig = ConfigFactory.parseString(s""" @@ -512,7 +512,7 @@ final class CoordinatedShutdown private[pekko] ( def get(phaseName: String): Option[PhaseDefinition] = Option(registeredPhases.get(phaseName)) def totalDuration(): FiniteDuration = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ registeredPhases.keySet.asScala.foldLeft(Duration.Zero) { case (acc, phase) => acc + timeout(phase) diff --git a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala index c4e5c03a55..7b04e25d7c 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala @@ -224,7 +224,7 @@ case object NoScopeGiven extends NoScopeGiven { */ private[pekko] class Deployer(val settings: ActorSystem.Settings, val dynamicAccess: DynamicAccess) { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ private val resizerEnabled: Config = ConfigFactory.parseString("resizer.enabled=on") private val deployments = new AtomicReference(WildcardIndex[Deploy]()) diff --git a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala index 89f5d9dfc6..adcbecc8c3 100644 --- a/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala +++ b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala @@ -42,7 +42,7 @@ private[pekko] trait Children { this: ActorCell => final def children: immutable.Iterable[ActorRef] = childrenRefs.children final def getChildren(): java.lang.Iterable[ActorRef] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ children.asJava } diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala index 00597f62f2..f38b6f3cb8 100644 --- a/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala +++ b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala @@ -221,7 +221,7 @@ class Dispatchers @InternalApi private[pekko] ( * INTERNAL API */ private[pekko] def config(id: String, appConfig: Config): Config = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def simpleName = id.substring(id.lastIndexOf('.') + 1) idConfig(id) .withFallback(appConfig) @@ -230,7 +230,7 @@ class Dispatchers @InternalApi private[pekko] ( } private def idConfig(id: String): Config = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseMap(Map("id" -> id).asJava) } diff --git a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala index 66fd12eb5e..9058cfba84 100644 --- a/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala +++ b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala @@ -74,7 +74,7 @@ private[pekko] class Mailboxes( private val mailboxTypeConfigurators = new ConcurrentHashMap[String, MailboxType] private val mailboxBindings: Map[Class[_ <: Any], String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ settings.config .getConfig("pekko.actor.mailbox.requirements") .root @@ -285,7 +285,7 @@ private[pekko] class Mailboxes( // INTERNAL API private def config(id: String): Config = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory .parseMap(Map("id" -> id).asJava) .withFallback(settings.config.getConfig(id)) diff --git a/actor/src/main/scala/org/apache/pekko/event/Logging.scala b/actor/src/main/scala/org/apache/pekko/event/Logging.scala index 9c380d3c6f..968c72f0a3 100644 --- a/actor/src/main/scala/org/apache/pekko/event/Logging.scala +++ b/actor/src/main/scala/org/apache/pekko/event/Logging.scala @@ -777,7 +777,7 @@ object Logging { * Java API: Retrieve the contents of the MDC. */ def getMDC: java.util.Map[String, Any] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ mdc.asJava } } @@ -1640,7 +1640,7 @@ trait DiagnosticLoggingAdapter extends LoggingAdapter { import Logging._ - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ private var _mdc = emptyMDC @@ -1705,7 +1705,7 @@ class LogMarker(val name: String, val properties: Map[String, Any]) { /** Java API */ def getProperties: java.util.Map[String, Object] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ properties.map { case (k, v) => (k, v.asInstanceOf[AnyRef]) }.asJava } @@ -1726,7 +1726,7 @@ object LogMarker { /** Java API */ def create(name: String, properties: java.util.Map[String, Any]): LogMarker = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ apply(name, properties.asScala.toMap) } diff --git a/actor/src/main/scala/org/apache/pekko/io/Tcp.scala b/actor/src/main/scala/org/apache/pekko/io/Tcp.scala index 3df6f8609a..6c84bcadcc 100644 --- a/actor/src/main/scala/org/apache/pekko/io/Tcp.scala +++ b/actor/src/main/scala/org/apache/pekko/io/Tcp.scala @@ -31,7 +31,7 @@ import pekko.io.Inet._ import pekko.util.{ ByteString, Helpers } import pekko.util.Helpers.Requiring import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * TCP Extension for Akka’s IO layer. diff --git a/actor/src/main/scala/org/apache/pekko/io/Udp.scala b/actor/src/main/scala/org/apache/pekko/io/Udp.scala index a137bf738d..d19a0f230b 100644 --- a/actor/src/main/scala/org/apache/pekko/io/Udp.scala +++ b/actor/src/main/scala/org/apache/pekko/io/Udp.scala @@ -257,7 +257,7 @@ object UdpMessage { import Udp._ - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ /** * Each [[Udp.Send]] can optionally request a positive acknowledgment to be sent diff --git a/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala index e1912df49f..91464ce448 100644 --- a/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala +++ b/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala @@ -267,7 +267,7 @@ object UdpConnectedMessage { def resumeReading: Command = ResumeReading implicit private def fromJava[T](coll: JIterable[T]): immutable.Iterable[T] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ coll.asScala.to(immutable.Iterable) } } diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala index 9e4270950d..d83f3e1a88 100644 --- a/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala +++ b/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala @@ -25,7 +25,7 @@ import org.apache.pekko import pekko.actor.NoSerializationVerificationNeeded import pekko.io.IpVersionSelector import pekko.routing.ConsistentHashingRouter.ConsistentHashable -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Supersedes [[pekko.io.Dns]] protocol. diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala index abea6eee7f..b46fd8529f 100644 --- a/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala +++ b/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala @@ -49,7 +49,7 @@ import pekko.io.dns.internal.{ ResolvConf, ResolvConfParser } import pekko.util.Helpers import pekko.util.Helpers.Requiring import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** INTERNAL API */ @InternalApi diff --git a/actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala index 7595a09e9f..06bd049ce0 100644 --- a/actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala +++ b/actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala @@ -18,8 +18,7 @@ import java.nio.file.Files import scala.util.Try -import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ private[dns] case class ResolvConf(search: List[String], ndots: Int) diff --git a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala index ca4ba22045..3724892789 100644 --- a/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala +++ b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala @@ -25,7 +25,7 @@ import pekko.actor.{ ExtensionIdProvider } import pekko.pattern.internal.CircuitBreakerTelemetryProvider -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread diff --git a/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala index b208e5332d..9bd2aa16ac 100644 --- a/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala +++ b/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala @@ -18,7 +18,7 @@ import java.util.{ List => JList } import org.apache.pekko import pekko.actor.ExtendedActorSystem import pekko.annotation.{ InternalApi, InternalStableApi } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Service Provider Interface (SPI) for collecting metrics from Circuit Breaker. diff --git a/actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala index 83540ea236..3d4e43ae5e 100644 --- a/actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala +++ b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala @@ -135,7 +135,7 @@ object ConsistentHash { * Java API: Factory method to create a ConsistentHash */ def create[T](nodes: java.lang.Iterable[T], virtualNodesFactor: Int): ConsistentHash[T] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ apply(nodes.asScala, virtualNodesFactor)(ClassTag(classOf[Any].asInstanceOf[Class[T]])) } diff --git a/actor/src/main/scala/org/apache/pekko/routing/Router.scala b/actor/src/main/scala/org/apache/pekko/routing/Router.scala index 8a8dc0fee9..0b479378e1 100644 --- a/actor/src/main/scala/org/apache/pekko/routing/Router.scala +++ b/actor/src/main/scala/org/apache/pekko/routing/Router.scala @@ -91,7 +91,7 @@ final case class SeveralRoutees(routees: immutable.IndexedSeq[Routee]) extends R * Java API */ def getRoutees(): java.util.List[Routee] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ routees.asJava } diff --git a/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala b/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala index ec689d88c0..959d79bf21 100644 --- a/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala +++ b/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala @@ -417,7 +417,7 @@ final case class Routees(routees: immutable.IndexedSeq[Routee]) { * Java API */ def getRoutees: java.util.List[Routee] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ routees.asJava } } diff --git a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala index e76d6e5de2..5d8e4369c3 100644 --- a/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala +++ b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala @@ -55,7 +55,7 @@ object Serialization { } private final def configToMap(cfg: Config): Map[String, String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ cfg.root.unwrapped.asScala.toMap.map { case (k, v) => k -> v.toString } } } diff --git a/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala index a163fa072d..3d3501293e 100644 --- a/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala +++ b/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala @@ -18,7 +18,7 @@ import scala.collection.immutable import org.apache.pekko import pekko.actor.ExtendedActorSystem import pekko.actor.setup.Setup -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object SerializationSetup { diff --git a/actor/src/main/scala/org/apache/pekko/util/Index.scala b/actor/src/main/scala/org/apache/pekko/util/Index.scala index 12b044b37a..cb1d06f84f 100644 --- a/actor/src/main/scala/org/apache/pekko/util/Index.scala +++ b/actor/src/main/scala/org/apache/pekko/util/Index.scala @@ -18,7 +18,7 @@ import java.util.concurrent.{ ConcurrentHashMap, ConcurrentSkipListSet } import scala.annotation.tailrec -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * An implementation of a ConcurrentMultiMap diff --git a/actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala b/actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala deleted file mode 100644 index f14cd0742e..0000000000 --- a/actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * license agreements; and to You under the Apache License, version 2.0: - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * This file is part of the Apache Pekko project, which was derived from Akka. - */ - -/* - * Scala (https://www.scala-lang.org) - * - * Copyright EPFL and Lightbend, Inc. - * - * Licensed under Apache License 2.0 - * (http://www.apache.org/licenses/LICENSE-2.0). - * - * See the NOTICE file distributed with this work for - * additional information regarding copyright ownership. - */ - -package org.apache.pekko.util - -/** - * INTERNAL API - * - * Based on https://github.com/scala/scala-collection-compat/blob/master/compat/src/main/scala-2.13/scala/collection/compat/package.scala - * but reproduced here so we don't need to add a dependency on this library. It contains much more than we need right now, and is - * not promising binary compatibility yet at the time of writing. - */ -package object ccompat { - private[pekko] type Factory[-A, +C] = scala.collection.Factory[A, C] - private[pekko] val Factory = scala.collection.Factory - - // When we drop support for 2.12 we can delete this concept - // and import scala.jdk.CollectionConverters.Ops._ instead - object JavaConverters - extends scala.collection.convert.AsJavaExtensions - with scala.collection.convert.AsScalaExtensions -} diff --git a/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala b/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala index efe18e4748..0252fb27e5 100644 --- a/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala +++ b/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala @@ -19,7 +19,7 @@ import org.openjdk.jmh.runner.options.CommandLineOptions object BenchRunner { def main(args: Array[String]) = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val args2 = args.toList.flatMap { case "quick" => "-i 1 -wi 1 -f1 -t1".split(" ").toList diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala index 57f5bcc6a0..9787fddd0b 100644 --- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala +++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala @@ -108,7 +108,7 @@ final case class ClusterMetricsChanged(nodeMetrics: Set[NodeMetrics]) extends Cl /** Java API */ @nowarn("msg=deprecated") def getNodeMetrics: java.lang.Iterable[NodeMetrics] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ nodeMetrics.asJava } } diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala index 8c68d854f0..defa534527 100644 --- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala +++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala @@ -337,7 +337,7 @@ final case class NodeMetrics(address: Address, timestamp: Long, metrics: Set[Met */ @nowarn("msg=deprecated") def getMetrics: java.lang.Iterable[Metric] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ metrics.asJava } diff --git a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala index 2f9d712f83..cdf4706ae9 100644 --- a/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala +++ b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala @@ -27,7 +27,7 @@ import pekko.dispatch.Dispatchers import pekko.protobufv3.internal.MessageLite import pekko.remote.ByteStringUtils import pekko.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest, Serializers } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Protobuf serializer for [[pekko.cluster.metrics.ClusterMetricsMessage]] types. diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala index cf99fc3ce7..ef931a23a5 100644 --- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala +++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala @@ -21,7 +21,7 @@ import pekko.persistence.typed.ReplicaId import scala.collection.immutable import scala.reflect.ClassTag -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import java.util.{ Set => JSet } import pekko.actor.typed.Behavior diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala index 6d2b58ec4d..168d6cb25f 100644 --- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala +++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala @@ -152,13 +152,13 @@ object ShardingProducerController { /** Java API */ def getEntitiesWithDemand: java.util.Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ entitiesWithDemand.asJava } /** Java API */ def getBufferedForEntitiesWithoutDemand: java.util.Map[String, Integer] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ bufferedForEntitiesWithoutDemand.iterator.map { case (k, v) => k -> v.asInstanceOf[Integer] }.toMap.asJava } } diff --git a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala index 45ebce4fc6..f28802633b 100644 --- a/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala +++ b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala @@ -31,7 +31,7 @@ import pekko.actor.typed.scaladsl.LoggerOps import pekko.cluster.ClusterSettings.DataCenter import pekko.cluster.sharding.typed.ShardingDirectReplication import pekko.persistence.typed.ReplicationId -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala index 3a3a73b231..6c587870bd 100755 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala @@ -50,7 +50,7 @@ import pekko.event.Logging import pekko.pattern.BackoffOpts import pekko.pattern.ask import pekko.util.ByteString -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * This extension provides sharding functionality of actors in a cluster. diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala index cd1e7e3a18..b078ee54c8 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala @@ -22,7 +22,7 @@ import pekko.pattern.ask import pekko.util.Timeout import pekko.annotation.InternalApi import pekko.pattern.AskTimeoutException -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.DurationConverters._ import scala.concurrent.ExecutionContext diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala index 0db8722c51..faf48e346d 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala @@ -369,7 +369,7 @@ private[pekko] object Shard { } } - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ // only called once during handoff def activeEntities(): Set[ActorRef] = byRef.keySet.asScala.toSet diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala index 5efad4bb56..2bb3fe7f1b 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala @@ -211,14 +211,14 @@ object ShardCoordinator { shardId: ShardId, currentShardAllocations: Map[ActorRef, immutable.IndexedSeq[ShardId]]): Future[ActorRef] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ allocateShard(requester, shardId, currentShardAllocations.asJava) } override final def rebalance( currentShardAllocations: Map[ActorRef, immutable.IndexedSeq[ShardId]], rebalanceInProgress: Set[ShardId]): Future[Set[ShardId]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ implicit val ec = ExecutionContext.parasitic rebalance(currentShardAllocations.asJava, rebalanceInProgress.asJava).map(_.asScala.toSet) } diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala index 217f48c5a7..ab0c842285 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala @@ -261,7 +261,7 @@ object ShardRegion { * Java API */ def getRegions: java.util.Set[Address] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ regions.asJava } @@ -291,7 +291,7 @@ object ShardRegion { * Java API */ def getRegions(): java.util.Map[Address, ShardRegionStats] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ regions.asJava } } @@ -325,13 +325,13 @@ object ShardRegion { * Java API */ def getStats(): java.util.Map[ShardId, Int] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ stats.asJava } /** Java API */ def getFailed(): java.util.Set[ShardId] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ failed.asJava } @@ -391,13 +391,13 @@ object ShardRegion { * If gathering the shard information times out the set of shards will be empty. */ def getShards(): java.util.Set[ShardState] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ shards.asJava } /** Java API */ def getFailed(): java.util.Set[ShardId] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ failed.asJava } @@ -434,7 +434,7 @@ object ShardRegion { * Java API: */ def getEntityIds(): java.util.Set[EntityId] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ entityIds.asJava } } diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala index 19cfbaf27c..8d7520ae6a 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala @@ -16,7 +16,7 @@ package org.apache.pekko.cluster.sharding.external import org.apache.pekko import pekko.cluster.sharding.ShardRegion.ShardId import pekko.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ final class ShardLocations(val locations: Map[ShardId, ShardLocation]) { diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala index c0312ba698..3370d4e3cd 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala @@ -48,7 +48,7 @@ import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import pekko.util.PrettyDuration._ import pekko.util.Timeout -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala index 0a62af78d2..9b0481bf9a 100644 --- a/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala +++ b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala @@ -41,7 +41,7 @@ import pekko.protobufv3.internal.MessageLite import pekko.serialization.BaseSerializer import pekko.serialization.Serialization import pekko.serialization.SerializerWithStringManifest -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API: Protobuf serializer of ClusterSharding messages. diff --git a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala index 56a5212122..a8bfecc83d 100644 --- a/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala +++ b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala @@ -15,7 +15,7 @@ package org.apache.pekko.cluster.sharding.passivation.simulator import org.apache.pekko import pekko.japi.Util.immutableSeq -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.typesafe.config.Config import java.util.Locale diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala index 5956af5c68..4a9059d755 100644 --- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala +++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala @@ -51,7 +51,7 @@ import pekko.remote.DeadlineFailureDetector import pekko.routing.ConsistentHash import pekko.routing.MurmurHash import pekko.util.MessageBuffer -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ @deprecated( "Use Pekko gRPC instead, see https://pekko.apache.org/docs/pekko/current/cluster-client.html#migration-to-pekko-grpc", diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala index fed3a7124b..13f81f6a83 100644 --- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala +++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala @@ -23,7 +23,7 @@ import pekko.cluster.client.ClusterReceptionist import pekko.cluster.client.protobuf.msg.{ ClusterClientMessages => cm } import pekko.serialization.BaseSerializer import pekko.serialization.SerializerWithStringManifest -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API: Serializer of ClusterClient messages. diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala index 608ba41258..95d9ddd04c 100644 --- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala +++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala @@ -245,7 +245,7 @@ object DistributedPubSubMediator { * Java API */ def getTopics(): java.util.Set[String] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ topics.asJava } } diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala index 865c573ad9..bf8832ba63 100644 --- a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala +++ b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala @@ -28,7 +28,7 @@ import pekko.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages => dm } import pekko.protobufv3.internal.{ ByteString, MessageLite } import pekko.remote.ByteStringUtils import pekko.serialization._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API: Protobuf serializer of DistributedPubSubMediator messages. diff --git a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala index 02eee4050a..7966a603a0 100644 --- a/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala +++ b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala @@ -30,7 +30,7 @@ import pekko.remote.ContainerFormats.Payload import pekko.remote.serialization.WrappedPayloadSupport import pekko.serialization.BaseSerializer import pekko.serialization.SerializerWithStringManifest -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.protobufv3.internal.ByteString import pekko.remote.ByteStringUtils diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala index 2acb1b4f44..dc0c5e6e25 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala @@ -110,7 +110,7 @@ class Cluster(val system: ExtendedActorSystem) extends Extension { * Java API: roles that this member has */ def getSelfRoles: java.util.Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ selfRoles.asJava } diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala index f9515b2fc6..bda548d96d 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala @@ -27,7 +27,7 @@ import pekko.cluster.ClusterSettings.DataCenter import pekko.cluster.MemberStatus._ import pekko.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import pekko.event.EventStream -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Domain events published to the event bus. diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala index da0db6a54c..ffe8520122 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala @@ -25,7 +25,7 @@ import pekko.actor.AddressFromURIString import pekko.annotation.InternalApi import pekko.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring } import pekko.util.Version -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object ClusterSettings { type DataCenter = String @@ -175,7 +175,7 @@ final class ClusterSettings(val config: Config, val systemName: String) { cc.getInt("min-nr-of-members") }.requiring(_ > 0, "min-nr-of-members must be > 0") val MinNrOfMembersOfRole: Map[String, Int] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ cc.getConfig("role") .root .asScala @@ -195,7 +195,7 @@ final class ClusterSettings(val config: Config, val systemName: String) { val ByPassConfigCompatCheck: Boolean = !cc.getBoolean("configuration-compatibility-check.enforce-on-join") val ConfigCompatCheckers: Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ cc.getConfig("configuration-compatibility-check.checkers") .root .unwrapped @@ -209,7 +209,7 @@ final class ClusterSettings(val config: Config, val systemName: String) { } val SensitiveConfigPaths = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val sensitiveKeys = cc.getConfig("configuration-compatibility-check.sensitive-config-paths") diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/ConfigUtil.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ConfigUtil.scala index 553f4d5737..d3742c2f42 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/ConfigUtil.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/ConfigUtil.scala @@ -34,7 +34,7 @@ private[cluster] object ConfigUtil { } def adaptPekkoToAkkaConfig(cfg: Config): Config = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val innerSet = cfg.entrySet().asScala .filter(e => e.getKey.startsWith("pekko.") && e.getValue.valueType() != ConfigValueType.OBJECT) .map { entry => @@ -48,7 +48,7 @@ private[cluster] object ConfigUtil { } def adaptAkkaToPekkoConfig(cfg: Config): Config = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val innerSet = cfg.entrySet().asScala .filter(e => e.getKey.startsWith("akka.") && e.getValue.valueType() != ConfigValueType.OBJECT) .map { entry => diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala index 1f303e784c..8280b2a438 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala @@ -20,7 +20,7 @@ import com.typesafe.config.{ Config, ConfigFactory, ConfigValue } import org.apache.pekko import pekko.actor.ExtendedActorSystem import pekko.annotation.{ DoNotInherit, InternalApi } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ abstract class JoinConfigCompatChecker { diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala index 23219ba63c..46c84b1796 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala @@ -64,7 +64,7 @@ class Member private[cluster] ( */ @nowarn("msg=deprecated") def getRoles: java.util.Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ roles.asJava } diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala index 8ae9181eaf..941854f7b7 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala @@ -31,7 +31,7 @@ import pekko.remote.ByteStringUtils import pekko.routing.Pool import pekko.serialization._ import pekko.util.Version -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala b/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala index 023ffef05e..c3225322bb 100644 --- a/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala +++ b/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala @@ -38,7 +38,7 @@ import pekko.routing.RouterConfig import pekko.routing.RouterPoolActor import pekko.routing.RoutingLogic import pekko.util.HashCode -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object ClusterRouterGroupSettings { diff --git a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala index 0e9ad19534..b5890af45b 100644 --- a/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala +++ b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala @@ -527,7 +527,7 @@ abstract class StressSpec extends MultiNodeClusterSpec(StressMultiJvmSpec) with .append(" MB") sb.append("\n") - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val args = runtime.getInputArguments.asScala.filterNot(_.contains("classpath")).mkString("\n ") sb.append("Args:\n ").append(args) sb.append("\n") diff --git a/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala index a43367d146..066d5e55c1 100644 --- a/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala +++ b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala @@ -31,7 +31,7 @@ import pekko.actor.ExtensionIdProvider import pekko.coordination.lease.scaladsl.Lease import pekko.event.Logging import pekko.testkit.TestProbe -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object TestLeaseExt extends ExtensionId[TestLeaseExt] with ExtensionIdProvider { override def get(system: ActorSystem): TestLeaseExt = super.get(system) diff --git a/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala index 79c7039a5d..307cbd4250 100644 --- a/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala +++ b/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala @@ -54,7 +54,7 @@ object ServiceDiscovery { * Java API */ def getAddresses: java.util.List[ResolvedTarget] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ addresses.asJava } diff --git a/discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala index d6d293a9a3..8876f219b4 100644 --- a/discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala +++ b/discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala @@ -28,7 +28,7 @@ import pekko.discovery.aggregate.AggregateServiceDiscovery.Methods import pekko.dispatch.MessageDispatcher import pekko.event.Logging import pekko.util.Helpers.Requiring -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala index b4ccd90c30..0951bbcef0 100644 --- a/discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala +++ b/discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala @@ -24,7 +24,7 @@ import pekko.annotation.InternalApi import pekko.discovery.{ Lookup, ServiceDiscovery } import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } import pekko.event.Logging -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala b/distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala index d6fb966ab1..d1804b5ca5 100644 --- a/distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala +++ b/distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala @@ -52,7 +52,7 @@ final case class GSet[A] private (elements: Set[A])(override val delta: Option[G * Java API */ def getElements(): java.util.Set[A] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ elements.asJava } diff --git a/distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala b/distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala index d6fb966ab1..d1804b5ca5 100644 --- a/distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala +++ b/distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala @@ -52,7 +52,7 @@ final case class GSet[A] private (elements: Set[A])(override val delta: Option[G * Java API */ def getElements(): java.util.Set[A] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ elements.asJava } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala index efced43cdf..7f4990d705 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala @@ -43,7 +43,7 @@ import pekko.serialization.SerializationExtension import pekko.serialization.SerializerWithStringManifest import pekko.util.ByteString import pekko.util.OptionVal -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * An actor implementing the durable store for the Distributed Data `Replicator` @@ -312,7 +312,7 @@ final class LmdbDurableStore(config: Config) extends Actor with ActorLogging { TimeUnit.NANOSECONDS.toMillis(System.nanoTime - t0)) } catch { case NonFatal(e) => - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ log.error(e, "failed to store [{}]", pending.keySet.asScala.mkString(",")) tx.abort() } finally { diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala index 4558a334a6..867977403e 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala @@ -84,7 +84,7 @@ final class LWWMap[A, B] private[pekko] (private[pekko] val underlying: ORMap[A, * Java API: All entries of the map. */ def getEntries(): java.util.Map[A, B] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ entries.asJava } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala index 1ef09ee54c..ec5fbf8819 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala @@ -209,7 +209,7 @@ final class ORMap[A, B <: ReplicatedData] private[pekko] ( * Java API: All entries of the map. */ def getEntries(): java.util.Map[A, B] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ entries.asJava } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala index 8f40d0de37..6a682181e8 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala @@ -113,7 +113,7 @@ final class ORMultiMap[A, B] private[pekko] ( * Java API: All entries of a multimap where keys are strings and values are sets. */ def getEntries(): java.util.Map[A, java.util.Set[B]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val result = new java.util.HashMap[A, java.util.Set[B]] if (withValueDeltas) underlying.entries.foreach { @@ -167,7 +167,7 @@ final class ORMultiMap[A, B] private[pekko] ( * replicated data set. */ def put(node: SelfUniqueAddress, key: A, value: java.util.Set[B]): ORMultiMap[A, B] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ put(node.uniqueAddress, key, value.asScala.toSet) } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala index 7538cba27c..d3c7820a39 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala @@ -337,7 +337,7 @@ final class ORSet[A] private[pekko] ( * Java API */ def getElements(): java.util.Set[A] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ elements.asJava } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala index 6519b90122..f615081465 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala @@ -64,7 +64,7 @@ final class PNCounterMap[A] private[pekko] (private[pekko] val underlying: ORMap /** Java API */ def getEntries: java.util.Map[A, BigInteger] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ underlying.entries.map { case (k, c) => k -> c.value.bigInteger }.asJava } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala index 2e0ada8caf..4700e772fd 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala @@ -96,7 +96,7 @@ object ReplicatorSettings { else Some(config.getBytes("log-data-size-exceeding").toInt) } - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ new ReplicatorSettings( roles = roleOption(config.getString("role")).toSet, gossipInterval = config.getDuration("gossip-interval", MILLISECONDS).millis, @@ -231,7 +231,7 @@ final class ReplicatorSettings( * Java API */ def withDurableKeys(durableKeys: java.util.Set[String]): ReplicatorSettings = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ withDurableKeys(durableKeys.asScala.toSet) } @@ -408,7 +408,7 @@ object Replicator { * Java API */ def getKeyIds: java.util.Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ keyIds.asJava } } diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala index 3c62b7fe07..bd62d66161 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala @@ -36,7 +36,7 @@ import pekko.serialization.BaseSerializer import pekko.serialization.Serialization import pekko.serialization.SerializerWithStringManifest import pekko.util.ByteString.UTF_8 -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ private object ReplicatedDataSerializer { /* diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala index 20172b1f26..cfb1243e35 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala @@ -41,7 +41,7 @@ import pekko.serialization.BaseSerializer import pekko.serialization.Serialization import pekko.serialization.SerializerWithStringManifest import pekko.util.{ ByteString => PekkoByteString } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala index 421b6a65e0..8f69121ac5 100644 --- a/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala +++ b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala @@ -30,7 +30,7 @@ import pekko.protobufv3.internal.ByteString import pekko.protobufv3.internal.MessageLite import pekko.remote.ByteStringUtils import pekko.serialization._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Some useful serialization helper methods. diff --git a/docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala b/docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala index 16de186455..81c5e8c68f 100644 --- a/docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala +++ b/docs/src/test/scala/docs/ddata/DistributedDataDocSpec.scala @@ -409,7 +409,7 @@ class DistributedDataDocSpec extends PekkoSpec(DistributedDataDocSpec.config) { } "test japi.TwoPhaseSetSerializer" in { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val s1 = ddata.TwoPhaseSet.create().add("a").add("b").add("c").remove("b") s1.getElements.asScala should be(Set("a", "c")) val serializer = SerializationExtension(system).findSerializerFor(s1) diff --git a/docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala b/docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala index 44931d3ac3..249b72cc4d 100644 --- a/docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala +++ b/docs/src/test/scala/docs/ddata/protobuf/TwoPhaseSetSerializer.scala @@ -17,7 +17,7 @@ package docs.ddata.protobuf import java.util.ArrayList import java.util.Collections import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.actor.ExtendedActorSystem import pekko.cluster.ddata.GSet import pekko.cluster.ddata.protobuf.SerializationSupport diff --git a/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala b/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala index 0f866edd6f..fd45a44e03 100644 --- a/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala +++ b/docs/src/test/scala/docs/io/ScalaUdpMulticastSpec.scala @@ -21,7 +21,7 @@ import org.apache.pekko.actor.Props import org.apache.pekko.io.Udp import org.apache.pekko.testkit.SocketUtil import org.apache.pekko.testkit.TestKit -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala b/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala index 3940165dcb..bd439ac1fc 100644 --- a/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala +++ b/docs/src/test/scala/docs/persistence/query/PersistenceQueryDocSpec.scala @@ -140,7 +140,7 @@ object PersistenceQueryDocSpec { // possibility to add more plugin specific queries def byTagsWithMeta(tags: java.util.Set[String]): javadsl.Source[RichEvent, QueryMetadata] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ scaladslReadJournal.byTagsWithMeta(tags.asScala.toSet).asJava } } diff --git a/docs/src/test/scala/docs/routing/RouterDocSpec.scala b/docs/src/test/scala/docs/routing/RouterDocSpec.scala index 27c9c65250..f1ce67ebcc 100644 --- a/docs/src/test/scala/docs/routing/RouterDocSpec.scala +++ b/docs/src/test/scala/docs/routing/RouterDocSpec.scala @@ -33,7 +33,7 @@ import org.apache.pekko.routing.ScatterGatherFirstCompletedPool import org.apache.pekko.routing.BalancingPool import org.apache.pekko.routing.TailChoppingGroup import org.apache.pekko.routing.TailChoppingPool -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object RouterDocSpec { diff --git a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala index c344647c65..f1d3615ccd 100644 --- a/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala +++ b/multi-node-testkit/src/main/scala/org/apache/pekko/remote/testkit/MultiNodeSpec.scala @@ -274,7 +274,7 @@ object MultiNodeSpec { """) private def mapToConfig(map: Map[String, Any]): Config = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseMap(map.asJava) } @@ -521,7 +521,7 @@ abstract class MultiNodeSpec( base.replace(tag, replaceWith) } } - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseString(deployString).root.asScala.foreach { case (key, value: ConfigObject) => deployer.parseConfig(key, value.toConfig).foreach(deployer.deploy) case (key, x) => diff --git a/osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala b/osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala index 4fb2ac8125..97c9346cc0 100644 --- a/osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala +++ b/osgi/src/main/scala/org/apache/pekko/osgi/BundleDelegatingClassLoader.scala @@ -24,7 +24,7 @@ import scala.util.Try import org.osgi.framework.{ Bundle, BundleContext } import org.osgi.framework.wiring.{ BundleRevision, BundleWire, BundleWiring } -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /* * Companion object to create bundle delegating ClassLoader instances diff --git a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala index 970a238de7..621e9c62fe 100644 --- a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala +++ b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala @@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils.copy import org.osgi.framework._ import org.scalatest.{ BeforeAndAfterAll, Suite } -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Trait that provides support for building pekko-osgi tests using PojoSR diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala index e3e3197f55..95e9b65a20 100644 --- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala +++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/Offset.scala @@ -106,7 +106,7 @@ final case class TimestampOffset(timestamp: Instant, readTimestamp: Instant, see /** Java API */ def getSeen(): java.util.Map[String, java.lang.Long] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ seen.map { case (pid, seqNr) => pid -> java.lang.Long.valueOf(seqNr) }.asJava } diff --git a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala index 25f3b4e5d8..2238e305cc 100644 --- a/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala +++ b/persistence-query/src/main/scala/org/apache/pekko/persistence/query/journal/leveldb/Buffer.scala @@ -19,7 +19,7 @@ import org.apache.pekko import pekko.annotation.InternalApi import pekko.stream.Outlet import pekko.stream.stage.GraphStageLogic -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala index 092656d315..6b35612212 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/EventStorage.scala @@ -26,7 +26,7 @@ import pekko.persistence.journal.Tagged import pekko.persistence.testkit.ProcessingPolicy.DefaultPolicies import pekko.persistence.testkit.internal.TestKitStorage import pekko.stream.scaladsl.Source -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala index b7cd867871..e42cc92beb 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/PersistenceTestKitPlugin.scala @@ -120,7 +120,7 @@ object PersistenceTestKitPlugin { val PluginId = "pekko.persistence.testkit.journal" - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def getInstance() = this @@ -172,7 +172,7 @@ object PersistenceTestKitSnapshotPlugin { val PluginId = "pekko.persistence.testkit.snapshotstore.pluginid" - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def getInstance() = this @@ -189,7 +189,7 @@ object PersistenceTestKitDurableStateStorePlugin { val PluginId = "pekko.persistence.testkit.state" - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def getInstance() = this diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala index 40d6d48d18..42df92ac7a 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/EventSourcedBehaviorTestKit.scala @@ -26,7 +26,7 @@ import pekko.actor.typed.Behavior import pekko.annotation.ApiMayChange import pekko.annotation.DoNotInherit import pekko.persistence.testkit.scaladsl -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.annotation.varargs diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala index ccafc9cbbe..02620d7432 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/PersistenceTestKit.scala @@ -23,7 +23,7 @@ import pekko.annotation.ApiMayChange import pekko.persistence.testkit.{ EventStorage, ExpectedFailure, ExpectedRejection, JournalOperation } import pekko.persistence.testkit.scaladsl.{ PersistenceTestKit => ScalaTestKit } import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Class for testing persisted events in persistent actors. diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala index 8d31282d9d..8d57e4032a 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/javadsl/SnapshotTestKit.scala @@ -24,7 +24,7 @@ import pekko.japi.Pair import pekko.persistence.testkit.{ ExpectedFailure, SnapshotMeta, SnapshotOperation, SnapshotStorage } import pekko.persistence.testkit.scaladsl.{ SnapshotTestKit => ScalaTestKit } import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Class for testing persisted snapshots in persistent actors. diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala index 314dc8a478..49f63684bb 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/query/javadsl/PersistenceTestKitReadJournal.scala @@ -79,7 +79,7 @@ final class PersistenceTestKitReadJournal(delegate: scaladsl.PersistenceTestKitR delegate.sliceForPersistenceId(persistenceId) override def sliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ delegate .sliceRanges(numberOfRanges) .map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max))) diff --git a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala index e87f9a127c..57aee7e4d4 100644 --- a/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala +++ b/persistence-testkit/src/main/scala/org/apache/pekko/persistence/testkit/state/javadsl/PersistenceTestKitDurableStateStore.scala @@ -75,7 +75,7 @@ class PersistenceTestKitDurableStateStore[A](stateStore: SStore[A]) stateStore.sliceForPersistenceId(persistenceId) override def sliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ stateStore .sliceRanges(numberOfRanges) .map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max))) diff --git a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala index 7be70a96f3..677520b4b3 100644 --- a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala +++ b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/CommonUtils.scala @@ -27,7 +27,7 @@ trait CommonUtils extends AnyWordSpecLike with TestKitBase { protected def randomPid() = UUID.randomUUID().toString - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def initSystemWithEnabledPlugin(name: String, serializeMessages: Boolean, serializeSnapshots: Boolean) = ActorSystem( diff --git a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala index 1743480c28..2fc5526177 100644 --- a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala +++ b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonSnapshotTests.scala @@ -22,7 +22,7 @@ import pekko.japi.Pair import pekko.persistence._ import pekko.persistence.testkit._ import pekko.testkit.EventFilter -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ trait CommonSnapshotTests extends JavaDslUtils { diff --git a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala index d3b1d27d5b..0f086323e6 100644 --- a/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala +++ b/persistence-testkit/src/test/scala/org/apache/pekko/persistence/testkit/javadsl/CommonTestKitTests.scala @@ -21,7 +21,7 @@ import pekko.actor.typed.javadsl.Adapter import pekko.persistence._ import pekko.persistence.testkit._ import pekko.testkit.EventFilter -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ trait CommonTestKitTests extends JavaDslUtils { diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala index 13d321144c..6d9c9fc643 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/EventAdapter.scala @@ -91,7 +91,7 @@ object EventSeq { /** Java API */ final def create[A](events: java.util.List[A]): EventSeq[A] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ EventsSeq(events.asScala.toList) } diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala index 8640508621..826508f917 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/crdt/ORSet.scala @@ -301,7 +301,7 @@ final class ORSet[A] private[pekko] ( * Java API */ def getElements(): java.util.Set[A] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ elements.asJava } @@ -330,7 +330,7 @@ final class ORSet[A] private[pekko] ( * `elems` must not be empty. */ def addAll(elems: java.util.Set[A]): ORSet.DeltaOp = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ addAll(elems.asScala.toSet) } @@ -372,7 +372,7 @@ final class ORSet[A] private[pekko] ( * `elems` must not be empty. */ def removeAll(elems: java.util.Set[A]): ORSet.DeltaOp = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ removeAll(elems.asScala.toSet) } diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala index f34afe1a84..e4af45c9f2 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/internal/ReplicationSetup.scala @@ -20,7 +20,7 @@ import pekko.persistence.typed.ReplicaId import pekko.persistence.typed.ReplicationId import pekko.util.OptionVal import pekko.util.WallClock -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala index 2dc2a8fc03..1f5bd607cb 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/Effect.scala @@ -20,7 +20,7 @@ import pekko.annotation.InternalApi import pekko.japi.function import pekko.persistence.typed.internal._ import pekko.persistence.typed.internal.SideEffect -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API: see `class EffectFactories` diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala index 0dcb374a55..f0a17fed6d 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehavior.scala @@ -204,7 +204,7 @@ abstract class EventSourcedBehavior[Command, Event, State] private[pekko] ( val snapshotWhen: (State, Event, Long) => Boolean = (state, event, seqNr) => shouldSnapshot(state, event, seqNr) val tagger: Event => Set[String] = { event => - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val tags = tagsFor(event) if (tags.isEmpty) Set.empty else tags.asScala.toSet diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala index 1adf34c10f..831c99f59e 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/javadsl/ReplicatedEventSourcing.scala @@ -23,7 +23,7 @@ import pekko.persistence.typed.PersistenceId import pekko.persistence.typed.ReplicaId import pekko.persistence.typed.ReplicationId import pekko.persistence.typed.internal.ReplicationContextImpl -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Provides access to replication specific state diff --git a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala index 4b94d3b36a..0c9ce88ef0 100644 --- a/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala +++ b/persistence-typed/src/main/scala/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcingSerializer.scala @@ -33,7 +33,7 @@ import pekko.remote.serialization.WrappedPayloadSupport import pekko.serialization.{ BaseSerializer, SerializerWithStringManifest } import scala.annotation.tailrec -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.collection.immutable.TreeMap diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala b/persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala index 7f32f5c839..4241c8ba15 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/AtLeastOnceDelivery.scala @@ -41,7 +41,7 @@ object AtLeastOnceDelivery { * Java API */ def getUnconfirmedDeliveries: java.util.List[UnconfirmedDelivery] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ unconfirmedDeliveries.asJava } @@ -57,7 +57,7 @@ object AtLeastOnceDelivery { * Java API */ def getUnconfirmedDeliveries: java.util.List[UnconfirmedDelivery] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ unconfirmedDeliveries.asJava } } diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala b/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala index e9e04d0898..c3cc3a1e03 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/Persistence.scala @@ -495,7 +495,7 @@ class Persistence(val system: ExtendedActorSystem) extends Extension { * return ranges (0 to 255), (256 to 511), (512 to 767) and (768 to 1023). */ final def getSliceRanges(numberOfRanges: Int): java.util.List[Pair[Integer, Integer]] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ sliceRanges(numberOfRanges).map(range => Pair(Integer.valueOf(range.min), Integer.valueOf(range.max))).asJava } diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala index 2ad060a694..234d71cbe8 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/EventAdapters.scala @@ -171,14 +171,14 @@ private[pekko] object EventAdapters { .to(immutable.Seq) private final def configToMap(config: Config, path: String): Map[String, String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ if (config.hasPath(path)) { config.getConfig(path).root.unwrapped.asScala.toMap.map { case (k, v) => k -> v.toString } } else Map.empty } private final def configToListMap(config: Config, path: String): Map[String, immutable.Seq[String]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ if (config.hasPath(path)) { config.getConfig(path).root.unwrapped.asScala.toMap.map { case (k, v: util.ArrayList[_]) if v.isInstanceOf[util.ArrayList[_]] => k -> v.asScala.map(_.toString).toList diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala index e269684b88..af0914e008 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/Tagged.scala @@ -13,8 +13,7 @@ package org.apache.pekko.persistence.journal -import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * The journal may support tagging of events that are used by the diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala index ab324dcca8..5ee272bf1b 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/japi/AsyncWriteJournal.scala @@ -24,7 +24,7 @@ import pekko.persistence._ import pekko.persistence.journal.{ AsyncWriteJournal => SAsyncWriteJournal } import pekko.util.ConstantFun.scalaAnyToUnit import scala.jdk.FutureConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Java API: abstract journal, optimized for asynchronous, non-blocking writes. diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala index 79fda7ff3c..869eddf01e 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/journal/leveldb/LeveldbStore.scala @@ -30,7 +30,7 @@ import pekko.persistence._ import pekko.persistence.journal.Tagged import pekko.persistence.journal.WriteJournalBase import pekko.serialization.SerializationExtension -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ private[persistence] object LeveldbStore { val emptyConfig = ConfigFactory.empty() diff --git a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala index 07bd76c683..d6648cd5f7 100644 --- a/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala +++ b/persistence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala @@ -123,7 +123,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer def atLeastOnceDeliverySnapshot( atLeastOnceDeliverySnapshot: mf.AtLeastOnceDeliverySnapshot): AtLeastOnceDeliverySnapshot = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val unconfirmedDeliveries = new VectorBuilder[UnconfirmedDelivery]() atLeastOnceDeliverySnapshot.getUnconfirmedDeliveriesList().iterator().asScala.foreach { next => unconfirmedDeliveries += UnconfirmedDelivery( @@ -227,7 +227,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer } private def atomicWrite(atomicWrite: mf.AtomicWrite): AtomicWrite = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ AtomicWrite(atomicWrite.getPayloadList.asScala.iterator.map(persistent).to(immutable.IndexedSeq)) } diff --git a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala index 2d812b721d..b555806d47 100644 --- a/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala +++ b/remote-tests/src/multi-jvm/scala/org/apache/pekko/remote/artery/TestMessage.scala @@ -63,7 +63,7 @@ class TestMessageSerializer(val system: ExtendedActorSystem) extends SerializerW override def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = { val protoMsg = proto.TestMessage.parseFrom(bytes) - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val items = protoMsg.getItemsList.asScala.map { item => TestMessage.Item(item.getId, item.getName) }.toVector diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala index 214721f510..01509ec4b3 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteDaemon.scala @@ -85,7 +85,7 @@ private[pekko] class RemoteSystemDaemon( private val allowListEnabled = system.settings.config.getBoolean("pekko.remote.deployment.enable-allow-list") private val remoteDeploymentAllowList: immutable.Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ if (allowListEnabled) system.settings.config.getStringList("pekko.remote.deployment.allowed-actor-classes").asScala.toSet else Set.empty diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala index 688c65fbe9..75e0380ac7 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteDeployer.scala @@ -21,7 +21,7 @@ import pekko.actor._ import pekko.remote.routing.RemoteRouterConfig import pekko.routing._ import pekko.routing.Pool -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ @SerialVersionUID(1L) final case class RemoteScope(node: Address) extends Scope { diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala b/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala index 1d4e3e6c29..418f395fd9 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/RemoteSettings.scala @@ -33,7 +33,7 @@ import pekko.util.Timeout final class RemoteSettings(val config: Config) { import config._ - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val Artery = ArterySettings(getConfig("pekko.remote.artery")) diff --git a/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala b/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala index aa603b12f0..751885bba6 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/RemotingLifecycleEvent.scala @@ -77,7 +77,7 @@ final case class AssociationErrorEvent( @nowarn("msg=deprecated") final case class RemotingListenEvent(listenAddresses: Set[Address]) extends RemotingLifecycleEvent { def getListenAddresses: java.util.Set[Address] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ listenAddresses.asJava } override def logLevel: Logging.LogLevel = Logging.InfoLevel diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala index 012483f3c9..0e88d416ce 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/ArterySettings.scala @@ -28,7 +28,7 @@ import pekko.util.Helpers.ConfigOps import pekko.util.Helpers.Requiring import pekko.util.Helpers.toRootLowerCase import pekko.util.WildcardIndex -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.io.dns.internal.AsyncDnsResolver /** INTERNAL API */ diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala index f61940865e..da0d70396e 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/RemoteInstrument.scala @@ -412,7 +412,7 @@ private[remote] object RemoteInstruments { def create(system: ExtendedActorSystem, @unused log: LoggingAdapter): Vector[RemoteInstrument] = { val c = system.settings.config val path = "pekko.remote.artery.advanced.instruments" - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val configuredInstruments = c .getStringList(path) .asScala diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/CompressionTable.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/CompressionTable.scala index d91975ed9d..96866fd673 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/CompressionTable.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/CompressionTable.scala @@ -33,7 +33,7 @@ private[remote] final class CompressionTable[T]( private val _dictionary: Object2IntHashMap[T]) { def dictionary: Map[T, Int] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ _dictionary.entrySet().iterator().asScala.map(entry => entry.getKey -> entry.getValue.intValue()).toMap } @@ -46,7 +46,7 @@ private[remote] final class CompressionTable[T]( // TODO: these are some expensive checks, about the numbers being consecutive, without gaps // TODO: we can remove them, make them re-map (not needed I believe though) val expectedGaplessSum = Integer.valueOf((_dictionary.size * (_dictionary.size + 1)) / 2) /* Dirichlet */ - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ require( _dictionary.values.iterator().asScala.min == 0, "Compression table should start allocating from 0, yet lowest allocated id was " + _dictionary.values diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala index aae50967c7..710dc8debc 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/compress/InboundCompressions.scala @@ -162,7 +162,7 @@ private[remote] final class InboundCompressionsImpl( } override def currentOriginUids: Set[Long] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ // can't use union because of java.lang.Long and Scala Long mismatch, // only used for testing so doesn't matter val result = Set.empty[java.lang.Long] ++ _actorRefsIns.keySet.asScala.iterator ++ diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/SSLEngineConfig.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/SSLEngineConfig.scala index cc9cc70211..6efd461e69 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/SSLEngineConfig.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/SSLEngineConfig.scala @@ -15,7 +15,7 @@ package org.apache.pekko.remote.artery.tcp.ssl import org.apache.pekko import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import com.typesafe.config.Config import scala.concurrent.duration.FiniteDuration diff --git a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala index 6cfa958383..7deeaeca91 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/X509Readers.scala @@ -19,7 +19,7 @@ import java.util import org.apache.pekko import pekko.annotation.InternalApi import javax.naming.ldap.LdapName -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/remote/src/main/scala/org/apache/pekko/remote/routing/RemoteRouterConfig.scala b/remote/src/main/scala/org/apache/pekko/remote/routing/RemoteRouterConfig.scala index ddbc53a0e8..29f528afbc 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/routing/RemoteRouterConfig.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/routing/RemoteRouterConfig.scala @@ -34,7 +34,7 @@ import pekko.routing.Routee import pekko.routing.Router import pekko.routing.RouterActor import pekko.routing.RouterConfig -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * [[pekko.routing.RouterConfig]] implementation for remote deployment on defined diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala index 5fe8b53bd1..23e7f90199 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ArteryMessageSerializer.scala @@ -133,7 +133,7 @@ private[pekko] final class ArteryMessageSerializer(val system: ExtendedActorSyst s"Manifest '$manifest' not defined for ArteryControlMessageSerializer (serializer id $identifier)") } - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ def serializeQuarantined(quarantined: Quarantined): ArteryControlFormats.Quarantined = ArteryControlFormats.Quarantined diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/DaemonMsgCreateSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/DaemonMsgCreateSerializer.scala index 303f68ff52..7f7810015f 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/DaemonMsgCreateSerializer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/DaemonMsgCreateSerializer.scala @@ -25,7 +25,7 @@ import pekko.remote.DaemonMsgCreate import pekko.remote.WireFormats.{ DaemonMsgCreateData, DeployData, PropsData } import pekko.routing.{ NoRouter, RouterConfig } import pekko.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Serializes Pekko's internal DaemonMsgCreate using protobuf @@ -169,7 +169,7 @@ private[pekko] final class DaemonMsgCreateSerializer(val system: ExtendedActorSy } def props = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val protoProps = proto.getProps val actorClass = system.dynamicAccess.getClassFor[AnyRef](protoProps.getClazz).get val args: Vector[AnyRef] = diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/MessageContainerSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/MessageContainerSerializer.scala index 484f2af6ec..9d6f3395aa 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/MessageContainerSerializer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/MessageContainerSerializer.scala @@ -78,7 +78,7 @@ class MessageContainerSerializer(val system: ExtendedActorSystem) extends BaseSe .deserialize(selectionEnvelope.getEnclosedMessage.toByteArray, selectionEnvelope.getSerializerId, manifest) .get - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val elements: immutable.Iterable[SelectionPathElement] = selectionEnvelope.getPatternList.asScala.iterator .map { x => x.getType match { diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala index 70c6c92591..456a9ca4ec 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/MiscMessageSerializer.scala @@ -30,7 +30,7 @@ import pekko.remote.WireFormats.AddressData import pekko.remote.routing.RemoteRouterConfig import pekko.routing._ import pekko.serialization.{ BaseSerializer, Serialization, SerializationExtension, SerializerWithStringManifest } -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ class MiscMessageSerializer(val system: ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer { diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala index 321fe9082c..142148d7ff 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ProtobufSerializer.scala @@ -60,7 +60,7 @@ class ProtobufSerializer(val system: ExtendedActorSystem) extends BaseSerializer private val toByteArrayMethodBindingRef = new AtomicReference[Map[Class[_], Method]](Map.empty) private val allowedClassNames: Set[String] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ system.settings.config.getStringList("pekko.serialization.protobuf.allowed-classes").asScala.toSet } diff --git a/remote/src/main/scala/org/apache/pekko/remote/serialization/ThrowableSupport.scala b/remote/src/main/scala/org/apache/pekko/remote/serialization/ThrowableSupport.scala index a50a1219bf..5452c7d65a 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/serialization/ThrowableSupport.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/serialization/ThrowableSupport.scala @@ -110,7 +110,7 @@ private[pekko] class ThrowableSupport(system: ExtendedActorSystem) { } private def fillInStackTrace(protoT: ContainerFormats.Throwable, t: Throwable): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val stackTrace = protoT.getStackTraceList.asScala.map { elem => val fileName = elem.getFileName diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala index c8420d6479..0726a9a537 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/PekkoPduCodec.scala @@ -217,7 +217,7 @@ private[remote] object PekkoPduProtobufCodec extends PekkoPduCodec { val ackAndEnvelope = AckAndEnvelopeContainer.parseFrom(raw.toArrayUnsafe()) val ackOption = if (ackAndEnvelope.hasAck) { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ Some( Ack( SeqNo(ackAndEnvelope.getAck.getCumulativeAck), diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettySSLSupport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettySSLSupport.scala index 421ce5e782..12832b520b 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettySSLSupport.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettySSLSupport.scala @@ -16,8 +16,7 @@ package org.apache.pekko.remote.transport.netty import scala.annotation.nowarn import com.typesafe.config.Config -import org.apache.pekko -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import io.netty.channel.Channel import io.netty.handler.ssl.SslHandler diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala index 4110daca3f..0cfef86623 100644 --- a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala +++ b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala @@ -90,7 +90,7 @@ object NettyFutureBridge { } def apply(nettyFuture: ChannelGroupFuture): Future[ChannelGroup] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val p = Promise[ChannelGroup]() nettyFuture.addListener((future: ChannelGroupFuture) => p.complete( diff --git a/remote/src/test/scala/org/apache/pekko/remote/DaemonicSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/DaemonicSpec.scala index eac1642be7..555600c8d5 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/DaemonicSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/DaemonicSpec.scala @@ -20,7 +20,7 @@ import com.typesafe.config.ConfigFactory import org.apache.pekko import pekko.actor.{ ActorSystem, Address } import pekko.testkit._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ class DaemonicSpec extends PekkoSpec { diff --git a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/TlsResourcesSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/TlsResourcesSpec.scala index 74c216a671..e887f065b2 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/TlsResourcesSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/artery/tcp/ssl/TlsResourcesSpec.scala @@ -22,7 +22,7 @@ import org.scalatest.wordspec.AnyWordSpec import scala.util.Try import scala.util.control.NonFatal -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** */ diff --git a/remote/src/test/scala/org/apache/pekko/remote/classic/RemoteInitErrorSpec.scala b/remote/src/test/scala/org/apache/pekko/remote/classic/RemoteInitErrorSpec.scala index 25c13db072..2865d7e2c1 100644 --- a/remote/src/test/scala/org/apache/pekko/remote/classic/RemoteInitErrorSpec.scala +++ b/remote/src/test/scala/org/apache/pekko/remote/classic/RemoteInitErrorSpec.scala @@ -25,7 +25,7 @@ import org.scalatest.wordspec.AnyWordSpec import org.apache.pekko import pekko.actor.ActorSystem -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * The 192.0.2.1 is a Documentation IP-address and should not be used at all diff --git a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonObjectMapperProvider.scala b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonObjectMapperProvider.scala index 62e3635451..b4f75fd6fb 100644 --- a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonObjectMapperProvider.scala +++ b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonObjectMapperProvider.scala @@ -259,7 +259,7 @@ object JacksonObjectMapperProvider extends ExtensionId[JacksonObjectMapperProvid dynamicAccess: DynamicAccess, log: Option[LoggingAdapter]): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val configuredModules = config.getStringList("jackson-modules").asScala val modules1 = @@ -333,13 +333,13 @@ object JacksonObjectMapperProvider extends ExtensionId[JacksonObjectMapperProvid } private def features(config: Config, section: String): immutable.Seq[(String, Boolean)] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val cfg = config.getConfig(section) cfg.root.keySet().asScala.map(key => key -> cfg.getBoolean(key)).toList } private def configPairs(config: Config, section: String): immutable.Seq[(String, String)] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val cfg = config.getConfig(section) cfg.root.keySet().asScala.map(key => key -> cfg.getString(key)).toList } diff --git a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala index 3113c9a0e1..2cdb7717fb 100644 --- a/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala +++ b/serialization-jackson/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializer.scala @@ -207,7 +207,7 @@ import pekko.util.OptionVal } } private val migrations: Map[String, JacksonMigration] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ conf.getConfig("migrations").root.unwrapped.asScala.toMap.map { case (k, v) => val transformer = system.dynamicAccess.createInstanceFor[JacksonMigration](v.toString, Nil).get @@ -216,7 +216,7 @@ import pekko.util.OptionVal } private val denyList: GadgetClassDenyList = new GadgetClassDenyList private val allowedClassPrefix = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ conf.getStringList("allowed-class-prefix").asScala.toVector } private val typeInManifest: Boolean = conf.getBoolean("type-in-manifest") diff --git a/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala b/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala index 8b8772d5fa..797b70217f 100644 --- a/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala +++ b/stream-testkit/src/main/scala/org/apache/pekko/stream/testkit/StreamTestKit.scala @@ -35,7 +35,7 @@ import pekko.stream.impl._ import pekko.testkit.{ TestActor, TestProbe } import pekko.testkit.TestActor.AutoPilot import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.reactivestreams.{ Publisher, Subscriber, Subscription } diff --git a/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala b/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala index 1f83183088..8dcbd503c9 100644 --- a/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala +++ b/stream/src/main/scala-2.13/org/apache/pekko/stream/javadsl/CollectionUtil.scala @@ -22,7 +22,7 @@ import scala.collection.immutable import org.apache.pekko import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala b/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala index e940c7062d..808cdf0f19 100644 --- a/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala +++ b/stream/src/main/scala-3/org/apache/pekko/stream/javadsl/CollectionUtil.scala @@ -22,7 +22,7 @@ import scala.collection.immutable import org.apache.pekko import pekko.annotation.InternalApi -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala b/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala index 923a2c840b..7d56485c0f 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/Attributes.scala @@ -223,7 +223,7 @@ final case class Attributes(attributeList: List[Attributes.Attribute] = Nil) { * `get` to get the most specific attribute value. */ def getAttributeList(): java.util.List[Attribute] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ attributeList.asJava } diff --git a/stream/src/main/scala/org/apache/pekko/stream/Shape.scala b/stream/src/main/scala/org/apache/pekko/stream/Shape.scala index ea63c08cb1..631d9880db 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/Shape.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/Shape.scala @@ -19,7 +19,7 @@ import scala.collection.immutable import org.apache.pekko import pekko.annotation.InternalApi import pekko.util.Collections.EmptyImmutableSeq -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * An input port of a StreamLayout.Module. This type logically belongs diff --git a/stream/src/main/scala/org/apache/pekko/stream/UniformFanInShape.scala b/stream/src/main/scala/org/apache/pekko/stream/UniformFanInShape.scala index 0490f7e650..b1abac7afe 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/UniformFanInShape.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/UniformFanInShape.scala @@ -22,7 +22,7 @@ object UniformFanInShape { /** Java API */ def create[I, O](outlet: Outlet[O], inlets: java.util.List[Inlet[I]]): UniformFanInShape[I, O] = { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ new UniformFanInShape(inlets.size, FanInShape.Ports(outlet, inlets.asScala.toList)) } } diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/Sinks.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/Sinks.scala index 2aeb19e862..3612756991 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/impl/Sinks.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/impl/Sinks.scala @@ -40,7 +40,6 @@ import pekko.stream.impl.Stages.DefaultAttributes import pekko.stream.impl.StreamLayout.AtomicModule import pekko.stream.scaladsl.{ Keep, Sink, SinkQueueWithCancel, Source } import pekko.stream.stage._ -import pekko.util.ccompat._ import org.reactivestreams.Publisher import org.reactivestreams.Subscriber @@ -245,7 +244,8 @@ import org.reactivestreams.Subscriber /** * INTERNAL API */ -@InternalApi private[pekko] final class SeqStage[T, That](implicit cbf: Factory[T, That with immutable.Iterable[_]]) +@InternalApi private[pekko] final class SeqStage[T, That]( + implicit cbf: scala.collection.Factory[T, That with immutable.Iterable[_]]) extends GraphStageWithMaterializedValue[SinkShape[T], Future[That]] { val in = Inlet[T]("seq.in") diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala index 9c8aa5b825..b6fbfeb549 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/FlattenConcat.scala @@ -288,7 +288,7 @@ private[pekko] final class FlattenConcat[T, M](parallelism: Int) } case iterable: IterableSource[T] @unchecked => addSourceElements(iterable.elements.iterator) case javaStream: JavaStreamSource[T, _] @unchecked => - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ addSourceElements(javaStream.open().iterator.asScala) case failed: FailedSource[T] @unchecked => addCompletedFutureElem(Failure(failed.failure)) case maybeEmpty if TraversalBuilder.isEmptySource(maybeEmpty) => // Empty source is discarded diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala index 4cc7cb8bbb..90ebf65215 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/impl/fusing/StreamOfStreams.scala @@ -39,7 +39,7 @@ import pekko.stream.impl.fusing.GraphStages.SingleSource import pekko.stream.scaladsl._ import pekko.stream.stage._ import pekko.util.OptionVal -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/io/FileOutputStage.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/io/FileOutputStage.scala index 6b29d68f84..c0e561d5a8 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/impl/io/FileOutputStage.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/impl/io/FileOutputStage.scala @@ -34,7 +34,7 @@ import pekko.stream.{ import pekko.stream.impl.Stages.DefaultAttributes import pekko.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler } import pekko.util.ByteString -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * INTERNAL API diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/FileIO.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/FileIO.scala index 74c941eb79..1339122c36 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/FileIO.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/FileIO.scala @@ -22,7 +22,7 @@ import pekko.stream.{ javadsl, scaladsl, IOResult } import pekko.stream.scaladsl.SinkToCompletionStage import pekko.stream.scaladsl.SourceToCompletionStage import pekko.util.ByteString -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Java API: Factories to create sinks and sources from files diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala index bbd8064678..941b5d0df3 100755 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Flow.scala @@ -366,7 +366,7 @@ object Flow { * A `Flow` is a set of stream processing steps that has one open input and one open output. */ final class Flow[In, Out, Mat](delegate: scaladsl.Flow[In, Out, Mat]) extends Graph[FlowShape[In, Out], Mat] { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ override def shape: FlowShape[In, Out] = delegate.shape override def traversalBuilder = delegate.traversalBuilder diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/FlowWithContext.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/FlowWithContext.scala index 4f4fc29c8f..8ad41493b8 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/FlowWithContext.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/FlowWithContext.scala @@ -27,7 +27,7 @@ import pekko.util.ConstantFun import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object FlowWithContext { diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Graph.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Graph.scala index 20ad8438db..54010b6081 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Graph.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Graph.scala @@ -24,7 +24,7 @@ import pekko.japi.{ function, Pair } import pekko.stream._ import pekko.stream.scaladsl.GenericGraph import pekko.util.ConstantFun -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.util.unused /** @@ -542,7 +542,7 @@ object ZipN { */ object ZipWithN { def create[A, O](zipper: function.Function[java.util.List[A], O], n: Int): Graph[UniformFanInShape[A, O], NotUsed] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ scaladsl.ZipWithN[A, O](seq => zipper.apply(seq.asJava))(n) } } diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/MergeLatest.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/MergeLatest.scala index ddb38f0b89..ae7716bd7d 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/MergeLatest.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/MergeLatest.scala @@ -16,7 +16,7 @@ package org.apache.pekko.stream.javadsl import org.apache.pekko import pekko.stream.{ scaladsl, UniformFanInShape } import pekko.stream.stage.GraphStage -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * MergeLatest joins elements from N input streams into stream of lists of size N. diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala index c6252feaf5..67954cf39f 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Sink.scala @@ -290,7 +290,7 @@ object Sink { * If there is a failure signaled in the stream the `CompletionStage` will be completed with failure. */ def takeLast[In](n: Int): Sink[In, CompletionStage[java.util.List[In]]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ new Sink( scaladsl.Sink .takeLast[In](n) @@ -308,7 +308,7 @@ object Sink { * See also [[Flow.limit]], [[Flow.limitWeighted]], [[Flow.take]], [[Flow.takeWithin]], [[Flow.takeWhile]] */ def seq[In]: Sink[In, CompletionStage[java.util.List[In]]] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ new Sink( scaladsl.Sink.seq[In].mapMaterializedValue(fut => fut.map(sq => sq.asJava)(ExecutionContext.parasitic).asJava)) } @@ -403,7 +403,7 @@ object Sink { rest: java.util.List[Sink[U, _]], fanOutStrategy: function.Function[java.lang.Integer, Graph[UniformFanOutShape[T, U], NotUsed]]) : Sink[T, NotUsed] = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val seq = if (rest ne null) rest.asScala.map(_.asScala).toSeq else immutable.Seq() new Sink(scaladsl.Sink.combine(output1.asScala, output2.asScala, seq: _*)(num => fanOutStrategy.apply(num))) } @@ -435,7 +435,7 @@ object Sink { case other => other } else immutable.Seq() - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ new Sink(scaladsl.Sink.combine(seq)(size => fanOutStrategy(size)).mapMaterializedValue(_.asJava)) } diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala index df29dcf5d1..35f8dfded5 100755 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/Source.scala @@ -37,7 +37,7 @@ import pekko.util.{ unused, _ } import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import org.reactivestreams.{ Publisher, Subscriber } @@ -829,7 +829,7 @@ object Source { */ final class Source[Out, Mat](delegate: scaladsl.Source[Out, Mat]) extends Graph[SourceShape[Out], Mat] { - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ override def shape: SourceShape[Out] = delegate.shape diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SourceWithContext.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SourceWithContext.scala index a67c2140f1..8db5182432 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SourceWithContext.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SourceWithContext.scala @@ -29,7 +29,7 @@ import pekko.util.ConstantFun import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object SourceWithContext { diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala index 77cd57c1d7..7f3b9eb980 100755 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubFlow.scala @@ -31,7 +31,7 @@ import pekko.util.ConstantFun import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ object SubFlow { diff --git a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala index 8ead1e3679..669f349b1c 100755 --- a/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/javadsl/SubSource.scala @@ -31,7 +31,7 @@ import pekko.util.ConstantFun import scala.jdk.FutureConverters._ import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * * Upcast a stream of elements to a stream of supertypes of that element. Useful in combination with diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala index d92f87a547..ccc65b115d 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/Sink.scala @@ -29,7 +29,6 @@ import pekko.stream.impl._ import pekko.stream.impl.Stages.DefaultAttributes import pekko.stream.impl.fusing.GraphStages import pekko.stream.stage._ -import pekko.util.ccompat._ import org.reactivestreams.{ Publisher, Subscriber } @@ -273,7 +272,8 @@ object Sink { * * See also [[Flow.limit]], [[Flow.limitWeighted]], [[Flow.take]], [[Flow.takeWithin]], [[Flow.takeWhile]] */ - def collection[T, That](implicit cbf: Factory[T, That with immutable.Iterable[_]]): Sink[T, Future[That]] = + def collection[T, That]( + implicit cbf: scala.collection.Factory[T, That with immutable.Iterable[_]]): Sink[T, Future[That]] = Sink.fromGraph(new SeqStage[T, That]) /** diff --git a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StatefulMapConcatAccumulator.scala b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StatefulMapConcatAccumulator.scala index da71840e7e..7ca4c23074 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StatefulMapConcatAccumulator.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/scaladsl/StatefulMapConcatAccumulator.scala @@ -57,7 +57,7 @@ private[pekko] object StatefulMapConcatAccumulatorFactory { final override def accumulator(): StatefulMapConcatAccumulator[In, Out] = new StatefulMapConcatAccumulator[In, Out] { private val accumulator = factory.accumulator() - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ final override def apply(in: In): IterableOnce[Out] = accumulator(in).asScala final override def onComplete(): IterableOnce[Out] = accumulator.onComplete().asScala } @@ -71,7 +71,7 @@ private[pekko] object StatefulMapConcatAccumulatorFactory { override def accumulator(): StatefulMapConcatAccumulator[In, Out] = new scaladsl.StatefulMapConcatAccumulator[In, Out] { private val accumulator = f.create() - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ final override def apply(in: In): IterableOnce[Out] = accumulator(in).asScala final override def onComplete(): IterableOnce[Out] = accumulator match { case acc: javadsl.StatefulMapConcatAccumulator[In, Out] @unchecked => acc.onComplete().asScala @@ -89,7 +89,7 @@ private[pekko] object StatefulMapConcatAccumulatorFactory { override def accumulator(): StatefulMapConcatAccumulator[In, Out] = new scaladsl.StatefulMapConcatAccumulator[In, Out] { private val accumulator = f() - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ final override def apply(in: In): IterableOnce[Out] = accumulator(in) final override def onComplete(): IterableOnce[Out] = accumulator match { case acc: javadsl.StatefulMapConcatAccumulator[In, Out] @unchecked => acc.onComplete().asScala diff --git a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala index 2b6d57a694..8ec5aa2d00 100644 --- a/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala +++ b/stream/src/main/scala/org/apache/pekko/stream/stage/GraphStage.scala @@ -827,7 +827,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount: andThen: Procedure[java.util.List[T]], onClose: Procedure[java.util.List[T]]): Unit = { // FIXME `onClose` is a poor name for `onComplete` rename this at the earliest possible opportunity - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ readN(in, n)(seq => andThen(seq.asJava), seq => onClose(seq.asJava)) } @@ -937,7 +937,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount: * signal. */ final protected def emitMultiple[T](out: Outlet[T], elems: java.util.Iterator[T]): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ emitMultiple(out, elems.asScala, DoNothing) } @@ -950,7 +950,7 @@ abstract class GraphStageLogic private[stream] (val inCount: Int, val outCount: * signal. */ final protected def emitMultiple[T](out: Outlet[T], elems: java.util.Iterator[T], andThen: Effect): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ emitMultiple(out, elems.asScala, andThen.apply _) } diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/ExplicitlyTriggeredScheduler.scala b/testkit/src/main/scala/org/apache/pekko/testkit/ExplicitlyTriggeredScheduler.scala index d9f745ee21..516923036b 100644 --- a/testkit/src/main/scala/org/apache/pekko/testkit/ExplicitlyTriggeredScheduler.scala +++ b/testkit/src/main/scala/org/apache/pekko/testkit/ExplicitlyTriggeredScheduler.scala @@ -28,7 +28,7 @@ import org.apache.pekko import pekko.actor.Cancellable import pekko.actor.Scheduler import pekko.event.LoggingAdapter -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ import pekko.util.unused /** diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala index a097c4f0ed..e8b0de22ec 100644 --- a/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala +++ b/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala @@ -143,7 +143,7 @@ class TestActor(queue: BlockingDeque[TestActor.Message]) extends Actor { } override def postStop() = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ queue.asScala.foreach { m => context.system.deadLetters.tell(DeadLetter(m.msg, m.sender, self), m.sender) } diff --git a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala index d1b840903b..154497cf1b 100644 --- a/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala +++ b/testkit/src/main/scala/org/apache/pekko/testkit/javadsl/TestKit.scala @@ -24,7 +24,7 @@ import pekko.actor._ import pekko.annotation.InternalApi import pekko.testkit.{ TestActor, TestDuration, TestProbe } import scala.jdk.DurationConverters._ -import pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * Java API: Test kit for testing actors. Inheriting from this class enables diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala b/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala index 70263b213e..faab9b989d 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpec.scala @@ -55,7 +55,7 @@ object PekkoSpec { """) def mapToConfig(map: Map[String, Any]): Config = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseMap(map.asJava) } diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpecSpec.scala b/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpecSpec.scala index 38820635e1..84f1c9a537 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpecSpec.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/PekkoSpecSpec.scala @@ -47,7 +47,7 @@ class PekkoSpecSpec extends AnyWordSpec with Matchers { "terminate all actors" in { // verbose config just for demonstration purposes, please leave in in case of debugging - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ val conf = Map( "pekko.actor.debug.lifecycle" -> true, "pekko.actor.debug.event-stream" -> true, diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/FileDescriptorMetricSet.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/FileDescriptorMetricSet.scala index 1a77b1ceac..e6ef642b49 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/FileDescriptorMetricSet.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/FileDescriptorMetricSet.scala @@ -20,7 +20,7 @@ import com.codahale.metrics.{ Gauge, Metric, MetricSet } import com.codahale.metrics.MetricRegistry._ import com.codahale.metrics.jvm.FileDescriptorRatioGauge -import org.apache.pekko.util.ccompat.JavaConverters._ +import scala.jdk.CollectionConverters._ /** * MetricSet exposing number of open and maximum file descriptors used by the JVM process. diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala index 25766d341f..cdb2c5f867 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKit.scala @@ -42,7 +42,7 @@ private[pekko] trait MetricsKit extends MetricsKitOps { import MetricsKit._ - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ private var reporters: List[ScheduledReporter] = Nil @@ -161,7 +161,7 @@ private[pekko] trait MetricsKit extends MetricsKitOps { } private[metrics] def getOrRegister[M <: Metric](key: String, metric: => M)(implicit tag: ClassTag[M]): M = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ registry.getMetrics.asScala.find(_._1 == key).map(_._2) match { case Some(existing: M) => existing case Some(_) => @@ -205,7 +205,7 @@ trait PekkoMetricRegistry { def getHdrHistograms = filterFor(classOf[HdrHistogram]) def getAveragingGauges = filterFor(classOf[AveragingGauge]) - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ private def filterFor[T](clazz: Class[T]): mutable.Iterable[(String, T)] = for { (key, metric) <- getMetrics.asScala diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKitOps.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKitOps.scala index 73ea03bdee..a50a5dfd42 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKitOps.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/MetricsKitOps.scala @@ -111,7 +111,7 @@ private[metrics] trait MetricsPrefix extends MetricSet { abstract override def getMetrics: util.Map[String, Metric] = { // does not have to be fast, is only called once during registering registry - import org.apache.pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ super.getMetrics.asScala.map { case (k, v) => (prefix / k).toString -> v }.asJava } } diff --git a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala index 651985f0f4..369ad39e9a 100644 --- a/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala +++ b/testkit/src/test/scala/org/apache/pekko/testkit/metrics/reporter/PekkoConsoleReporter.scala @@ -41,7 +41,7 @@ class PekkoConsoleReporter(registry: PekkoMetricRegistry, verbose: Boolean, outp histograms: util.SortedMap[String, Histogram], meters: util.SortedMap[String, Meter], timers: util.SortedMap[String, Timer]): Unit = { - import pekko.util.ccompat.JavaConverters._ + import scala.jdk.CollectionConverters._ // default Metrics types printMetrics(gauges.asScala, printGauge)