From d871b6399082dcfb0ba594c0eb463dff579fa380 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 17 Mar 2017 11:25:47 +0100 Subject: [PATCH] rename spawnAdapter due to Scala 2.12 compilation error * and make scaladoc happy ForkJoinPool.ForkJoinWorkerThreadFactory --- .../akka/dispatch/forkjoin/ForkJoinPool.java | 4 ++-- .../java/akka/typed/javadsl/ActorContext.java | 4 ++-- .../main/scala/akka/typed/ActorContext.scala | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/akka-actor/src/main/java/akka/dispatch/forkjoin/ForkJoinPool.java b/akka-actor/src/main/java/akka/dispatch/forkjoin/ForkJoinPool.java index 4c7a332ed1..644747fe8d 100644 --- a/akka-actor/src/main/java/akka/dispatch/forkjoin/ForkJoinPool.java +++ b/akka-actor/src/main/java/akka/dispatch/forkjoin/ForkJoinPool.java @@ -2864,7 +2864,7 @@ public class ForkJoinPool extends AbstractExecutorService { * java.lang.RuntimePermission}{@code ("modifyThread")} */ public ForkJoinPool(int parallelism, - ForkJoinWorkerThreadFactory factory, + ForkJoinPool.ForkJoinWorkerThreadFactory factory, Thread.UncaughtExceptionHandler handler, boolean asyncMode) { checkPermission(); @@ -2889,7 +2889,7 @@ public class ForkJoinPool extends AbstractExecutorService { * Basically the same as above, but uses smallest possible initial footprint. */ ForkJoinPool(int parallelism, long ctl, - ForkJoinWorkerThreadFactory factory, + ForkJoinPool.ForkJoinWorkerThreadFactory factory, Thread.UncaughtExceptionHandler handler) { this.config = parallelism; this.ctl = ctl; diff --git a/akka-typed/src/main/java/akka/typed/javadsl/ActorContext.java b/akka-typed/src/main/java/akka/typed/javadsl/ActorContext.java index fa2050efd9..5021e3c1e1 100644 --- a/akka-typed/src/main/java/akka/typed/javadsl/ActorContext.java +++ b/akka-typed/src/main/java/akka/typed/javadsl/ActorContext.java @@ -147,13 +147,13 @@ public interface ActorContext { * with an inserted hyphen between these two parts. Therefore the given name * argument does not need to be unique within the scope of the parent actor. */ - public ActorRef spawnAdapter(Function f, String name); + public ActorRef createAdapter(Function f, String name); /** * Create an anonymous child actor that will wrap messages such that other * Actor’s protocols can be ingested by this Actor. You are strongly advised * to cache these ActorRefs or to stop them when no longer needed. */ - public ActorRef spawnAdapter(Function f); + public ActorRef createAdapter(Function f); } diff --git a/akka-typed/src/main/scala/akka/typed/ActorContext.scala b/akka-typed/src/main/scala/akka/typed/ActorContext.scala index 119b8538d4..c631ea4802 100644 --- a/akka-typed/src/main/scala/akka/typed/ActorContext.scala +++ b/akka-typed/src/main/scala/akka/typed/ActorContext.scala @@ -21,13 +21,13 @@ import akka.annotation.ApiMayChange @DoNotInherit @ApiMayChange trait ActorContext[T] extends javadsl.ActorContext[T] with scaladsl.ActorContext[T] { - def getChild(name: String): Optional[ActorRef[Void]] = + override def getChild(name: String): Optional[ActorRef[Void]] = child(name) match { case Some(c) ⇒ Optional.of(c.upcast[Void]) case None ⇒ Optional.empty() } - def getChildren(): java.util.List[akka.typed.ActorRef[Void]] = { + override def getChildren(): java.util.List[akka.typed.ActorRef[Void]] = { val c = children val a = new ArrayList[ActorRef[Void]](c.size) val i = c.iterator @@ -35,28 +35,28 @@ trait ActorContext[T] extends javadsl.ActorContext[T] with scaladsl.ActorContext a } - def getExecutionContext(): scala.concurrent.ExecutionContextExecutor = + override def getExecutionContext(): scala.concurrent.ExecutionContextExecutor = executionContext - def getMailboxCapacity(): Int = + override def getMailboxCapacity(): Int = mailboxCapacity - def getSelf(): akka.typed.ActorRef[T] = + override def getSelf(): akka.typed.ActorRef[T] = self - def getSystem(): akka.typed.ActorSystem[Void] = + override def getSystem(): akka.typed.ActorSystem[Void] = system.asInstanceOf[ActorSystem[Void]] - def spawn[U](behavior: akka.typed.Behavior[U], name: String): akka.typed.ActorRef[U] = + override def spawn[U](behavior: akka.typed.Behavior[U], name: String): akka.typed.ActorRef[U] = spawn(behavior, name, EmptyDeploymentConfig) - def spawnAnonymous[U](behavior: akka.typed.Behavior[U]): akka.typed.ActorRef[U] = + override def spawnAnonymous[U](behavior: akka.typed.Behavior[U]): akka.typed.ActorRef[U] = spawnAnonymous(behavior, EmptyDeploymentConfig) - def spawnAdapter[U](f: java.util.function.Function[U, T]): akka.typed.ActorRef[U] = + override def createAdapter[U](f: java.util.function.Function[U, T]): akka.typed.ActorRef[U] = spawnAdapter(f.apply _) - def spawnAdapter[U](f: java.util.function.Function[U, T], name: String): akka.typed.ActorRef[U] = + override def createAdapter[U](f: java.util.function.Function[U, T], name: String): akka.typed.ActorRef[U] = spawnAdapter(f.apply _, name) }