From 278a36d0367c0467b8f7ee21f474e527bb7baf0f Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Wed, 10 Feb 2021 13:20:29 +0100 Subject: [PATCH] Adds explicit ! method (#30004) Needed for Scala 3 --- .../actor/dispatch/DispatcherActorSpec.scala | 2 +- .../akka/actor/dispatch/PinnedActorSpec.scala | 2 +- .../akka/actor/dungeon/DispatchSpec.scala | 1 - .../dispatch/ControlAwareDispatcherSpec.scala | 2 +- .../akka/dispatch/ExecutionContextSpec.scala | 1 - .../dispatch/ForkJoinPoolStarvationSpec.scala | 2 +- .../dispatch/PriorityDispatcherSpec.scala | 2 +- .../StablePriorityDispatcherSpec.scala | 2 +- .../AddressTerminatedTopicBenchSpec.scala | 1 - .../test/scala/akka/event/EventBusSpec.scala | 2 +- .../scala/akka/event/jul/JavaLoggerSpec.scala | 2 +- .../akka/io/TcpIntegrationSpecSupport.scala | 1 - .../akka/io/UdpConnectedIntegrationSpec.scala | 1 - .../scala/akka/io/UdpIntegrationSpec.scala | 1 - .../io/dns/internal/AsyncDnsManagerSpec.scala | 1 - .../dns/internal/AsyncDnsResolverSpec.scala | 2 +- .../akka/io/dns/internal/DnsClientSpec.scala | 1 - .../io/dns/internal/TcpDnsClientSpec.scala | 1 - .../akka/pattern/CircuitBreakerSpec.scala | 1 - .../pattern/CircuitBreakerStressSpec.scala | 1 - .../test/scala/akka/pattern/PatternSpec.scala | 2 +- .../scala/akka/pattern/StatusReplySpec.scala | 1 - .../scala/akka/routing/BalancingSpec.scala | 2 +- .../scala/akka/routing/BroadcastSpec.scala | 2 +- .../routing/ConfiguredLocalRoutingSpec.scala | 2 +- .../routing/ConsistentHashingRouterSpec.scala | 1 - .../test/scala/akka/routing/RandomSpec.scala | 2 +- .../test/scala/akka/routing/ResizerSpec.scala | 2 +- .../scala/akka/routing/RoundRobinSpec.scala | 1 - .../akka/routing/RouteeCreationSpec.scala | 1 - .../ScatterGatherFirstCompletedSpec.scala | 2 +- .../akka/routing/SmallestMailboxSpec.scala | 2 +- .../scala/akka/routing/TailChoppingSpec.scala | 2 +- .../DisabledJavaSerializerWarningSpec.scala | 1 - .../29985-actorRef-tell.excludes | 1 + .../src/main/scala/akka/actor/ActorRef.scala | 21 ++++++++++++++++++- .../akka/actor/RepointableActorRef.scala | 2 +- .../src/main/scala/akka/actor/package.scala | 2 ++ .../main/scala/akka/dispatch/Mailboxes.scala | 2 +- .../src/main/scala/akka/event/EventBus.scala | 2 +- .../main/scala/akka/event/EventStream.scala | 2 +- .../scala/akka/event/jul/JavaLogger.scala | 1 - .../akka/io/InetAddressDnsResolver.scala | 2 +- .../main/scala/akka/io/UdpConnection.scala | 2 +- .../src/main/scala/akka/io/UdpListener.scala | 2 +- .../src/main/scala/akka/io/WithUdpSend.scala | 2 +- .../io/dns/internal/AsyncDnsManager.scala | 2 +- .../io/dns/internal/AsyncDnsResolver.scala | 2 +- .../akka/io/dns/internal/DnsClient.scala | 2 +- .../akka/io/dns/internal/TcpDnsClient.scala | 2 +- .../scala/akka/pattern/HandleBackoff.scala | 2 +- .../scala/akka/pattern/PipeToSupport.scala | 2 +- .../internal/BackoffOnStopSupervisor.scala | 2 +- .../main/scala/akka/routing/Listeners.scala | 2 +- .../scala/akka/routing/RoutedActorCell.scala | 1 - .../main/scala/akka/util/MessageBuffer.scala | 2 +- .../metrics/ClusterMetricsExtensionSpec.scala | 1 - .../ClusterShardingMinMembersSpec.scala | 1 - .../ClusterShardingRolePartitioningSpec.scala | 1 - ...herHasQuarantinedThisActorSystemSpec.scala | 2 +- .../cluster/SplitBrainQuarantineSpec.scala | 2 +- .../journal/ReplayFilterSpec.scala | 1 - .../scala/akka/stream/scaladsl/FlowSpec.scala | 1 - .../main/scala/akka/testkit/TestActors.scala | 2 +- .../akka/testkit/TestEventListener.scala | 2 +- .../scala/akka/testkit/TestActorsSpec.scala | 1 - 66 files changed, 62 insertions(+), 64 deletions(-) create mode 100644 akka-actor/src/main/mima-filters/2.6.12.backwards.excludes/29985-actorRef-tell.excludes diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala index 8f8d16bff6..9e888cd997 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.pattern.ask import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala index b319f7c1c0..65dbee95b5 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.Await import org.scalatest.BeforeAndAfterEach -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.pattern.ask import akka.testkit._ import akka.testkit.AkkaSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala index 296fb9dc9a..e32feedb5a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala @@ -6,7 +6,6 @@ package akka.actor.dungeon import akka.actor.Actor import akka.actor.Props -import akka.actor.actorRef2Scala import akka.testkit._ object DispatchSpec { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala index aa5e3f0ef3..b04706eb90 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala @@ -4,7 +4,7 @@ package akka.dispatch -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout } object ControlAwareDispatcherSpec { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala index 7a44d1640b..140c884aa8 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala @@ -13,7 +13,6 @@ import scala.concurrent.duration._ import akka.actor.Actor import akka.actor.Props -import akka.actor.actorRef2Scala import akka.testkit.{ AkkaSpec, DefaultTimeout, TestLatch } import akka.testkit.CallingThreadDispatcher import akka.testkit.TestActorRef diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala index b96b01d724..3e2b172193 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala @@ -6,7 +6,7 @@ package akka.dispatch import com.typesafe.config.ConfigFactory -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, ImplicitSender } object ForkJoinPoolStarvationSpec { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala index 1726ccf20d..0ae1ed718b 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -9,7 +9,7 @@ import scala.concurrent.duration._ import com.typesafe.config.Config import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, ActorSystem, Props } +import akka.actor.{ Actor, ActorSystem, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.util.unused diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala index 070f661320..9e881f558b 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala @@ -9,7 +9,7 @@ import scala.concurrent.duration._ import com.typesafe.config.Config import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, ActorSystem, Props } +import akka.actor.{ Actor, ActorSystem, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.util.unused diff --git a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala index f25482e9d7..69c621f7fb 100644 --- a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala @@ -10,7 +10,6 @@ import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Props -import akka.actor.actorRef2Scala import akka.testkit._ object AddressTerminatedTopicBenchSpec { diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index 566ff1fa24..0f22f6abcd 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -10,7 +10,7 @@ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps import org.scalatest.BeforeAndAfterEach -import akka.actor.{ actorRef2Scala, Actor, ActorRef, ActorSystem, PoisonPill, Props } +import akka.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props } import akka.japi.Procedure import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala index 23b6f14079..000f671319 100644 --- a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala @@ -10,7 +10,7 @@ import scala.util.control.NoStackTrace import com.typesafe.config.ConfigFactory -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, Props } +import akka.actor.{ Actor, ActorLogging, Props } import akka.testkit.AkkaSpec @deprecated("Use SLF4J instead.", "2.6.0") diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala index d964181cfb..29558d10b3 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala @@ -11,7 +11,6 @@ import Tcp._ import akka.actor.ActorRef import akka.actor.ActorSystem -import akka.actor.actorRef2Scala import akka.dispatch.ExecutionContexts import akka.io.Inet.SocketOption import akka.testkit.{ AkkaSpec, TestProbe } diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala index 43225281a1..f27b46396d 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala @@ -9,7 +9,6 @@ import java.net.InetSocketAddress import scala.concurrent.duration._ import akka.actor.ActorRef -import akka.actor.actorRef2Scala import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.SocketUtil.temporaryServerAddresses diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala index 0e0a30b3e4..adb0a84d54 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala @@ -8,7 +8,6 @@ import java.net.DatagramSocket import java.net.InetSocketAddress import akka.actor.ActorRef -import akka.actor.actorRef2Scala import akka.io.Inet._ import akka.io.Udp._ import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala index fb2b298781..8062f300fb 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala @@ -10,7 +10,6 @@ import scala.collection.immutable.Seq import scala.annotation.nowarn -import akka.actor.actorRef2Scala import akka.io.Dns import akka.io.dns.AAAARecord import akka.io.dns.CachePolicy.Ttl diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala index 9264467aad..60cf29ffa0 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala @@ -11,7 +11,7 @@ import scala.concurrent.duration._ import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory } -import akka.actor.{ actorRef2Scala, ActorRef, ExtendedActorSystem, Props } +import akka.actor.{ ActorRef, ExtendedActorSystem, Props } import akka.actor.Status.Failure import akka.io.SimpleDnsCache import akka.io.dns.{ AAAARecord, ARecord, DnsSettings, SRVRecord } diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala index 3e8a1ff26d..ee94bb8a7c 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala @@ -10,7 +10,6 @@ import java.util.concurrent.atomic.AtomicBoolean import scala.collection.immutable.Seq import akka.actor.Props -import akka.actor.actorRef2Scala import akka.io.Udp import akka.io.dns.{ RecordClass, RecordType } import akka.io.dns.internal.DnsClient.{ Answer, Question4 } diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala index 22f908de35..a21f88aed9 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala @@ -9,7 +9,6 @@ import java.net.InetSocketAddress import scala.collection.immutable.Seq import akka.actor.Props -import akka.actor.actorRef2Scala import akka.io.Tcp import akka.io.Tcp.{ Connected, PeerClosed, Register } import akka.io.dns.{ RecordClass, RecordType } diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala index 702e2958e3..a55b2e5c74 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala @@ -16,7 +16,6 @@ import scala.util.Success import scala.util.Try import akka.actor.ActorSystem -import akka.actor.actorRef2Scala import akka.testkit._ object CircuitBreakerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala index d07a0cb43f..dea6efc929 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala @@ -14,7 +14,6 @@ import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.Props import akka.actor.Status.Failure -import akka.actor.actorRef2Scala import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala index 97304c80ad..0870837b0d 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, TestLatch } object PatternSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala index 530246d30b..d40c2648e6 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/StatusReplySpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.duration._ import org.scalatest.concurrent.ScalaFutures import akka.Done -import akka.actor.actorRef2Scala import akka.testkit.AkkaSpec import akka.testkit.TestException import akka.testkit.TestProbe diff --git a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala index 246eedf27d..7b14fcdaef 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala @@ -12,7 +12,7 @@ import scala.concurrent.duration._ import org.scalatest.BeforeAndAfterEach -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.actor.ActorRef import akka.testkit.{ AkkaSpec, ImplicitSender, TestLatch } diff --git a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala index 2e46b67394..0adeb813bb 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.pattern.ask import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala index 8d3293b09d..7acc1e6665 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala @@ -13,7 +13,7 @@ import com.typesafe.config.Config import language.postfixOps import akka.ConfigurationException -import akka.actor.{ actorRef2Scala, Actor, ActorRef, Deploy, Props } +import akka.actor.{ Actor, ActorRef, Deploy, Props } import akka.actor.ActorPath import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala index ab47f6a15a..9da8cb8497 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.ExecutionContextExecutor import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props -import akka.actor.actorRef2Scala import akka.pattern.ask import akka.routing.ConsistentHashingRouter.ConsistentHashMapping import akka.routing.ConsistentHashingRouter.ConsistentHashable diff --git a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala index cacb448b5b..1adf074529 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala @@ -11,7 +11,7 @@ import scala.concurrent.duration._ import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.pattern.ask import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala index 46db149a62..17ada67ec3 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala @@ -10,7 +10,7 @@ import scala.concurrent.duration._ import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps -import akka.actor.{ actorRef2Scala, Actor, ActorRef, ActorSystem, Props } +import akka.actor.{ Actor, ActorRef, ActorSystem, Props } import akka.pattern.ask import akka.testkit._ import akka.testkit.TestEvent._ diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala index 44a27cc947..db671aee44 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala @@ -15,7 +15,6 @@ import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props import akka.actor.Terminated -import akka.actor.actorRef2Scala import akka.pattern.ask import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala index 789d8ba3fc..434f4c9c11 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala @@ -10,7 +10,6 @@ import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.Identify import akka.actor.Props -import akka.actor.actorRef2Scala import akka.testkit.AkkaSpec class RouteeCreationSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala index 6a11c41c91..3282810a53 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.actor.ActorSystem import akka.actor.Status import akka.pattern.ask diff --git a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala index 9c9877056d..e5f9207fb5 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap import scala.concurrent.Await -import akka.actor.{ actorRef2Scala, Actor, Props } +import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } class SmallestMailboxSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala index 9155d9c527..e996a357fb 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.{ actorRef2Scala, Actor, ActorRef, ActorSystem, Props } +import akka.actor.{ Actor, ActorRef, ActorSystem, Props } import akka.actor.Status.Failure import akka.pattern.{ ask, AskTimeoutException } import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala index f6ed77251c..a9cace488d 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala @@ -9,7 +9,6 @@ import java.nio.{ ByteBuffer, ByteOrder } import scala.concurrent.duration._ import akka.actor.ExtendedActorSystem -import akka.actor.actorRef2Scala import akka.testkit._ object DisabledJavaSerializerWarningSpec { diff --git a/akka-actor/src/main/mima-filters/2.6.12.backwards.excludes/29985-actorRef-tell.excludes b/akka-actor/src/main/mima-filters/2.6.12.backwards.excludes/29985-actorRef-tell.excludes new file mode 100644 index 0000000000..ed932d5a2b --- /dev/null +++ b/akka-actor/src/main/mima-filters/2.6.12.backwards.excludes/29985-actorRef-tell.excludes @@ -0,0 +1 @@ +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.actor.ActorRef.!") \ No newline at end of file diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index 5689938a1b..243aa99865 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -7,6 +7,7 @@ package akka.actor import java.util.concurrent.ConcurrentHashMap import scala.annotation.tailrec +import scala.annotation.nowarn import scala.collection.immutable import scala.util.control.NonFatal @@ -103,6 +104,7 @@ object ActorRef { * about the exact actor incarnation you can use the ``ActorPath`` as key because * the unique id of the actor is not taken into account when comparing actor paths. */ +@nowarn("msg=deprecated") abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable { scalaRef: InternalActorRef with ActorRefScope => @@ -128,6 +130,22 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable */ final def tell(msg: Any, sender: ActorRef): Unit = this.!(msg)(sender) + /** + * Scala API: Sends a one-way asynchronous message. E.g. fire-and-forget semantics. + *

+ * + * If invoked from within an actor then the actor reference is implicitly passed on as the implicit 'sender' argument. + *

+ * + * This actor 'sender' reference is then available in the receiving actor in the 'sender()' member variable, + * if invoked from within an Actor. If not then no sender is available. + * 

+   *   actor ! message
+   *
+ *

+ */ + def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit + /** * Forwards the message and passes the original sender actor as the sender. * @@ -167,6 +185,7 @@ abstract class ActorRef extends java.lang.Comparable[ActorRef] with Serializable * There are implicit conversions in package.scala * from ActorRef -> ScalaActorRef and back */ +@deprecated("tell method is now provided by ActorRef trait", "2.6.13") trait ScalaActorRef { ref: ActorRef with InternalActorRef with ActorRefScope => /** @@ -184,7 +203,6 @@ trait ScalaActorRef { ref: ActorRef with InternalActorRef with ActorRefScope => *

*/ def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit - } /** @@ -233,6 +251,7 @@ private[akka] trait RepointableRef extends ActorRefScope { * * DO NOT USE THIS UNLESS INTERNALLY WITHIN AKKA! */ +@nowarn("msg=deprecated") @InternalApi private[akka] abstract class InternalActorRef extends ActorRef with ScalaActorRef { this: ActorRefScope => /* * Actor life-cycle management, invoked only internally (in response to user requests via ActorContext). diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala index c792c60324..1e936a448a 100644 --- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala @@ -179,7 +179,7 @@ private[akka] class RepointableActorRef( def children: immutable.Iterable[ActorRef] = lookup.childrenRefs.children - def !(message: Any)(implicit sender: ActorRef = Actor.noSender) = underlying.sendMessage(message, sender) + def !(message: Any)(implicit sender: ActorRef = Actor.noSender): Unit = underlying.sendMessage(message, sender) def sendSystemMessage(message: SystemMessage) = underlying.sendSystemMessage(message) diff --git a/akka-actor/src/main/scala/akka/actor/package.scala b/akka-actor/src/main/scala/akka/actor/package.scala index f78f442cef..7dd7c3dbf7 100644 --- a/akka-actor/src/main/scala/akka/actor/package.scala +++ b/akka-actor/src/main/scala/akka/actor/package.scala @@ -7,6 +7,8 @@ package akka import language.implicitConversions package object actor { + @deprecated("implicit conversion is obsolete", "2.6.13") @inline implicit final def actorRef2Scala(ref: ActorRef): ScalaActorRef = ref.asInstanceOf[ScalaActorRef] + @deprecated("implicit conversion is obsolete", "2.6.13") @inline implicit final def scala2ActorRef(ref: ScalaActorRef): ActorRef = ref.asInstanceOf[ActorRef] } diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala index a8691f90d8..6b219e25bd 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala @@ -15,7 +15,7 @@ import scala.util.control.NonFatal import com.typesafe.config.{ Config, ConfigFactory } import akka.ConfigurationException -import akka.actor.{ actorRef2Scala, Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props } +import akka.actor.{ Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props } import akka.dispatch.sysmsg.{ EarliestFirstSystemMessageList, LatestFirstSystemMessageList, diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala index 852f837dd5..b3615e8a8c 100644 --- a/akka-actor/src/main/scala/akka/event/EventBus.scala +++ b/akka-actor/src/main/scala/akka/event/EventBus.scala @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicReference import scala.collection.immutable -import akka.actor.{ actorRef2Scala, ActorRef, ActorSystem } +import akka.actor.{ ActorRef, ActorSystem } import akka.util.{ Subclassification, SubclassifiedIndex } import akka.util.Index diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala index 1ac47c832a..766be57546 100644 --- a/akka-actor/src/main/scala/akka/event/EventStream.scala +++ b/akka-actor/src/main/scala/akka/event/EventStream.scala @@ -10,7 +10,7 @@ import scala.annotation.tailrec import scala.annotation.nowarn -import akka.actor.{ actorRef2Scala, ActorRef, ActorSystem } +import akka.actor.{ ActorRef, ActorSystem } import akka.event.Logging.simpleName import akka.util.Subclassification diff --git a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala b/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala index e2eef2d3c3..2e63820c26 100644 --- a/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala +++ b/akka-actor/src/main/scala/akka/event/jul/JavaLogger.scala @@ -8,7 +8,6 @@ import java.util.logging import akka.actor.Actor import akka.actor.ActorSystem -import akka.actor.actorRef2Scala import akka.dispatch.RequiresMessageQueue import akka.event.DummyClassForStringSources import akka.event.EventStream diff --git a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala b/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala index 2ca779c35f..e84df47b39 100644 --- a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala +++ b/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala @@ -17,7 +17,7 @@ import scala.util.{ Failure, Success, Try } import scala.annotation.nowarn import com.typesafe.config.Config -import akka.actor.{ actorRef2Scala, Actor, ActorLogging } +import akka.actor.{ Actor, ActorLogging } import akka.actor.Status import akka.annotation.InternalApi import akka.io.dns.AAAARecord diff --git a/akka-actor/src/main/scala/akka/io/UdpConnection.scala b/akka-actor/src/main/scala/akka/io/UdpConnection.scala index 32940ec067..2742b22bdb 100644 --- a/akka-actor/src/main/scala/akka/io/UdpConnection.scala +++ b/akka-actor/src/main/scala/akka/io/UdpConnection.scala @@ -12,7 +12,7 @@ import java.nio.channels.SelectionKey._ import scala.annotation.tailrec import scala.util.control.NonFatal -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef } +import akka.actor.{ Actor, ActorLogging, ActorRef } import akka.actor.Status.Failure import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.SelectionHandler._ diff --git a/akka-actor/src/main/scala/akka/io/UdpListener.scala b/akka-actor/src/main/scala/akka/io/UdpListener.scala index 7d5a8d77be..820854fc88 100644 --- a/akka-actor/src/main/scala/akka/io/UdpListener.scala +++ b/akka-actor/src/main/scala/akka/io/UdpListener.scala @@ -11,7 +11,7 @@ import java.nio.channels.SelectionKey._ import scala.annotation.tailrec import scala.util.control.NonFatal -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef } +import akka.actor.{ Actor, ActorLogging, ActorRef } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.Inet.DatagramChannelCreator import akka.io.SelectionHandler._ diff --git a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala b/akka-actor/src/main/scala/akka/io/WithUdpSend.scala index 1e9dc9b9fd..61be77e98c 100644 --- a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala +++ b/akka-actor/src/main/scala/akka/io/WithUdpSend.scala @@ -9,7 +9,7 @@ import java.nio.channels.{ DatagramChannel, SelectionKey } import scala.util.control.NonFatal -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef } +import akka.actor.{ Actor, ActorLogging, ActorRef } import akka.io.SelectionHandler._ import akka.io.Udp.{ CommandFailed, Send } import akka.io.dns.DnsProtocol diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala index e8ae50c880..5163cac411 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala @@ -13,7 +13,7 @@ import scala.concurrent.duration.Duration import scala.annotation.nowarn import com.typesafe.config.Config -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers } +import akka.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers } import akka.annotation.InternalApi import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.{ Dns, DnsExt, DnsProvider } diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala index 62149c12ed..36312c0773 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala @@ -12,7 +12,7 @@ import scala.concurrent.Future import scala.util.Try import scala.util.control.NonFatal -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef, ActorRefFactory } +import akka.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory } import akka.annotation.InternalApi import akka.io.SimpleDnsCache import akka.io.dns._ diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala index f7f7b8f285..9f46649b14 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala @@ -12,7 +12,7 @@ import scala.util.Try import scala.annotation.nowarn -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash } +import akka.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash } import akka.actor.Status.Failure import akka.annotation.InternalApi import akka.io.{ IO, Tcp, Udp } diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala index d8a59d4a10..b852905a47 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala @@ -7,7 +7,7 @@ package akka.io.dns.internal import java.net.InetSocketAddress import akka.AkkaException -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, ActorRef, Stash } +import akka.actor.{ Actor, ActorLogging, ActorRef, Stash } import akka.annotation.InternalApi import akka.io.Tcp import akka.io.dns.internal.DnsClient.Answer diff --git a/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala b/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala index 9306cb86f0..c016c304fe 100644 --- a/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala +++ b/akka-actor/src/main/scala/akka/pattern/HandleBackoff.scala @@ -4,7 +4,7 @@ package akka.pattern -import akka.actor.{ actorRef2Scala, Actor, ActorRef, Props } +import akka.actor.{ Actor, ActorRef, Props } import akka.annotation.InternalApi /** diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala index 453ee3cce8..b256c3aaf7 100644 --- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala @@ -12,7 +12,7 @@ import scala.util.{ Failure, Success } import language.implicitConversions -import akka.actor.{ actorRef2Scala, Actor, ActorRef, Status } +import akka.actor.{ Actor, ActorRef, Status } import akka.actor.ActorSelection import akka.util.unused diff --git a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala index d0d64b0e19..2205a33ce9 100644 --- a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala @@ -6,7 +6,7 @@ package akka.pattern.internal import scala.concurrent.duration.FiniteDuration -import akka.actor.{ actorRef2Scala, Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated } +import akka.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated } import akka.actor.SupervisorStrategy.{ Directive, Escalate } import akka.annotation.InternalApi import akka.pattern.{ diff --git a/akka-actor/src/main/scala/akka/routing/Listeners.scala b/akka-actor/src/main/scala/akka/routing/Listeners.scala index 739865f8c4..d8d62451cd 100644 --- a/akka-actor/src/main/scala/akka/routing/Listeners.scala +++ b/akka-actor/src/main/scala/akka/routing/Listeners.scala @@ -6,7 +6,7 @@ package akka.routing import java.util.{ Set, TreeSet } -import akka.actor.{ actorRef2Scala, Actor, ActorRef } +import akka.actor.{ Actor, ActorRef } sealed trait ListenerMessage final case class Listen(listener: ActorRef) extends ListenerMessage diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala b/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala index 185578d259..d96601f7b8 100644 --- a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala +++ b/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala @@ -18,7 +18,6 @@ import akka.actor.PoisonPill import akka.actor.Props import akka.actor.SupervisorStrategy import akka.actor.Terminated -import akka.actor.actorRef2Scala import akka.dispatch.Envelope import akka.dispatch.MessageDispatcher import akka.util.ccompat._ diff --git a/akka-actor/src/main/scala/akka/util/MessageBuffer.scala b/akka-actor/src/main/scala/akka/util/MessageBuffer.scala index 2a6ad19393..80ac99f0a3 100644 --- a/akka-actor/src/main/scala/akka/util/MessageBuffer.scala +++ b/akka-actor/src/main/scala/akka/util/MessageBuffer.scala @@ -4,7 +4,7 @@ package akka.util -import akka.actor.{ actorRef2Scala, ActorRef, Dropped } +import akka.actor.{ ActorRef, Dropped } import akka.annotation.InternalApi import akka.japi.function.Procedure2 diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala index 177ef9d8a5..60f6189cdb 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala @@ -7,7 +7,6 @@ package akka.cluster.metrics import scala.concurrent.duration._ import scala.language.postfixOps -import akka.actor._ import akka.cluster.Cluster import akka.cluster.metrics.StandardMetrics._ import akka.testkit._ diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala index 23f4ec873a..c91c6711e2 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala @@ -6,7 +6,6 @@ package akka.cluster.sharding import scala.concurrent.duration._ -import akka.actor._ import akka.cluster.MemberStatus import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats } diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala index 73e3d6bbcd..6b53cbd5c7 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala @@ -8,7 +8,6 @@ import scala.concurrent.duration._ import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor._ import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats } import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala index 9dcffe648a..ac1b7183f2 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2020 Lightbend Inc. + * Copyright (C) 2009-2021 Lightbend Inc. */ package akka.cluster diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala index 82922951ed..d660df8dbd 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainQuarantineSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2020 Lightbend Inc. + * Copyright (C) 2009-2021 Lightbend Inc. */ package akka.cluster diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala index 5c859a694d..aff61ac679 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala @@ -4,7 +4,6 @@ package akka.persistence.journal -import akka.actor._ import akka.persistence.JournalProtocol import akka.persistence.PersistentRepr import akka.testkit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 443b073000..44d38bf3b7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -16,7 +16,6 @@ import com.typesafe.config.ConfigFactory import org.reactivestreams.{ Publisher, Subscriber } import akka.NotUsed -import akka.actor._ import akka.stream._ import akka.stream.impl._ import akka.stream.testkit._ diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActors.scala b/akka-testkit/src/main/scala/akka/testkit/TestActors.scala index 1f042a7bb8..fee46cbd2c 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestActors.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestActors.scala @@ -4,7 +4,7 @@ package akka.testkit -import akka.actor.{ actorRef2Scala, Actor, ActorRef, Props } +import akka.actor.{ Actor, ActorRef, Props } /** * A collection of common actor patterns used in tests. diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index 5c834092fa..dd4d72058c 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -11,7 +11,7 @@ import scala.concurrent.duration.Duration import scala.reflect.ClassTag import scala.util.matching.Regex -import akka.actor.{ actorRef2Scala, ActorSystem, DeadLetter, UnhandledMessage } +import akka.actor.{ ActorSystem, DeadLetter, UnhandledMessage } import akka.actor.Dropped import akka.actor.NoSerializationVerificationNeeded import akka.dispatch.sysmsg.{ SystemMessage, Terminate } diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorsSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorsSpec.scala index e7cbc17d5d..fb103b6a14 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorsSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorsSpec.scala @@ -4,7 +4,6 @@ package akka.testkit -import akka.actor.actorRef2Scala class TestActorsSpec extends AkkaSpec with ImplicitSender { import TestActors.{ echoActorProps, forwardActorProps }