Merge remote-tracking branch 'origin/master' into wip-1644-programmatic-deploy-∂π

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

@@ -133,6 +133,29 @@ class SpecificActor extends GenericActor {
 case class MyMsg(subject: String)
 //#receive-orElse
 
+//#receive-orElse2
+trait ComposableActor extends Actor {
+  private var receives: List[Receive] = List()
+  protected def registerReceive(receive: Receive) {
+    receives = receive :: receives
+  }
+
+  def receive = receives reduce { _ orElse _ }
+}
+
+class MyComposableActor extends ComposableActor {
+  override def preStart() {
+    registerReceive({
+      case "foo" ⇒ /* Do something */
+    })
+
+    registerReceive({
+      case "bar" ⇒ /* Do something */
+    })
+  }
+}
+
+//#receive-orElse2
 class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
 
   "import context" in {
@@ -314,7 +337,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
   "using pattern ask / pipeTo" in {
     val actorA, actorB, actorC, actorD = system.actorOf(Props.empty)
     //#ask-pipeTo
-    import akka.pattern.{ ask, pipeTo }
+    import akka.pattern.{ ask, pipe }
 
     case class Result(x: Int, s: String, d: Double)
     case object Request
@@ -329,7 +352,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
       } yield Result(x, s, d)
 
     f pipeTo actorD // .. or ..
-    pipeTo(f, actorD)
+    pipe(f) to actorD
     //#ask-pipeTo
   }
 

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

@@ -11,7 +11,7 @@ import akka.util.duration._
 import akka.util.Duration
 import akka.util.Timeout
 import akka.event.LoggingReceive
-import akka.pattern.ask
+import akka.pattern.{ ask, pipe }
 import com.typesafe.config.ConfigFactory
 //#imports
 

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

@@ -22,12 +22,17 @@ object DispatcherDocSpec {
     my-dispatcher {
       # Dispatcher is the name of the event-based dispatcher
       type = Dispatcher
-      # minimum number of threads to cap factor-based core number to
-      core-pool-size-min = 2
-      # No of core threads ... ceil(available processors * factor)
-      core-pool-size-factor = 2.0
-      # maximum number of threads to cap factor-based number to
-      core-pool-size-max = 10
+      # What kind of ExecutionService to use
+      executor = "thread-pool-executor"
+      # Configuration for the thread pool
+      thread-pool-executor {
+        # minimum number of threads to cap factor-based core number to
+        core-pool-size-min = 2
+        # No of core threads ... ceil(available processors * factor)
+        core-pool-size-factor = 2.0
+        # maximum number of threads to cap factor-based number to
+        core-pool-size-max = 10
+      }
       # Throughput defines the number of messages that are processed in a batch before the
       # thread is returned to the pool. Set to 1 for as fair as possible.
       throughput = 100
@@ -37,8 +42,11 @@ object DispatcherDocSpec {
     //#my-bounded-config
     my-dispatcher-bounded-queue {
       type = Dispatcher
-      core-pool-size-factor = 8.0
-      max-pool-size-factor  = 16.0
+      executor = "thread-pool-executor"
+      thread-pool-executor {
+        core-pool-size-factor = 8.0
+        max-pool-size-factor  = 16.0
+      }
       # Specifies the bounded capacity of the mailbox queue
       mailbox-capacity = 100
       throughput = 3
@@ -48,6 +56,11 @@ object DispatcherDocSpec {
     //#my-balancing-config
     my-balancing-dispatcher {
       type = BalancingDispatcher
+      executor = "thread-pool-executor"
+      thread-pool-executor {
+        core-pool-size-factor = 8.0
+        max-pool-size-factor  = 16.0
+      }
     }
     //#my-balancing-config
 

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

@@ -41,6 +41,15 @@ object CountExtension
 //#extensionid
 
 object ExtensionDocSpec {
+
+  val config = """
+    //#config
+    akka {
+      extensions = ["akka.docs.extension.CountExtension$"]
+    }
+    //#config
+    """
+
   //#extension-usage-actor
 
   class MyActor extends Actor {
@@ -64,7 +73,7 @@ object ExtensionDocSpec {
   //#extension-usage-actor-trait
 }
 
-class ExtensionDocSpec extends AkkaSpec {
+class ExtensionDocSpec extends AkkaSpec(ExtensionDocSpec.config) {
   import ExtensionDocSpec._
 
   "demonstrate how to create an extension in Scala" in {
@@ -73,4 +82,10 @@ class ExtensionDocSpec extends AkkaSpec {
     //#extension-usage
   }
 
+  "demonstrate how to lookup a configured extension in Scala" in {
+    //#extension-lookup
+    system.extension(CountExtension)
+    //#extension-lookup
+  }
+
 }

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

@@ -13,6 +13,7 @@ import akka.dispatch.Future
 import akka.dispatch.Await
 import akka.util.duration._
 import akka.dispatch.Promise
+import java.lang.IllegalStateException
 
 object FutureDocSpec {
 
@@ -266,6 +267,19 @@ class FutureDocSpec extends AkkaSpec {
     Await.result(future, 1 second) must be(0)
   }
 
+  "demonstrate usage of recoverWith" in {
+    implicit val timeout = system.settings.ActorTimeout
+    val actor = system.actorOf(Props[MyActor])
+    val msg1 = -1
+    //#try-recover
+    val future = akka.pattern.ask(actor, msg1) recoverWith {
+      case e: ArithmeticException        ⇒ Promise.successful(0)
+      case foo: IllegalArgumentException ⇒ Promise.failed[Int](new IllegalStateException("All br0ken!"))
+    }
+    //#try-recover
+    Await.result(future, 1 second) must be(0)
+  }
+
   "demonstrate usage of zip" in {
     val future1 = Future { "foo" }
     val future2 = Future { "bar" }
@@ -275,13 +289,28 @@ class FutureDocSpec extends AkkaSpec {
     Await.result(future3, 1 second) must be("foo bar")
   }
 
-  "demonstrate usage of or" in {
+  "demonstrate usage of andThen" in {
+    def loadPage(s: String) = s
+    val url = "foo bar"
+    def log(cause: Throwable) = ()
+    def watchSomeTV = ()
+    //#and-then
+    val result = Future { loadPage(url) } andThen {
+      case Left(exception) ⇒ log(exception)
+    } andThen {
+      case _ ⇒ watchSomeTV
+    }
+    //#and-then
+    Await.result(result, 1 second) must be("foo bar")
+  }
+
+  "demonstrate usage of fallbackTo" in {
     val future1 = Future { "foo" }
     val future2 = Future { "bar" }
     val future3 = Future { "pigdog" }
-    //#or
-    val future4 = future1 or future2 or future3
-    //#or
+    //#fallback-to
+    val future4 = future1 fallbackTo future2 fallbackTo future3
+    //#fallback-to
     Await.result(future4, 1 second) must be("foo")
   }
 

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

@@ -89,10 +89,10 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     val fsm = TestFSMRef(new Actor with FSM[Int, String] {
       startWith(1, "")
       when(1) {
-        case Ev("go") ⇒ goto(2) using "go"
+        case Event("go", _) ⇒ goto(2) using "go"
       }
       when(2) {
-        case Ev("back") ⇒ goto(1) using "back"
+        case Event("back", _) ⇒ goto(1) using "back"
       }
     })