From e1eec61ca5cb4da2d20386ff6e03e30613d55926 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 12 Mar 2014 15:00:27 +0100 Subject: [PATCH] !act #3920 Remove Timeout constructor without unit --- .../src/test/scala/akka/actor/ActorRefSpec.scala | 2 +- .../src/main/scala/akka/pattern/Patterns.scala | 5 +++-- akka-actor/src/main/scala/akka/util/Timeout.scala | 14 -------------- .../rst/project/migration-guide-2.3.x-2.4.x.rst | 3 +++ .../main/scala/akka/zeromq/ZeroMQExtension.scala | 5 +++-- 5 files changed, 10 insertions(+), 19 deletions(-) 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 1afaaf2e8a..73b8ac5150 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -388,7 +388,7 @@ class ActorRefSpec extends AkkaSpec with DefaultTimeout { } "stop when sent a poison pill" in { - val timeout = Timeout(20000) + val timeout = Timeout(20.seconds) val ref = system.actorOf(Props(new Actor { def receive = { case 5 ⇒ sender() ! "five" diff --git a/akka-actor/src/main/scala/akka/pattern/Patterns.scala b/akka-actor/src/main/scala/akka/pattern/Patterns.scala index 5f2cc2dda5..81c39110a3 100644 --- a/akka-actor/src/main/scala/akka/pattern/Patterns.scala +++ b/akka-actor/src/main/scala/akka/pattern/Patterns.scala @@ -7,6 +7,7 @@ import akka.actor.{ ActorSelection, Scheduler } import scala.concurrent.ExecutionContext import java.util.concurrent.Callable import scala.concurrent.duration.FiniteDuration +import java.util.concurrent.TimeUnit object Patterns { import akka.actor.{ ActorRef, ActorSystem } @@ -76,7 +77,7 @@ object Patterns { * }}} */ def ask(actor: ActorRef, message: Any, timeoutMillis: Long): Future[AnyRef] = - scalaAsk(actor, message)(new Timeout(timeoutMillis)).asInstanceOf[Future[AnyRef]] + scalaAsk(actor, message)(new Timeout(timeoutMillis, TimeUnit.MILLISECONDS)).asInstanceOf[Future[AnyRef]] /** * Java API for `akka.pattern.ask`: @@ -140,7 +141,7 @@ object Patterns { * }}} */ def ask(selection: ActorSelection, message: Any, timeoutMillis: Long): Future[AnyRef] = - scalaAsk(selection, message)(new Timeout(timeoutMillis)).asInstanceOf[Future[AnyRef]] + scalaAsk(selection, message)(new Timeout(timeoutMillis, TimeUnit.MILLISECONDS)).asInstanceOf[Future[AnyRef]] /** * Register an onComplete callback on this [[scala.concurrent.Future]] to send diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/akka/util/Timeout.scala index eb2660eccb..3f7b54b4dc 100644 --- a/akka-actor/src/main/scala/akka/util/Timeout.scala +++ b/akka-actor/src/main/scala/akka/util/Timeout.scala @@ -13,12 +13,6 @@ import scala.concurrent.duration.{ Duration, FiniteDuration } @SerialVersionUID(1L) case class Timeout(duration: FiniteDuration) { - /** - * Construct a Timeout from the given number of milliseconds. - */ - @deprecated("please be explicit about the time unit and use the two-argument version", "2.3") - def this(timeout: Long) = this(Duration(timeout, TimeUnit.MILLISECONDS)) - /** * Construct a Timeout from the given time unit and factor. */ @@ -35,18 +29,10 @@ object Timeout { */ val zero: Timeout = new Timeout(Duration.Zero) - /** - * Construct a Timeout from the given number of milliseconds. - */ - @deprecated("please be explicit about the time unit and use the two-argument version", "2.3") - def apply(timeout: Long): Timeout = new Timeout(timeout) - /** * Construct a Timeout from the given time unit and factor. */ def apply(length: Long, unit: TimeUnit): Timeout = new Timeout(length, unit) implicit def durationToTimeout(duration: FiniteDuration): Timeout = new Timeout(duration) - implicit def intToTimeout(timeout: Int): Timeout = new Timeout(timeout) - implicit def longToTimeout(timeout: Long): Timeout = new Timeout(timeout) } diff --git a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst index 79beb63800..fbf38afb07 100644 --- a/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst +++ b/akka-docs/rst/project/migration-guide-2.3.x-2.4.x.rst @@ -38,3 +38,6 @@ The following, previously deprecated, features have been removed: Note that in router configuration you must now specify if it is a ``pool`` or a ``group`` in the way that was introduced in Akka 2.3. + +* Timeout constructor without unit + diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala index a37797adfb..e30d803131 100644 --- a/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala +++ b/akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala @@ -12,6 +12,7 @@ import scala.concurrent.Await import scala.concurrent.duration.Duration import java.util.concurrent.TimeUnit import akka.util.Timeout +import akka.util.Helpers.ConfigOps import org.zeromq.ZMQException import scala.concurrent.duration.FiniteDuration import akka.dispatch.{ UnboundedMessageQueueSemantics, RequiresMessageQueue } @@ -45,8 +46,8 @@ object ZeroMQExtension extends ExtensionId[ZeroMQExtension] with ExtensionIdProv */ class ZeroMQExtension(system: ActorSystem) extends Extension { - val DefaultPollTimeout: FiniteDuration = Duration(system.settings.config.getMilliseconds("akka.zeromq.poll-timeout"), TimeUnit.MILLISECONDS) - val NewSocketTimeout: Timeout = Timeout(Duration(system.settings.config.getMilliseconds("akka.zeromq.new-socket-timeout"), TimeUnit.MILLISECONDS)) + val DefaultPollTimeout: FiniteDuration = system.settings.config.getMillisDuration("akka.zeromq.poll-timeout") + val NewSocketTimeout: Timeout = Timeout(system.settings.config.getMillisDuration("akka.zeromq.new-socket-timeout")) val pollTimeUnit = if (version.major >= 3) TimeUnit.MILLISECONDS else TimeUnit.MICROSECONDS