diff --git a/akka-samples/akka-sample-supervision-java-lambda/COPYING b/akka-samples/akka-sample-supervision-java-lambda/COPYING
new file mode 100644
index 0000000000..0e259d42c9
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/COPYING
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/akka-samples/akka-sample-supervision-java-lambda/LICENSE b/akka-samples/akka-sample-supervision-java-lambda/LICENSE
new file mode 100644
index 0000000000..287f8dd7fa
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/LICENSE
@@ -0,0 +1,10 @@
+Activator Template by Typesafe
+
+Licensed under Public Domain (CC0)
+
+To the extent possible under law, the person who associated CC0 with
+this Activator Tempate has waived all copyright and related or neighboring
+rights to this Activator Template.
+
+You should have received a copy of the CC0 legalcode along with this
+work. If not, see .
diff --git a/akka-samples/akka-sample-supervision-java-lambda/activator.properties b/akka-samples/akka-sample-supervision-java-lambda/activator.properties
new file mode 100644
index 0000000000..083d7ca33a
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/activator.properties
@@ -0,0 +1,4 @@
+name=akka-supervision-java-lambda
+title=Akka Supervision in Java with Lambdas
+description=Illustrates supervision in Akka
+tags=akka,java,java8,sample
diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
new file mode 100644
index 0000000000..b8ae5c2d48
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
@@ -0,0 +1,15 @@
+name := "akka-supervision-java-lambda"
+
+version := "1.0"
+
+scalaVersion := "2.10.3"
+
+javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint")
+
+testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a")
+
+libraryDependencies ++= Seq(
+ "com.typesafe.akka" %% "akka-actor" % "2.3-SNAPSHOT",
+ "com.typesafe.akka" %% "akka-testkit" % "2.3-SNAPSHOT" % "test",
+ "junit" % "junit" % "4.11" % "test",
+ "com.novocode" % "junit-interface" % "0.10" % "test")
diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
new file mode 100644
index 0000000000..8d639b4649
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
@@ -0,0 +1,53 @@
+
+ 4.0.0
+
+
+ UTF-8
+
+
+ sample
+ akka-supervision-java-lambda
+ jar
+ 1.0
+
+
+
+ com.typesafe.akka
+ akka-actor_2.10
+ 2.3-SNAPSHOT
+
+
+ com.typesafe.akka
+ akka-testkit_2.10
+ 2.3-SNAPSHOT
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
+
+ 1.8
+ 1.8
+ true
+
+ -Xlint
+
+
+
+
+
+
+
diff --git a/akka-samples/akka-sample-supervision-java-lambda/project/build.properties b/akka-samples/akka-sample-supervision-java-lambda/project/build.properties
new file mode 100644
index 0000000000..37b489cb6e
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.1
diff --git a/akka-samples/akka-sample-supervision-java-lambda/src/main/java/supervision/ArithmeticService.java b/akka-samples/akka-sample-supervision-java-lambda/src/main/java/supervision/ArithmeticService.java
new file mode 100644
index 0000000000..9e982076e3
--- /dev/null
+++ b/akka-samples/akka-sample-supervision-java-lambda/src/main/java/supervision/ArithmeticService.java
@@ -0,0 +1,75 @@
+package supervision;
+
+import akka.actor.*;
+import akka.japi.pf.DeciderBuilder;
+import akka.japi.pf.ReceiveBuilder;
+import scala.PartialFunction;
+import scala.runtime.BoxedUnit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static supervision.FlakyExpressionCalculator.FlakinessException;
+import static supervision.FlakyExpressionCalculator.Result;
+import static supervision.FlakyExpressionCalculator.Position.Left;
+
+// A very simple service that accepts arithmetic expressions and tries to
+// evaluate them. Since the calculation is dangerous (at least for the sake
+// of this example) it is delegated to a worker actor of type
+// FlakyExpressionCalculator.
+class ArithmeticService extends AbstractLoggingActor {
+
+ // Map of workers to the original actors requesting the calculation
+ Map pendingWorkers = new HashMap<>();
+
+ private SupervisorStrategy strategy = new OneForOneStrategy(false, DeciderBuilder.
+ match(FlakinessException.class, e -> {
+ log().warning("Evaluation of a top level expression failed, restarting.");
+ return SupervisorStrategy.restart();
+ }).
+ match(ArithmeticException.class, e -> {
+ log().error("Evaluation failed because of: {}", e.getMessage());
+ notifyConsumerFailure(sender(), e);
+ return SupervisorStrategy.stop();
+ }).
+ match(Throwable.class, e -> {
+ log().error("Unexpected failure: {}", e.getMessage());
+ notifyConsumerFailure(sender(), e);
+ return SupervisorStrategy.stop();
+ }).build());
+ @Override
+ public SupervisorStrategy supervisorStrategy() {
+ return strategy;
+ }
+
+ private void notifyConsumerFailure(ActorRef worker, Throwable failure) {
+ // Status.Failure is a message type provided by the Akka library. The
+ // reason why it is used is because it is recognized by the "ask" pattern
+ // and the Future returned by ask will fail with the provided exception.
+ ActorRef pending = pendingWorkers.get(worker);
+ if (pending != null) {
+ pending.tell(new Status.Failure(failure), self());
+ pendingWorkers.remove(worker);
+ }
+ }
+
+ private void notifyConsumerSuccess(ActorRef worker, Integer result) {
+ ActorRef pending = pendingWorkers.get(worker);
+ if (pending != null) {
+ pending.tell(result, self());
+ pendingWorkers.remove(worker);
+ }
+ }
+
+ @Override
+ public PartialFunction