From 2bed2cb9547c235e44cccbc69f82411004b8451c Mon Sep 17 00:00:00 2001 From: Roland Date: Wed, 18 Jan 2012 10:18:51 +0100 Subject: [PATCH] move everything into package akka.pattern --- .../akka/actor/ActorFireForgetRequestReplySpec.scala | 2 +- .../test/scala/akka/actor/ActorLifeCycleSpec.scala | 2 +- .../src/test/scala/akka/actor/ActorLookupSpec.scala | 2 +- .../src/test/scala/akka/actor/ActorRefSpec.scala | 2 +- .../src/test/scala/akka/actor/ActorTimeoutSpec.scala | 2 +- .../src/test/scala/akka/actor/DeathWatchSpec.scala | 2 +- .../src/test/scala/akka/actor/ForwardActorSpec.scala | 2 +- .../src/test/scala/akka/actor/IOActor.scala | 2 +- .../test/scala/akka/actor/RestartStrategySpec.scala | 2 +- .../src/test/scala/akka/actor/SchedulerSpec.scala | 2 +- .../scala/akka/actor/SupervisorHierarchySpec.scala | 2 +- .../test/scala/akka/actor/SupervisorMiscSpec.scala | 2 +- .../src/test/scala/akka/actor/SupervisorSpec.scala | 2 +- .../test/scala/akka/actor/SupervisorTreeSpec.scala | 2 +- .../src/test/scala/akka/actor/Ticket669Spec.scala | 2 +- .../src/test/scala/akka/actor/TypedActorSpec.scala | 2 +- .../scala/akka/actor/dispatch/ActorModelSpec.scala | 2 +- .../akka/actor/dispatch/DispatcherActorSpec.scala | 2 +- .../scala/akka/actor/dispatch/PinnedActorSpec.scala | 2 +- .../src/test/scala/akka/dataflow/Future2Actor.scala | 2 +- .../src/test/scala/akka/dispatch/FutureSpec.scala | 2 +- .../scala/akka/dispatch/PriorityDispatcherSpec.scala | 2 +- .../src/test/scala/akka/routing/ActorPoolSpec.scala | 2 +- .../akka/routing/ConfiguredLocalRoutingSpec.scala | 2 +- .../src/test/scala/akka/routing/RoutingSpec.scala | 2 +- .../scala/akka/serialization/SerializeSpec.scala | 2 +- .../src/test/scala/akka/ticket/Ticket703Spec.scala | 2 +- akka-actor/src/main/scala/akka/actor/ActorRef.scala | 4 ++-- .../src/main/scala/akka/actor/ActorSystem.scala | 2 +- .../src/main/scala/akka/actor/TypedActor.scala | 2 +- akka-actor/src/main/scala/akka/event/Logging.scala | 2 +- .../akka/{patterns => pattern}/AskableActorRef.scala | 6 +++--- .../src/main/scala/akka/{ => pattern}/Patterns.scala | 6 +++--- .../scala/akka/{patterns => pattern}/package.scala | 4 ++-- akka-agent/src/main/scala/akka/agent/Agent.scala | 2 +- .../code/akka/docs/actor/FaultHandlingTestBase.java | 2 +- .../akka/docs/actor/UntypedActorDocTestBase.java | 2 +- .../code/akka/docs/future/FutureDocTestBase.java | 2 +- .../code/akka/docs/transactor/TransactorDocTest.java | 2 +- .../scala/code/akka/docs/actor/ActorDocSpec.scala | 6 +++--- .../scala/code/akka/docs/future/FutureDocSpec.scala | 12 ++++++------ .../code/akka/docs/routing/RouterTypeExample.scala | 2 +- .../code/akka/docs/testkit/TestkitDocSpec.scala | 4 ++-- .../akka/docs/transactor/TransactorDocSpec.scala | 2 +- .../src/main/scala/akka/remote/Gossiper.scala | 2 +- .../remote/DirectRoutedRemoteActorMultiJvmSpec.scala | 2 +- .../akka/remote/NewRemoteActorMultiJvmSpec.scala | 2 +- .../remote/RandomRoutedRemoteActorMultiJvmSpec.scala | 2 +- .../RoundRobinRoutedRemoteActorMultiJvmSpec.scala | 2 +- .../scala/akka/remote/RemoteCommunicationSpec.scala | 2 +- .../src/main/scala/akka/testkit/TestActorRef.scala | 2 +- .../src/test/scala/akka/testkit/AkkaSpec.scala | 2 +- .../test/scala/akka/testkit/TestActorRefSpec.scala | 2 +- .../src/test/scala/akka/testkit/TestProbeSpec.scala | 2 +- .../transactor/UntypedCoordinatedIncrementTest.java | 2 +- .../java/akka/transactor/UntypedTransactorTest.java | 2 +- .../akka/transactor/CoordinatedIncrementSpec.scala | 2 +- .../scala/akka/transactor/FickleFriendsSpec.scala | 2 +- .../test/scala/akka/transactor/TransactorSpec.scala | 2 +- 59 files changed, 73 insertions(+), 73 deletions(-) rename akka-actor/src/main/scala/akka/{patterns => pattern}/AskableActorRef.scala (96%) rename akka-actor/src/main/scala/akka/{ => pattern}/Patterns.scala (97%) rename akka-actor/src/main/scala/akka/{patterns => pattern}/package.scala (97%) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala index 8a4d643e29..4665c8dbf6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorFireForgetRequestReplySpec.scala @@ -8,7 +8,7 @@ import akka.testkit._ import org.scalatest.BeforeAndAfterEach import akka.util.duration._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object ActorFireForgetRequestReplySpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala index 016b738c45..e85dffa45b 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala @@ -12,7 +12,7 @@ import akka.testkit._ import akka.util.duration._ import java.util.concurrent.atomic._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object ActorLifeCycleSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala index 8a990e18ca..135a7efe0a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLookupSpec.scala @@ -6,7 +6,7 @@ package akka.actor import akka.testkit._ import akka.util.duration._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object ActorLookupSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala index a78a99a79b..8dbd1c9a8c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -15,7 +15,7 @@ import akka.util.ReflectiveAccess import akka.serialization.Serialization import java.util.concurrent.{ CountDownLatch, TimeUnit } import akka.dispatch.{ Await, DefaultPromise, Promise, Future } -import akka.patterns.ask +import akka.pattern.ask object ActorRefSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala index 1c9a7e67d6..e5b2303140 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala @@ -10,7 +10,7 @@ import akka.testkit.DefaultTimeout import java.util.concurrent.TimeoutException import akka.dispatch.Await import akka.util.Timeout -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ActorTimeoutSpec extends AkkaSpec with BeforeAndAfterAll with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala index 1a9c84ecd9..b704991203 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala @@ -8,7 +8,7 @@ import akka.testkit._ import akka.util.duration._ import java.util.concurrent.atomic._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class LocalDeathWatchSpec extends AkkaSpec with ImplicitSender with DefaultTimeout with DeathWatchSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala index a019b4afb3..95ecfe1280 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala @@ -9,7 +9,7 @@ import akka.util.duration._ import Actor._ import akka.util.Duration import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object ForwardActorSpec { val ExpectedMessage = "FOO" diff --git a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala index aaa86e9c3e..0d70da3649 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/IOActor.scala @@ -11,7 +11,7 @@ import akka.util.cps._ import scala.util.continuations._ import akka.testkit._ import akka.dispatch.{ Await, Future } -import akka.patterns.ask +import akka.pattern.ask object IOActorSpec { import IO._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala index 0730b8de7c..49d0359e16 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala @@ -14,7 +14,7 @@ import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout import akka.testkit.TestLatch import akka.util.duration._ -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class RestartStrategySpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala index 1269558cf9..6d0bde2299 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala @@ -8,7 +8,7 @@ import java.util.concurrent.{ CountDownLatch, ConcurrentLinkedQueue, TimeUnit } import akka.testkit.DefaultTimeout import akka.testkit.TestLatch import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class SchedulerSpec extends AkkaSpec with BeforeAndAfterEach with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala index 88139f97f8..883f771547 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala @@ -8,7 +8,7 @@ import akka.testkit._ import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object SupervisorHierarchySpec { class FireWorkerException(msg: String) extends Exception(msg) diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala index 8b32f76e49..319521fa1f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala @@ -8,7 +8,7 @@ import akka.dispatch.{ PinnedDispatcher, Dispatchers, Await } import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout -import akka.patterns.ask +import akka.pattern.ask object SupervisorMiscSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala index 8405e29e8e..90b3b2d760 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala @@ -11,7 +11,7 @@ import akka.testkit.TestEvent._ import akka.testkit._ import java.util.concurrent.atomic.AtomicInteger import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object SupervisorSpec { val Timeout = 5 seconds diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala index 6ebca690a7..8c8284ec2a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala @@ -12,7 +12,7 @@ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.DefaultTimeout import akka.dispatch.{ Await, Dispatchers } -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class SupervisorTreeSpec extends AkkaSpec with ImplicitSender with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala index f3a0784da2..54aa978ba9 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala @@ -11,7 +11,7 @@ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.DefaultTimeout import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index 7cde57720c..28e8fb8d8f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -18,7 +18,7 @@ import java.util.concurrent.{ TimeUnit, CountDownLatch } import akka.japi.{ Creator, Option ⇒ JOption } import akka.testkit.DefaultTimeout import akka.dispatch.{ Await, Dispatchers, Future, Promise } -import akka.patterns.ask +import akka.pattern.ask object TypedActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index c242617753..c9cddba4b3 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -20,7 +20,7 @@ import akka.util.duration._ import akka.event.Logging.Error import com.typesafe.config.Config import akka.util.Duration -import akka.patterns.ask +import akka.pattern.ask object ActorModelSpec { 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 1160883e09..2dce8346db 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 @@ -8,7 +8,7 @@ import akka.util.Duration import akka.util.duration._ import akka.testkit.DefaultTimeout import akka.dispatch.{ Await, PinnedDispatcher, Dispatchers, Dispatcher } -import akka.patterns.ask +import akka.pattern.ask object DispatcherActorSpec { val config = """ 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 4ddcb8ba12..6c66784e5d 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 @@ -7,7 +7,7 @@ import akka.actor.{ Props, Actor } import akka.testkit.AkkaSpec import org.scalatest.BeforeAndAfterEach import akka.dispatch.{ Await, PinnedDispatcher, Dispatchers } -import akka.patterns.ask +import akka.pattern.ask object PinnedActorSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala index 48992a5ee7..91cc9b2c93 100644 --- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala +++ b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala @@ -9,7 +9,7 @@ import akka.actor.future2actor import akka.util.duration._ import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout -import akka.patterns.ask +import akka.pattern.ask class Future2ActorSpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala index c874ea68b7..face8580f2 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala @@ -16,7 +16,7 @@ import akka.testkit.DefaultTimeout import akka.testkit.TestLatch import java.util.concurrent.{ TimeoutException, TimeUnit, CountDownLatch } import scala.runtime.NonLocalReturnControl -import akka.patterns.ask +import akka.pattern.ask object FutureSpec { class TestActor extends Actor { 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 82fcc372fa..2bb4ab73e5 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -2,7 +2,7 @@ package akka.dispatch import akka.actor.{ Props, LocalActorRef, Actor } import akka.testkit.AkkaSpec -import akka.patterns.ask +import akka.pattern.ask import akka.util.duration._ import akka.testkit.DefaultTimeout import com.typesafe.config.Config diff --git a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala index bfdb168156..5d6cc16eda 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala @@ -6,7 +6,7 @@ import akka.util.duration._ import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger } import akka.testkit.AkkaSpec import akka.dispatch.{ Await, Promise, Future } -import akka.patterns.ask +import akka.pattern.ask object ActorPoolSpec { 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 2d4a4be1c2..3cc1d6893f 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicInteger import akka.testkit._ import akka.util.duration._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class ConfiguredLocalRoutingSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala index dff790f50f..ad5afa4383 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala @@ -12,7 +12,7 @@ import akka.dispatch.Await import akka.util.Duration import akka.config.ConfigurationException import com.typesafe.config.ConfigFactory -import akka.patterns.ask +import akka.pattern.ask object RoutingSpec { diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index cfec55413d..02e2a30865 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -13,7 +13,7 @@ import akka.util.Timeout import akka.util.duration._ import scala.reflect.BeanInfo import com.google.protobuf.Message -import akka.patterns.ask +import akka.pattern.ask class ProtobufSerializer extends Serializer { val ARRAY_OF_BYTE_ARRAY = Array[Class[_]](classOf[Array[Byte]]) diff --git a/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala b/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala index 63367ff508..7357de4802 100644 --- a/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/ticket/Ticket703Spec.scala @@ -5,7 +5,7 @@ import akka.routing._ import akka.testkit.AkkaSpec import akka.dispatch.Await import akka.util.duration._ -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class Ticket703Spec extends AkkaSpec { diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index e7c03e8ae0..9ebae64e62 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -168,7 +168,7 @@ trait LocalRef extends ActorRefScope { } /** - * Trait for matching on ActorRefs which have access to a provider; this is used in akka.patterns.ask. + * Trait for matching on ActorRefs which have access to a provider; this is used in akka.pattern.ask. */ trait ActorRefWithProvider { this: InternalActorRef ⇒ def provider: ActorRefProvider @@ -472,7 +472,7 @@ class AskTimeoutException(message: String, cause: Throwable) extends TimeoutExce } /** - * Akka private optimized representation of the temporary actor spawned to + * Akka private optimized representation of the temporary actor spawned to * receive the reply to an "ask" operation. */ private[akka] final class PromiseActorRef( diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index 098099c1d1..68a6eb6dc8 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -7,7 +7,7 @@ import akka.config.ConfigurationException import akka.actor._ import akka.event._ import akka.dispatch._ -import akka.patterns.ask +import akka.pattern.ask import akka.util.duration._ import akka.util.Timeout import akka.util.Timeout._ diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala index 87fbd98f47..cc0972c56e 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala @@ -396,7 +396,7 @@ object TypedActor extends ExtensionId[TypedActorExtension] with ExtensionIdProvi case "equals" ⇒ (args.length == 1 && (proxy eq args(0)) || actor == extension.getActorRefFor(args(0))).asInstanceOf[AnyRef] //Force boxing of the boolean case "hashCode" ⇒ actor.hashCode.asInstanceOf[AnyRef] case _ ⇒ - import akka.patterns.ask + import akka.pattern.ask MethodCall(method, args) match { case m if m.isOneWay ⇒ actor ! m; null //Null return value case m if m.returnsFuture_? ⇒ actor.?(m, timeout) diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala index bb0f881c94..6fcf116f80 100644 --- a/akka-actor/src/main/scala/akka/event/Logging.scala +++ b/akka-actor/src/main/scala/akka/event/Logging.scala @@ -158,7 +158,7 @@ trait LoggingBus extends ActorEventBus { val name = "log" + Extension(system).id() + "-" + simpleName(clazz) val actor = system.systemActorOf(Props(clazz), name) implicit val timeout = Timeout(3 seconds) - import akka.patterns.ask + import akka.pattern.ask val response = try Await.result(actor ? InitializeLogger(this), timeout.duration) catch { case _: TimeoutException ⇒ publish(Warning(simpleName(this), "Logger " + name + " did not respond within " + timeout + " to InitializeLogger(bus)")) diff --git a/akka-actor/src/main/scala/akka/patterns/AskableActorRef.scala b/akka-actor/src/main/scala/akka/pattern/AskableActorRef.scala similarity index 96% rename from akka-actor/src/main/scala/akka/patterns/AskableActorRef.scala rename to akka-actor/src/main/scala/akka/pattern/AskableActorRef.scala index 1b42fc664c..faa4c4d5c0 100644 --- a/akka-actor/src/main/scala/akka/patterns/AskableActorRef.scala +++ b/akka-actor/src/main/scala/akka/pattern/AskableActorRef.scala @@ -1,7 +1,7 @@ /** * Copyright (C) 2009-2011 Typesafe Inc. */ -package akka.patterns +package akka.pattern import akka.actor.{ ActorRef, InternalActorRef, AskTimeoutException } import akka.dispatch.{ Future, Promise } @@ -37,7 +37,7 @@ final class AskableActorRef(val actorRef: ActorRef) { * * [see the [[akka.dispatch.Future]] companion object for a description of `flow`] */ - def ask(message: AnyRef)(implicit timeout: Timeout): Future[Any] = akka.patterns.ask(actorRef, message)(timeout) + def ask(message: AnyRef)(implicit timeout: Timeout): Future[Any] = akka.pattern.ask(actorRef, message)(timeout) /** * Sends a message asynchronously and returns a [[akka.dispatch.Future]] @@ -67,7 +67,7 @@ final class AskableActorRef(val actorRef: ActorRef) { * * [see the [[akka.dispatch.Future]] companion object for a description of `flow`] */ - def ?(message: Any)(implicit timeout: Timeout): Future[Any] = akka.patterns.ask(actorRef, message) + def ?(message: Any)(implicit timeout: Timeout): Future[Any] = akka.pattern.ask(actorRef, message) /* * FIXME: I think this should be removed, since it introduces an “ambiguity” diff --git a/akka-actor/src/main/scala/akka/Patterns.scala b/akka-actor/src/main/scala/akka/pattern/Patterns.scala similarity index 97% rename from akka-actor/src/main/scala/akka/Patterns.scala rename to akka-actor/src/main/scala/akka/pattern/Patterns.scala index 7650c4077f..bc86877f40 100644 --- a/akka-actor/src/main/scala/akka/Patterns.scala +++ b/akka-actor/src/main/scala/akka/pattern/Patterns.scala @@ -1,12 +1,12 @@ /** * Copyright (C) 2009-2011 Typesafe Inc. */ -package akka +package akka.pattern object Patterns { import akka.actor.ActorRef import akka.dispatch.Future - import akka.patterns.{ ask ⇒ scalaAsk } + import akka.pattern.{ ask ⇒ scalaAsk } import akka.util.Timeout /** @@ -68,4 +68,4 @@ object Patterns { * }}} */ def ask(actor: ActorRef, message: Any, timeoutMillis: Long): Future[AnyRef] = scalaAsk(actor, message)(new Timeout(timeoutMillis)).asInstanceOf[Future[AnyRef]] -} \ No newline at end of file +} diff --git a/akka-actor/src/main/scala/akka/patterns/package.scala b/akka-actor/src/main/scala/akka/pattern/package.scala similarity index 97% rename from akka-actor/src/main/scala/akka/patterns/package.scala rename to akka-actor/src/main/scala/akka/pattern/package.scala index d0cd07766a..bfd6384c21 100644 --- a/akka-actor/src/main/scala/akka/patterns/package.scala +++ b/akka-actor/src/main/scala/akka/pattern/package.scala @@ -3,7 +3,7 @@ */ package akka -package object patterns { +package object pattern { import akka.actor.{ ActorRef, InternalActorRef, ActorRefWithProvider, AskTimeoutException } import akka.dispatch.{ Future, Promise } @@ -15,7 +15,7 @@ package object patterns { * `ask(actorRef, message)(timeout)` method defined here. * * {{{ - * import akka.patterns.ask + * import akka.pattern.ask * * val future = actor ? message // => ask(actor, message) * val future = actor ask message // => ask(actor, message) diff --git a/akka-agent/src/main/scala/akka/agent/Agent.scala b/akka-agent/src/main/scala/akka/agent/Agent.scala index 8337c0f64b..cd19a0c781 100644 --- a/akka-agent/src/main/scala/akka/agent/Agent.scala +++ b/akka-agent/src/main/scala/akka/agent/Agent.scala @@ -7,7 +7,7 @@ package akka.agent import akka.actor._ import akka.japi.{ Function ⇒ JFunc, Procedure ⇒ JProc } import akka.dispatch._ -import akka.patterns.ask +import akka.pattern.ask import akka.util.Timeout import scala.concurrent.stm._ diff --git a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java b/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java index f67347b2af..507b812baa 100644 --- a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java +++ b/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java @@ -13,7 +13,7 @@ import akka.actor.Props; import akka.actor.Terminated; import akka.actor.UntypedActor; import akka.dispatch.Await; -import static akka.Patterns.ask; +import static akka.pattern.Patterns.ask; import akka.util.Duration; import akka.testkit.AkkaSpec; import akka.testkit.TestProbe; diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java index 4944f817f5..fb6aa72d2f 100644 --- a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java +++ b/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java @@ -38,7 +38,7 @@ import org.junit.Test; import scala.Option; import java.lang.Object; import java.util.concurrent.TimeUnit; -import akka.Patterns; +import akka.pattern.Patterns; import static org.junit.Assert.*; diff --git a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java index dd10afd165..37f0436b27 100644 --- a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java +++ b/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java @@ -55,7 +55,7 @@ import akka.actor.UntypedActor; import akka.actor.ActorRef; import akka.actor.Props; import akka.dispatch.Futures; -import akka.Patterns; +import akka.pattern.Patterns; import static org.junit.Assert.*; diff --git a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java b/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java index bb2f069dd0..38b60d4888 100644 --- a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java +++ b/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java @@ -10,7 +10,7 @@ import org.junit.Test; //#imports import akka.actor.*; import akka.dispatch.Await; -import static akka.Patterns.ask; +import static akka.pattern.Patterns.ask; import akka.transactor.Coordinated; import akka.util.Duration; import akka.util.Timeout; diff --git a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala b/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala index fac3411cde..7cf551081b 100644 --- a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala +++ b/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala @@ -220,7 +220,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) { "using ask" in { //#using-ask - import akka.patterns.ask + import akka.pattern.ask class MyActor extends Actor { def receive = { @@ -245,7 +245,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) { //#using-implicit-timeout import akka.util.duration._ import akka.util.Timeout - import akka.patterns.ask + import akka.pattern.ask implicit val timeout = Timeout(500 millis) val future = myActor ? "hello" //#using-implicit-timeout @@ -257,7 +257,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) { val myActor = system.actorOf(Props(new FirstActor)) //#using-explicit-timeout import akka.util.duration._ - import akka.patterns.ask + import akka.pattern.ask val future = myActor ? ("hello", timeout = 500 millis) //#using-explicit-timeout Await.result(future, 500 millis) must be("hello") diff --git a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala index 5c86a0c295..cdf866336a 100644 --- a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala +++ b/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala @@ -44,7 +44,7 @@ class FutureDocSpec extends AkkaSpec { val msg = "hello" //#ask-blocking import akka.dispatch.Await - import akka.patterns.ask + import akka.pattern.ask implicit val timeout = system.settings.ActorTimeout val future = actor ? msg // enabled by the “ask” import @@ -59,7 +59,7 @@ class FutureDocSpec extends AkkaSpec { implicit val timeout = system.settings.ActorTimeout //#map-to import akka.dispatch.Future - import akka.patterns.ask + import akka.pattern.ask val future: Future[String] = ask(actor, msg).mapTo[String] //#map-to @@ -149,7 +149,7 @@ class FutureDocSpec extends AkkaSpec { val msg2 = 2 implicit val timeout = system.settings.ActorTimeout import akka.dispatch.Await - import akka.patterns.ask + import akka.pattern.ask //#composing-wrong val f1 = ask(actor1, msg1) @@ -173,7 +173,7 @@ class FutureDocSpec extends AkkaSpec { val msg2 = 2 implicit val timeout = system.settings.ActorTimeout import akka.dispatch.Await - import akka.patterns.ask + import akka.pattern.ask //#composing val f1 = ask(actor1, msg1) @@ -195,7 +195,7 @@ class FutureDocSpec extends AkkaSpec { val oddActor = system.actorOf(Props[OddActor]) //#sequence-ask // oddActor returns odd numbers sequentially from 1 as a List[Future[Int]] - val listOfFutures = List.fill(100)(akka.patterns.ask(oddActor, GetNext).mapTo[Int]) + val listOfFutures = List.fill(100)(akka.pattern.ask(oddActor, GetNext).mapTo[Int]) // now we have a Future[List[Int]] val futureList = Future.sequence(listOfFutures) @@ -243,7 +243,7 @@ class FutureDocSpec extends AkkaSpec { val actor = system.actorOf(Props[MyActor]) val msg1 = -1 //#recover - val future = akka.patterns.ask(actor, msg1) recover { + val future = akka.pattern.ask(actor, msg1) recover { case e: ArithmeticException ⇒ 0 } //#recover diff --git a/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala b/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala index bc3f370f5b..ebe29a8219 100644 --- a/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala +++ b/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala @@ -8,7 +8,7 @@ import annotation.tailrec import akka.actor.{ Props, Actor } import akka.util.duration._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask case class FibonacciNumber(nbr: Int) diff --git a/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala b/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala index b3ff8d2e05..89d95b3252 100644 --- a/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala +++ b/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala @@ -120,7 +120,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { import akka.testkit.TestActorRef import akka.util.duration._ import akka.dispatch.Await - import akka.patterns.ask + import akka.pattern.ask val actorRef = TestActorRef(new MyActor) // hypothetical message stimulating a '42' answer @@ -204,7 +204,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { "demonstrate probe reply" in { import akka.testkit.TestProbe import akka.util.duration._ - import akka.patterns.ask + import akka.pattern.ask //#test-probe-reply val probe = TestProbe() val future = probe.ref ? "hello" diff --git a/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala b/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala index 2cde9c9890..ed94589499 100644 --- a/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala +++ b/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala @@ -141,7 +141,7 @@ class TransactorDocSpec extends AkkaSpec { import akka.dispatch.Await import akka.util.duration._ import akka.util.Timeout - import akka.patterns.ask + import akka.pattern.ask val system = ActorSystem("app") diff --git a/akka-remote/src/main/scala/akka/remote/Gossiper.scala b/akka-remote/src/main/scala/akka/remote/Gossiper.scala index 3ff54b5efe..788e86bb1c 100644 --- a/akka-remote/src/main/scala/akka/remote/Gossiper.scala +++ b/akka-remote/src/main/scala/akka/remote/Gossiper.scala @@ -22,7 +22,7 @@ import scala.annotation.tailrec import com.google.protobuf.ByteString import java.util.concurrent.TimeoutException import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask /** * Interface for node membership change listener. diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala index 58c52d8971..36ba02a980 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala @@ -5,7 +5,7 @@ import akka.routing._ import akka.actor.{ Actor, Props } import akka.testkit._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object DirectRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec { override def NrOfNodes = 2 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala index cc8f62552c..cfdb6ae2dd 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala @@ -6,7 +6,7 @@ import akka.routing._ import akka.testkit._ import akka.util.duration._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object NewRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec { override def NrOfNodes = 2 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala index d466c014b3..2c81d9d03d 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala @@ -5,7 +5,7 @@ import akka.remote._ import akka.routing._ import akka.testkit.DefaultTimeout import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object RandomRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec { override def NrOfNodes = 4 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala index 22eb8cd8c3..8381e14755 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala @@ -5,7 +5,7 @@ import akka.remote._ import akka.routing._ import akka.testkit.DefaultTimeout import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object RoundRobinRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec { override def NrOfNodes = 4 diff --git a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala index 17068cc351..4f1fb545c0 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteCommunicationSpec.scala @@ -7,7 +7,7 @@ import akka.testkit._ import akka.actor._ import com.typesafe.config._ import akka.dispatch.Await -import akka.patterns.ask +import akka.pattern.ask object RemoteCommunicationSpec { class Echo extends Actor { diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala index 01ce145afa..eb9d12b56a 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicLong import akka.event.EventStream import scala.collection.immutable.Stack import akka.dispatch._ -import akka.patterns.ask +import akka.pattern.ask /** * This special ActorRef is exclusively for use during unit testing in a single-threaded environment. Therefore, it diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index e47587fc9c..329d11fc39 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -17,7 +17,7 @@ import akka.actor.DeadLetter import java.util.concurrent.TimeoutException import akka.dispatch.{ Await, MessageDispatcher } import akka.dispatch.Dispatchers -import akka.patterns.ask +import akka.pattern.ask object TimingTest extends Tag("timing") diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala index b742165f1d..18359fcfda 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala @@ -10,7 +10,7 @@ import akka.event.Logging.Warning import akka.dispatch.{ Future, Promise, Await } import akka.util.duration._ import akka.actor.ActorSystem -import akka.patterns.ask +import akka.pattern.ask /** * Test whether TestActorRef behaves as an ActorRef should, besides its own spec. diff --git a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala index 6a4a9db420..516bba7322 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala @@ -6,7 +6,7 @@ import org.scalatest.{ BeforeAndAfterEach, WordSpec } import akka.actor._ import akka.util.duration._ import akka.dispatch.{ Await, Future } -import akka.patterns.ask +import akka.pattern.ask @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) class TestProbeSpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java index d282a638fc..3ae9046c8b 100644 --- a/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java +++ b/akka-transactor/src/test/java/akka/transactor/UntypedCoordinatedIncrementTest.java @@ -18,7 +18,7 @@ import akka.actor.UntypedActor; import akka.actor.UntypedActorFactory; import akka.dispatch.Await; import akka.dispatch.Future; -import static akka.Patterns.ask; +import static akka.pattern.Patterns.ask; import akka.testkit.AkkaSpec; import akka.testkit.EventFilter; import akka.testkit.ErrorFilter; diff --git a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java index 2a6e30ea81..8898ec096f 100644 --- a/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java +++ b/akka-transactor/src/test/java/akka/transactor/UntypedTransactorTest.java @@ -18,7 +18,7 @@ import akka.actor.UntypedActor; import akka.actor.UntypedActorFactory; import akka.dispatch.Await; import akka.dispatch.Future; -import static akka.Patterns.ask; +import static akka.pattern.Patterns.ask; import akka.testkit.AkkaSpec; import akka.testkit.EventFilter; import akka.testkit.ErrorFilter; diff --git a/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala b/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala index 2c2e4376e9..b5319b2dc2 100644 --- a/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala +++ b/akka-transactor/src/test/scala/akka/transactor/CoordinatedIncrementSpec.scala @@ -12,7 +12,7 @@ import akka.util.duration._ import akka.util.Timeout import akka.testkit._ import scala.concurrent.stm._ -import akka.patterns.ask +import akka.pattern.ask object CoordinatedIncrement { case class Increment(friends: Seq[ActorRef]) diff --git a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala index a8e4e1ad0e..7184c7d520 100644 --- a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala +++ b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala @@ -15,7 +15,7 @@ import akka.testkit.TestEvent.Mute import scala.concurrent.stm._ import scala.util.Random.{ nextInt ⇒ random } import java.util.concurrent.CountDownLatch -import akka.patterns.ask +import akka.pattern.ask object FickleFriends { case class FriendlyIncrement(friends: Seq[ActorRef], timeout: Timeout, latch: CountDownLatch) diff --git a/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala b/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala index 2d5797c97a..bba7c20612 100644 --- a/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala +++ b/akka-transactor/src/test/scala/akka/transactor/TransactorSpec.scala @@ -10,7 +10,7 @@ import akka.util.duration._ import akka.util.Timeout import akka.testkit._ import scala.concurrent.stm._ -import akka.patterns.ask +import akka.pattern.ask object TransactorIncrement { case class Increment(friends: Seq[ActorRef], latch: TestLatch)