Remove the duplicated code in NettyHelpers.

apache · Sep 12, 2023 · 6a6639f · 6a6639f
1 parent a92c2d1
commit 6a6639f
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyHelpers.scala b/remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyHelpers.scala
@@ -52,15 +52,16 @@ private[netty] trait NettyHelpers {
 /**
  * INTERNAL API
  */
-private[netty] trait NettyServerHelpers extends SimpleChannelInboundHandler[ByteBuf] with NettyHelpers {
-
+private[netty] abstract class NettyChannelHandlerAdapter extends SimpleChannelInboundHandler[ByteBuf]
+    with NettyHelpers {
   final override def channelRead0(ctx: ChannelHandlerContext, msg: ByteBuf): Unit = {
     onMessage(ctx, msg)
   }
 
   @nowarn("msg=deprecated")
-  final override def exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable): Unit =
+  final override def exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable): Unit = {
     transformException(ctx, cause)
+  }
 
   final override def channelActive(ctx: ChannelHandlerContext): Unit = {
     onOpen(ctx)
@@ -75,23 +76,9 @@ private[netty] trait NettyServerHelpers extends SimpleChannelInboundHandler[Byte
 /**
  * INTERNAL API
  */
-private[netty] trait NettyClientHelpers extends SimpleChannelInboundHandler[ByteBuf] with NettyHelpers {
-
-  final override def channelRead0(ctx: ChannelHandlerContext, msg: ByteBuf): Unit = {
-    onMessage(ctx, msg)
-  }
-
-  @nowarn("msg=deprecated")
-  final override def exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable): Unit = {
-    transformException(ctx, cause)
-  }
+private[netty] trait NettyServerHelpers extends NettyChannelHandlerAdapter
 
-  final override def channelActive(ctx: ChannelHandlerContext): Unit = {
-    onOpen(ctx)
-    onConnect(ctx)
-  }
-
-  final override def channelInactive(ctx: ChannelHandlerContext): Unit = {
-    onDisconnect(ctx)
-  }
-}
+/**
+ * INTERNAL API
+ */
+private[netty] trait NettyClientHelpers extends NettyChannelHandlerAdapter