Merge pull request #283 from jboner/wip-1716-directives-patriknw

Replaced Action with Directive in SupervisorStrategy. See #1716

akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java

@@ -40,9 +40,9 @@ public class FaultHandlingTestBase {
 
     //#strategy
     private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.parse("1 minute"),
-        new Function<Throwable, Action>() {
+        new Function<Throwable, Directive>() {
           @Override
-          public Action apply(Throwable t) {
+          public Directive apply(Throwable t) {
             if (t instanceof ArithmeticException) {
               return resume();
             } else if (t instanceof NullPointerException) {
@@ -78,9 +78,9 @@ public class FaultHandlingTestBase {
 
     //#strategy2
     private static SupervisorStrategy strategy = new OneForOneStrategy(10, Duration.parse("1 minute"),
-        new Function<Throwable, Action>() {
+        new Function<Throwable, Directive>() {
           @Override
-          public Action apply(Throwable t) {
+          public Directive apply(Throwable t) {
             if (t instanceof ArithmeticException) {
               return resume();
             } else if (t instanceof NullPointerException) {

akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java

@@ -118,9 +118,9 @@ public class FaultHandlingDocSample {
 
     // Stop the CounterService child if it throws ServiceUnavailable
     private static SupervisorStrategy strategy = new OneForOneStrategy(-1, Duration.Inf(),
-        new Function<Throwable, Action>() {
+        new Function<Throwable, Directive>() {
           @Override
-          public Action apply(Throwable t) {
+          public Directive apply(Throwable t) {
             if (t instanceof ServiceUnavailable) {
               return stop();
             } else {
@@ -229,9 +229,9 @@ public class FaultHandlingDocSample {
     // Restart the storage child when StorageException is thrown.
     // After 3 restarts within 5 seconds it will be stopped.
     private static SupervisorStrategy strategy = new OneForOneStrategy(3, Duration.parse("5 seconds"),
-        new Function<Throwable, Action>() {
+        new Function<Throwable, Directive>() {
           @Override
-          public Action apply(Throwable t) {
+          public Directive apply(Throwable t) {
             if (t instanceof StorageException) {
               return restart();
             } else {

akka-docs/java/fault-tolerance.rst

@@ -43,7 +43,7 @@ For the sake of demonstration let us consider the following strategy:
    :include: strategy
 
 I have chosen a few well-known exception types in order to demonstrate the
-application of the fault handling actions described in :ref:`supervision`.
+application of the fault handling directives described in :ref:`supervision`.
 First off, it is a one-for-one strategy, meaning that each child is treated
 separately (an all-for-one strategy works very similarly, the only difference
 is that any decision is applied to all children of the supervisor, not only the
@@ -71,7 +71,7 @@ in the same way as the default strategy defined above.
 Test Application
 ----------------
 
-The following section shows the effects of the different actions in practice,
+The following section shows the effects of the different directives in practice,
 wherefor a test setup is needed. First off, we need a suitable supervisor:
 
 .. includecode:: code/akka/docs/actor/FaultHandlingTestBase.java
@@ -93,13 +93,13 @@ Let us create actors:
 .. includecode:: code/akka/docs/actor/FaultHandlingTestBase.java
    :include: create
 
-The first test shall demonstrate the ``Resume`` action, so we try it out by
+The first test shall demonstrate the ``Resume`` directive, so we try it out by
 setting some non-initial state in the actor and have it fail:
 
 .. includecode:: code/akka/docs/actor/FaultHandlingTestBase.java
    :include: resume
 
-As you can see the value 42 survives the fault handling action. Now, if we
+As you can see the value 42 survives the fault handling directive. Now, if we
 change the failure to a more serious ``NullPointerException``, that will no
 longer be the case:
 
@@ -113,7 +113,7 @@ terminated by the supervisor:
    :include: stop
 
 Up to now the supervisor was completely unaffected by the child’s failure,
-because the actions set did handle it. In case of an ``Exception``, this is not
+because the directives set did handle it. In case of an ``Exception``, this is not
 true anymore and the supervisor escalates the failure.
 
 .. includecode:: code/akka/docs/actor/FaultHandlingTestBase.java
@@ -123,7 +123,7 @@ The supervisor itself is supervised by the top-level actor provided by the
 :class:`ActorSystem`, which has the default policy to restart in case of all
 ``Exception`` cases (with the notable exceptions of
 ``ActorInitializationException`` and ``ActorKilledException``). Since the
-default action in case of a restart is to kill all children, we expected our poor
+default directive in case of a restart is to kill all children, we expected our poor
 child not to survive this failure.
 
 In case this is not desired (which depends on the use case), we need to use a