#2292 - Removing akka.util.Duration etc and replace it with scala.concurrent.util.Duration

akka-docs/scala/code/docs/actor/ActorDocSpec.scala

@@ -18,7 +18,7 @@ import org.scalatest.{ BeforeAndAfterAll, WordSpec }
 import org.scalatest.matchers.MustMatchers
 import akka.testkit._
 import akka.util._
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.actor.Actor.Receive
 import akka.dispatch.Await
 
@@ -244,7 +244,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using implicit timeout" in {
     val myActor = system.actorOf(Props(new FirstActor))
     //#using-implicit-timeout
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.util.Timeout
     import akka.pattern.ask
     implicit val timeout = Timeout(5 seconds)
@@ -257,7 +257,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using explicit timeout" in {
     val myActor = system.actorOf(Props(new FirstActor))
     //#using-explicit-timeout
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.pattern.ask
     val future = myActor.ask("hello")(5 seconds)
     //#using-explicit-timeout
@@ -267,7 +267,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using receiveTimeout" in {
     //#receive-timeout
     import akka.actor.ReceiveTimeout
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     class MyActor extends Actor {
       context.setReceiveTimeout(30 milliseconds)
       def receive = {

akka-docs/scala/code/docs/actor/FSMDocSpec.scala

@@ -15,7 +15,7 @@ class FSMDocSpec extends AkkaSpec {
     //#fsm-code-elided
     //#simple-imports
     import akka.actor.{ Actor, ActorRef, FSM }
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     //#simple-imports
     //#simple-events
     // received events

akka-docs/scala/code/docs/actor/FaultHandlingDocSample.scala

@@ -9,8 +9,8 @@ import language.postfixOps
 //#imports
 import akka.actor._
 import akka.actor.SupervisorStrategy._
-import akka.util.duration._
-import akka.util.Duration
+import scala.concurrent.util.duration._
+import scala.concurrent.util.Duration
 import akka.util.Timeout
 import akka.event.LoggingReceive
 import akka.pattern.{ ask, pipe }

akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala

@@ -22,7 +22,7 @@ object FaultHandlingDocSpec {
     //#strategy
     import akka.actor.OneForOneStrategy
     import akka.actor.SupervisorStrategy._
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
       case _: ArithmeticException      ⇒ Resume
@@ -43,7 +43,7 @@ object FaultHandlingDocSpec {
     //#strategy2
     import akka.actor.OneForOneStrategy
     import akka.actor.SupervisorStrategy._
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
       case _: ArithmeticException      ⇒ Resume

akka-docs/scala/code/docs/actor/SchedulerDocSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 //#imports1
 import akka.actor.Actor
 import akka.actor.Props
-import akka.util.duration._
+import scala.concurrent.util.duration._
 
 //#imports1
 

akka-docs/scala/code/docs/actor/TypedActorDocSpec.scala

@@ -7,7 +7,7 @@ import language.postfixOps
 
 //#imports
 import akka.dispatch.{ Promise, Future, Await }
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.actor.{ ActorContext, TypedActor, TypedProps }
 
 //#imports

akka-docs/scala/code/docs/agent/AgentDocSpec.scala

@@ -6,7 +6,7 @@ package docs.agent
 import language.postfixOps
 
 import akka.agent.Agent
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.util.Timeout
 import akka.testkit._
 
@@ -99,7 +99,7 @@ class AgentDocSpec extends AkkaSpec {
     val agent = Agent(0)
 
     //#read-await
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.util.Timeout
 
     implicit val timeout = Timeout(5 seconds)
@@ -126,7 +126,7 @@ class AgentDocSpec extends AkkaSpec {
   "transfer example" in {
     //#transfer-example
     import akka.agent.Agent
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.util.Timeout
     import scala.concurrent.stm._
 

akka-docs/scala/code/docs/dispatcher/DispatcherDocSpec.scala

@@ -10,7 +10,7 @@ import org.scalatest.matchers.MustMatchers
 import akka.testkit.AkkaSpec
 import akka.event.Logging
 import akka.event.LoggingAdapter
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.actor.{ Props, Actor, PoisonPill, ActorSystem }
 
 object DispatcherDocSpec {

akka-docs/scala/code/docs/extension/SettingsExtensionDocSpec.scala

@@ -8,7 +8,7 @@ import akka.actor.Extension
 import akka.actor.ExtensionId
 import akka.actor.ExtensionIdProvider
 import akka.actor.ExtendedActorSystem
-import akka.util.Duration
+import scala.concurrent.util.Duration
 import com.typesafe.config.Config
 import java.util.concurrent.TimeUnit
 

akka-docs/scala/code/docs/future/FutureDocSpec.scala

@@ -12,7 +12,7 @@ import akka.actor.Actor
 import akka.actor.Props
 import akka.actor.Status.Failure
 import akka.util.Timeout
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import java.lang.IllegalStateException
 import akka.dispatch.{ ExecutionContext, Future, Await, Promise }
 
@@ -64,7 +64,7 @@ class FutureDocSpec extends AkkaSpec {
     import akka.dispatch.Await
     import akka.pattern.ask
     import akka.util.Timeout
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     implicit val timeout = Timeout(5 seconds)
     val future = actor ? msg // enabled by the “ask” import
@@ -90,7 +90,7 @@ class FutureDocSpec extends AkkaSpec {
     //#future-eval
     import akka.dispatch.Await
     import akka.dispatch.Future
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     val future = Future {
       "Hello" + "World"

akka-docs/scala/code/docs/routing/RouterTypeExample.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 import akka.routing.{ ScatterGatherFirstCompletedRouter, BroadcastRouter, RandomRouter, RoundRobinRouter }
 import annotation.tailrec
 import akka.actor.{ Props, Actor }
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.util.Timeout
 import akka.dispatch.Await
 import akka.pattern.ask

akka-docs/scala/code/docs/testkit/Specs2DemoAcceptance.scala

@@ -8,6 +8,7 @@ import org.specs2.specification.{ Step, Scope }
 
 import akka.actor.{ Props, ActorSystem, Actor }
 import akka.testkit.{ TestKit, ImplicitSender }
+import scala.concurrent.util.{ FiniteDuration, Duration }
 
 class Specs2DemoAcceptance extends Specification {
   def is =
@@ -22,8 +23,7 @@ class Specs2DemoAcceptance extends Specification {
   val system = ActorSystem()
 
   // an alternative to mixing in NoTimeConversions
-  implicit def d2d(d: org.specs2.time.Duration): akka.util.FiniteDuration =
-    akka.util.Duration(d.inMilliseconds, "millis")
+  implicit def d2d(d: org.specs2.time.Duration): FiniteDuration = Duration(d.inMilliseconds, "millis")
 
   def e1 = new TestKit(system) with Scope with ImplicitSender {
     within(1 second) {
@@ -35,5 +35,5 @@ class Specs2DemoAcceptance extends Specification {
     }
   }
 
-  def e2 = ((1 second): akka.util.Duration).toMillis must be equalTo 1000
+  def e2 = ((1 second): Duration).toMillis must be equalTo 1000
 }

akka-docs/scala/code/docs/testkit/Specs2DemoSpec.scala

@@ -8,7 +8,7 @@ import org.specs2.time.NoTimeConversions
 
 import akka.actor.{ Props, ActorSystem, Actor }
 import akka.testkit.{ TestKit, ImplicitSender }
-import akka.util.duration._
+import scala.concurrent.util.duration._
 
 class Specs2DemoUnitSpec extends Specification with NoTimeConversions {
 

akka-docs/scala/code/docs/testkit/TestKitUsageSpec.scala

@@ -21,7 +21,7 @@ import akka.actor.Props
 import akka.testkit.DefaultTimeout
 import akka.testkit.ImplicitSender
 import akka.testkit.TestKit
-import akka.util.duration._
+import scala.concurrent.util.duration._
 
 /**
  * a Test to show some TestKit examples

akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala

@@ -7,7 +7,7 @@ import language.postfixOps
 
 //#imports-test-probe
 import akka.testkit.TestProbe
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.actor._
 import akka.dispatch.Futures
 
@@ -88,7 +88,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     //#test-fsm-ref
     import akka.testkit.TestFSMRef
     import akka.actor.FSM
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     val fsm = TestFSMRef(new Actor with FSM[Int, String] {
       startWith(1, "")
@@ -121,7 +121,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
     //#test-behavior
     import akka.testkit.TestActorRef
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.dispatch.Await
     import akka.pattern.ask
 
@@ -159,7 +159,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     type Worker = MyActor
     //#test-within
     import akka.actor.Props
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
 
     val worker = system.actorOf(Props[Worker])
     within(200 millis) {
@@ -173,7 +173,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate dilated duration" in {
     //#duration-dilation
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.testkit._
     10.milliseconds.dilated
     //#duration-dilation
@@ -206,7 +206,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
 
   "demonstrate probe reply" in {
     import akka.testkit.TestProbe
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.pattern.ask
     //#test-probe-reply
     val probe = TestProbe()

akka-docs/scala/code/docs/transactor/TransactorDocSpec.scala

@@ -8,7 +8,7 @@ import language.postfixOps
 
 import akka.actor._
 import akka.transactor._
-import akka.util.duration._
+import scala.concurrent.util.duration._
 import akka.util.Timeout
 import akka.testkit._
 import scala.concurrent.stm._
@@ -141,7 +141,7 @@ class TransactorDocSpec extends AkkaSpec {
 
     //#run-coordinated-example
     import akka.dispatch.Await
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.util.Timeout
     import akka.pattern.ask
 
@@ -168,7 +168,7 @@ class TransactorDocSpec extends AkkaSpec {
     import CoordinatedApi._
 
     //#implicit-timeout
-    import akka.util.duration._
+    import scala.concurrent.util.duration._
     import akka.util.Timeout
 
     implicit val timeout = Timeout(5 seconds)

akka-docs/scala/code/docs/zeromq/ZeromqDocSpec.scala

@@ -5,16 +5,13 @@ package docs.zeromq
 
 import language.postfixOps
 
-import akka.actor.Actor
-import akka.actor.Props
-import akka.util.duration._
+import akka.actor.{ Actor, Props }
+import scala.concurrent.util.duration._
 import akka.testkit._
-import akka.zeromq.ZeroMQVersion
-import akka.zeromq.ZeroMQExtension
+import akka.zeromq.{ ZeroMQVersion, ZeroMQExtension }
 import java.text.SimpleDateFormat
 import java.util.Date
-import akka.zeromq.SocketType
-import akka.zeromq.Bind
+import akka.zeromq.{ SocketType, Bind }
 
 object ZeromqDocSpec {
 
@@ -180,7 +177,7 @@ class ZeromqDocSpec extends AkkaSpec("akka.loglevel=INFO") {
 
     // Let it run for a while to see some output.
     // Don't do like this in real tests, this is only doc demonstration.
-    3.seconds.sleep()
+    Thread.sleep(3.seconds.toMillis)
 
   }