diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala index d7ac4e0ce1..2909034934 100644 --- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala @@ -70,7 +70,7 @@ trait AskSupport { * } pipeTo nextActor * }}} * - * [see [[scala.concurrent.Future]] for a description of `flow`] + * See [[scala.concurrent.Future]] for a description of `flow` */ def ask(actorRef: ActorRef, message: Any)(implicit timeout: Timeout): Future[Any] = actorRef match { case ref: InternalActorRef if ref.isTerminated ⇒ @@ -119,7 +119,7 @@ trait AskSupport { * } pipeTo nextActor * }}} * - * [see the [[scala.concurrent.Future]] companion object for a description of `flow`] + * See the [[scala.concurrent.Future]] companion object for a description of `flow` */ def ask(message: Any)(implicit timeout: Timeout): Future[Any] = akka.pattern.ask(actorRef, message)(timeout) @@ -149,7 +149,7 @@ trait AskSupport { * } pipeTo nextActor * }}} * - * [see the [[scala.concurrent.Future]] companion object for a description of `flow`] + * See the [[scala.concurrent.Future]] companion object for a description of `flow` */ def ?(message: Any)(implicit timeout: Timeout): Future[Any] = akka.pattern.ask(actorRef, message)(timeout) } diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala index 2bd4dfb71c..64c2e7c21a 100644 --- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala +++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala @@ -34,8 +34,8 @@ object CircuitBreaker { * * @param scheduler Reference to Akka scheduler * @param maxFailures Maximum number of failures before opening the circuit - * @param callTimeout [[akka.util.Duration]] of time after which to consider a call a failure - * @param resetTimeout [[akka.util.Duration]] of time after which to attempt to close the circuit + * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure + * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit */ def apply(scheduler: Scheduler, maxFailures: Int, callTimeout: Duration, resetTimeout: Duration): CircuitBreaker = new CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Duration, resetTimeout: Duration)(syncExecutionContext) @@ -48,8 +48,8 @@ object CircuitBreaker { * * @param scheduler Reference to Akka scheduler * @param maxFailures Maximum number of failures before opening the circuit - * @param callTimeout [[akka.util.Duration]] of time after which to consider a call a failure - * @param resetTimeout [[akka.util.Duration]] of time after which to attempt to close the circuit + * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure + * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit */ def create(scheduler: Scheduler, maxFailures: Int, callTimeout: Duration, resetTimeout: Duration): CircuitBreaker = apply(scheduler: Scheduler, maxFailures: Int, callTimeout: Duration, resetTimeout: Duration) @@ -71,9 +71,9 @@ object CircuitBreaker { * * @param scheduler Reference to Akka scheduler * @param maxFailures Maximum number of failures before opening the circuit - * @param callTimeout [[akka.util.Duration]] of time after which to consider a call a failure - * @param resetTimeout [[akka.util.Duration]] of time after which to attempt to close the circuit - * @param executor [[akka.dispatch.ExecutionContext]] used for execution of state transition listeners + * @param callTimeout [[scala.concurrent.util.Duration]] of time after which to consider a call a failure + * @param resetTimeout [[scala.concurrent.util.Duration]] of time after which to attempt to close the circuit + * @param executor [[scala.concurrent.ExecutionContext]] used for execution of state transition listeners */ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Duration, resetTimeout: Duration)(implicit executor: ExecutionContext) extends AbstractCircuitBreaker { @@ -152,7 +152,7 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Durati /** * Adds a callback to execute when circuit breaker opens * - * The callback is run in the [[akka.dispatch.ExecutionContext]] supplied in the constructor. + * The callback is run in the [[scala.concurrent.ExecutionContext]] supplied in the constructor. * * @param callback Handler to be invoked on state change * @tparam T Type supplied to assist with type inference, otherwise ignored by implementation @@ -175,7 +175,7 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Durati /** * Adds a callback to execute when circuit breaker transitions to half-open * - * The callback is run in the [[akka.dispatch.ExecutionContext]] supplied in the constructor. + * The callback is run in the [[scala.concurrent.ExecutionContext]] supplied in the constructor. * * @param callback Handler to be invoked on state change * @tparam T Type supplied to assist with type inference, otherwise ignored by implementation @@ -198,7 +198,7 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Durati /** * Adds a callback to execute when circuit breaker state closes * - * The callback is run in the [[akka.dispatch.ExecutionContext]] supplied in the constructor. + * The callback is run in the [[scala.concurrent.ExecutionContext]] supplied in the constructor. * * @param callback Handler to be invoked on state change * @tparam T Type supplied to assist with type inference, otherwise ignored by implementation @@ -281,7 +281,7 @@ class CircuitBreaker(scheduler: Scheduler, maxFailures: Int, callTimeout: Durati /** * Notifies the listeners of the transition event via a Future executed in implicit parameter ExecutionContext * - * @return Promise which executes listener in supplied [[akka.dispatch.ExecutionContext]] + * @return Promise which executes listener in supplied [[scala.concurrent.ExecutionContext]] */ protected def notifyTransitionListeners() { if (hasListeners) { diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala index cca90d6543..09f1cf9bd8 100644 --- a/akka-actor/src/main/scala/akka/routing/Routing.scala +++ b/akka-actor/src/main/scala/akka/routing/Routing.scala @@ -277,7 +277,7 @@ trait CustomRoute { /** * Base trait for `Router` actors. Override `receive` to handle custom - * messages which the corresponding [[akka.actor.RouterConfig]] lets + * messages which the corresponding [[akka.routing.RouterConfig]] lets * through by returning an empty route. */ trait Router extends Actor { diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala index ac2af5c1b5..afffa75ac4 100644 --- a/akka-actor/src/main/scala/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala/akka/util/ByteString.scala @@ -241,10 +241,10 @@ object ByteString { } /** - * A [[http://en.wikipedia.org/wiki/Rope_(computer_science) Rope-like]] immutable - * data structure containing bytes. The goal of this structure is to reduce - * copying of arrays when concatenating and slicing sequences of bytes, and also - * providing a thread safe way of working with bytes. + * A rope-like immutable data structure containing bytes. + * The goal of this structure is to reduce copying of arrays + * when concatenating and slicing sequences of bytes, + * and also providing a thread safe way of working with bytes. * * TODO: Add performance characteristics */ diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala index e12456d2cf..7a6f7a915a 100644 --- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala +++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala @@ -185,7 +185,7 @@ private[camel] class ActorProducer(val endpoint: ActorEndpoint, camel: Camel) ex } /** - * For internal use only. Converts Strings to [[akka.util.Duration]]s + * For internal use only. Converts Strings to [[scala.concurrent.util.Duration]] */ private[camel] object DurationTypeConverter extends TypeConverter { override def convertTo[T](`type`: Class[T], value: AnyRef): T = `type`.cast(try { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala index da612b57bf..eba2e85055 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala @@ -13,7 +13,7 @@ import akka.util.Deadline import java.util.concurrent.TimeoutException import scala.collection.immutable.SortedSet import akka.dispatch.Await -import akka.util.Duration +import scala.concurrent.util.Duration import java.util.concurrent.TimeUnit import akka.remote.testconductor.RoleName diff --git a/akka-docs/scala/testing.rst b/akka-docs/scala/testing.rst index 61da6aa6f5..d9183e30b5 100644 --- a/akka-docs/scala/testing.rst +++ b/akka-docs/scala/testing.rst @@ -695,7 +695,7 @@ Some `Specs2 `_ users have contributed examples of how to wor actually beneficial also for the third point—is to apply the TestKit together with :class:`org.specs2.specification.Scope`. * The Specification traits provide a :class:`Duration` DSL which uses partly - the same method names as :class:`akka.util.Duration`, resulting in ambiguous + the same method names as :class:`scala.concurrent.util.Duration`, resulting in ambiguous implicits if ``akka.util.duration._`` is imported. There are two work-arounds: * either use the Specification variant of Duration and supply an implicit