From e3ac633649fd387c3bf7e97bb5bd42d9248c06d6 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 9 Aug 2012 18:15:38 +0200 Subject: [PATCH] add throws clauses to Java APIs --- akka-actor/src/main/scala/akka/japi/JavaAPI.scala | 1 + akka-testkit/src/main/java/akka/testkit/JavaTestKit.java | 6 +++--- akka-testkit/src/main/scala/akka/testkit/TestKit.scala | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala index ab9d82c387..adea0c57d6 100644 --- a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala +++ b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala @@ -93,6 +93,7 @@ object JavaPartialFunction { abstract class JavaPartialFunction[A, B] extends AbstractPartialFunction[A, B] { import JavaPartialFunction._ + @throws(classOf[Exception]) def apply(x: A, isCheck: Boolean): B final def isDefinedAt(x: A): Boolean = try { apply(x, true); true } catch { case NoMatch ⇒ false } diff --git a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java index 11d40b2003..e8ce90a9ed 100644 --- a/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java +++ b/akka-testkit/src/main/java/akka/testkit/JavaTestKit.java @@ -217,7 +217,7 @@ public class JavaTestKit { } public abstract class ReceiveWhile { - abstract protected T match(Object msg); + abstract protected T match(Object msg) throws Exception; private Object results; @@ -237,8 +237,8 @@ public class JavaTestKit { public ReceiveWhile(Class clazz, Duration max, Duration idle, int messages) { results = p.receiveWhile(max, idle, messages, new CachingPartialFunction() { - public T match(Object msg) { - return ReceiveWhile.this.match(msg); + public T match(Object msg) throws Exception { + return ReceiveWhile.this.match(msg); } }).toArray(Util.classTag(clazz)); } diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index 064105adec..19f63c1567 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -732,6 +732,7 @@ trait DefaultTimeout { this: TestKit ⇒ private[testkit] abstract class CachingPartialFunction[A, B <: AnyRef] extends scala.runtime.AbstractPartialFunction[A, B] { import akka.japi.JavaPartialFunction._ + @throws(classOf[Exception]) def `match`(x: A): B var cache: B = _