raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fixes after review

Browse source
This commit is contained in:
Viktor Klang 2012-01-26 17:47:31 +01:00
parent 5ddf1afb20
commit 1ebdcaca1a
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
View file

@ -14,7 +14,7 @@ import java.util.LinkedList;
import java.lang.Iterable; import java.lang.Iterable;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static akka.japi.util.manifest; import static akka.japi.Util.manifest;
import akka.testkit.AkkaSpec; import akka.testkit.AkkaSpec;
@ -272,7 +272,7 @@ public class JavaFutureTests {
} }
@Test @Test
public void BlockMustBeCallable() { public void blockMustBeCallable() {
Promise<String> p = Futures.promise(system.dispatcher()); Promise<String> p = Futures.promise(system.dispatcher());
Duration d = Duration.create(1, TimeUnit.SECONDS); Duration d = Duration.create(1, TimeUnit.SECONDS);
p.success("foo"); p.success("foo");
@ -281,7 +281,7 @@ public class JavaFutureTests {
} }
@Test @Test
public void MapToMustBeCallable() { public void mapToMustBeCallable() {
Promise<Object> p = Futures.promise(system.dispatcher()); Promise<Object> p = Futures.promise(system.dispatcher());
Future<String> f = p.future().mapTo(manifest(String.class)); Future<String> f = p.future().mapTo(manifest(String.class));
Duration d = Duration.create(1, TimeUnit.SECONDS); Duration d = Duration.create(1, TimeUnit.SECONDS);
@ -291,7 +291,7 @@ public class JavaFutureTests {
} }
@Test @Test
public void RecoverToMustBeCallable() { public void recoverToMustBeCallable() {
final IllegalStateException fail = new IllegalStateException("OHNOES"); final IllegalStateException fail = new IllegalStateException("OHNOES");
Promise<Object> p = Futures.promise(system.dispatcher()); Promise<Object> p = Futures.promise(system.dispatcher());
Future<Object> f = p.future().recover(new Recover<Object>() { Future<Object> f = p.future().recover(new Recover<Object>() {

2
akka-actor/src/main/scala/akka/dispatch/Future.scala
View file

@ -505,7 +505,7 @@ sealed trait Future[+T] extends Await.Awaitable[T] {
* that conforms to A's erased type or a ClassCastException otherwise. * that conforms to A's erased type or a ClassCastException otherwise.
* *
* When used from Java, to create the Manifest, use: * When used from Java, to create the Manifest, use:
* import static akka.japi.util.manifest; * import static akka.japi.Util.manifest;
* future.mapTo(manifest(MyClass.class)); * future.mapTo(manifest(MyClass.class));
*/ */
final def mapTo[A](implicit m: Manifest[A]): Future[A] = { final def mapTo[A](implicit m: Manifest[A]): Future[A] = {

5
akka-actor/src/main/scala/akka/japi/JavaAPI.scala
View file

@ -120,7 +120,10 @@ object Option {
implicit def scala2JavaOption[A](o: scala.Option[A]): Option[A] = if (o.isDefined) some(o.get) else none implicit def scala2JavaOption[A](o: scala.Option[A]): Option[A] = if (o.isDefined) some(o.get) else none
} }
object util { /**
* This class hold common utilities for Java
*/
object Util {
/** /**
* Given a Class returns a Scala Manifest of that Class * Given a Class returns a Scala Manifest of that Class
*/ */