diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 7e6d6d9010..344c6d4437 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -78,15 +78,16 @@ object ExecutionContexts { def global(): ExecutionContextExecutor = ExecutionContext.global /** + * INTERNAL API + * * WARNING: Not A General Purpose ExecutionContext! * * This is an execution context which runs everything on the calling thread. * It is very useful for actions which are known to be non-blocking and * non-throwing in order to save a round-trip to the thread pool. * - * INTERNAL API + * Once Scala 2.12 is no longer supported this can be dropped in favour of directly using `ExecutionContext.parasitic` */ - // Once Scala 2.12 is no longer supported this can be dropped in favour of directly using [[ExecutionContext.parasitic]] @InternalStableApi private[akka] val parasitic: ExecutionContext = SameThreadExecutionContext() diff --git a/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala b/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala index c344f72058..cefe1a2e28 100644 --- a/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala +++ b/akka-actor/src/main/scala/akka/util/JavaDurationConverters.scala @@ -7,9 +7,12 @@ import java.time.{ Duration => JDuration } import scala.concurrent.duration.{ Duration, FiniteDuration } +import akka.annotation.InternalStableApi + /** * INTERNAL API */ +@InternalStableApi private[akka] object JavaDurationConverters { def asFiniteDuration(duration: JDuration): FiniteDuration = duration.asScala