From c830a75bd049d6f5d33bbd48fdf44e2c6b3c3da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 13 Oct 2017 17:18:28 +0200 Subject: [PATCH] Mima and internalizing things that should have already been internal --- akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala | 6 ++++-- akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala index 7919f848a0..eec6b899a8 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala @@ -25,14 +25,16 @@ import scala.compat.java8.OptionConverters._ import scala.compat.java8.FutureConverters._ import java.util.concurrent.CompletionStage -import scala.concurrent.Future +import akka.annotation.InternalApi object Tcp extends ExtensionId[Tcp] with ExtensionIdProvider { /** * Represents a prospective TCP server binding. + * + * Not indented for user construction */ - class ServerBinding private[akka] (delegate: scaladsl.Tcp.ServerBinding) { + final class ServerBinding @InternalApi private[akka] (delegate: scaladsl.Tcp.ServerBinding) { /** * The local address of the endpoint bound by the materialization of the `connections` [[Source]]. */ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala index b1f83c57f4..323221d539 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala @@ -8,6 +8,7 @@ import java.util.concurrent.TimeoutException import akka.{ Done, NotUsed } import akka.actor._ +import akka.annotation.InternalApi import akka.io.Inet.SocketOption import akka.io.{ IO, Tcp ⇒ IoTcp } import akka.stream._ @@ -28,8 +29,10 @@ object Tcp extends ExtensionId[Tcp] with ExtensionIdProvider { * @param localAddress The address the server was bound to * @param unbindAction a function that will trigger unbind of the server * @param whenUnbound A future that is completed when the server is unbound, or failed if the server binding fails + * + * Not indented for user construction */ - final case class ServerBinding(localAddress: InetSocketAddress)( + final case class ServerBinding @InternalApi private[akka] (localAddress: InetSocketAddress)( private val unbindAction: () ⇒ Future[Unit], val whenUnbound: Future[Done] ) {