Refactor

hexagontk · Nov 3, 2023 · 60700bf · 60700bf
1 parent b058d9b
commit 60700bf
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 85 deletions.
diff --git a/core/api/core.api b/core/api/core.api
@@ -293,19 +293,6 @@ public abstract interface class com/hexagonkt/core/logging/LoggingPort {
 	public abstract fun setLoggerLevel (Ljava/lang/String;Lcom/hexagonkt/core/logging/LoggingLevel;)V
 }
 
-public final class com/hexagonkt/core/logging/SystemLogger : com/hexagonkt/core/logging/LoggerPort {
-	public fun <init> (Ljava/lang/String;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;)Lcom/hexagonkt/core/logging/SystemLogger;
-	public static synthetic fun copy$default (Lcom/hexagonkt/core/logging/SystemLogger;Ljava/lang/String;ILjava/lang/Object;)Lcom/hexagonkt/core/logging/SystemLogger;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun log (Lcom/hexagonkt/core/logging/LoggingLevel;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function1;)V
-	public fun log (Lcom/hexagonkt/core/logging/LoggingLevel;Lkotlin/jvm/functions/Function0;)V
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/hexagonkt/core/logging/SystemLoggingAdapter : com/hexagonkt/core/logging/LoggingPort {
 	public fun <init> ()V
 	public fun <init> (Lcom/hexagonkt/core/logging/LoggingLevel;)V

diff --git a/core/src/main/kotlin/com/hexagonkt/core/logging/SystemLogger.kt b/core/src/main/kotlin/com/hexagonkt/core/logging/SystemLogger.kt
@@ -2,7 +2,7 @@ package com.hexagonkt.core.logging
 
 import com.hexagonkt.core.logging.LoggingLevel.*
 
-data class SystemLogger(val name: String) : LoggerPort {
+internal data class SystemLogger(val name: String) : LoggerPort {
 
     private val logger: System.Logger = System.getLogger(name)
 

diff --git a/http/http_server_netty/api/http_server_netty.api b/http/http_server_netty/api/http_server_netty.api
@@ -59,13 +59,3 @@ public class com/hexagonkt/http/server/netty/NettyServerAdapter : com/hexagonkt/
 	public fun supportedProtocols ()Ljava/util/Set;
 }
 
-public final class com/hexagonkt/http/server/netty/NettyServerAdapter$HttpChannelInitializer : io/netty/channel/ChannelInitializer {
-	public fun <init> (Ljava/util/Map;Lio/netty/util/concurrent/EventExecutorGroup;Lcom/hexagonkt/http/server/HttpServerSettings;)V
-	public synthetic fun initChannel (Lio/netty/channel/Channel;)V
-}
-
-public final class com/hexagonkt/http/server/netty/NettyServerAdapter$HttpsChannelInitializer : io/netty/channel/ChannelInitializer {
-	public fun <init> (Ljava/util/Map;Lio/netty/handler/ssl/SslContext;Lcom/hexagonkt/http/SslSettings;Lio/netty/util/concurrent/EventExecutorGroup;Lcom/hexagonkt/http/server/HttpServerSettings;)V
-	public synthetic fun initChannel (Lio/netty/channel/Channel;)V
-}
-
diff --git a/...tp_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt b/...tp_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpChannelInitializer.kt
@@ -0,0 +1,34 @@
+package com.hexagonkt.http.server.netty
+
+import com.hexagonkt.http.handlers.HttpHandler
+import com.hexagonkt.http.server.HttpServerSettings
+import io.netty.channel.ChannelInitializer
+import io.netty.channel.socket.SocketChannel
+import io.netty.handler.codec.http.*
+import io.netty.handler.stream.ChunkedWriteHandler
+import io.netty.util.concurrent.EventExecutorGroup
+
+internal class HttpChannelInitializer(
+    private val handlers: Map<HttpMethod, HttpHandler>,
+    private val executorGroup: EventExecutorGroup?,
+    private val settings: HttpServerSettings,
+) : ChannelInitializer<SocketChannel>() {
+
+    override fun initChannel(channel: SocketChannel) {
+        val pipeline = channel.pipeline()
+
+        pipeline.addLast(HttpServerCodec())
+//        pipeline.addLast(HttpServerKeepAliveHandler())
+        pipeline.addLast(HttpObjectAggregator(Int.MAX_VALUE))
+//        pipeline.addLast(ChunkedWriteHandler())
+
+        if (settings.zip)
+            pipeline.addLast(HttpContentCompressor())
+
+        val nettyServerHandler = NettyServerHandler(handlers, null)
+        if (executorGroup == null)
+            pipeline.addLast(nettyServerHandler)
+        else
+            pipeline.addLast(executorGroup, nettyServerHandler)
+    }
+}
diff --git a/...p_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt b/...p_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/HttpsChannelInitializer.kt
@@ -0,0 +1,40 @@
+package com.hexagonkt.http.server.netty
+
+import com.hexagonkt.http.SslSettings
+import com.hexagonkt.http.handlers.HttpHandler
+import com.hexagonkt.http.server.HttpServerSettings
+import io.netty.channel.ChannelInitializer
+import io.netty.channel.socket.SocketChannel
+import io.netty.handler.codec.http.*
+import io.netty.handler.ssl.SslContext
+import io.netty.util.concurrent.EventExecutorGroup
+
+internal class HttpsChannelInitializer(
+    private val handlers: Map<HttpMethod, HttpHandler>,
+    private val sslContext: SslContext,
+    private val sslSettings: SslSettings,
+    private val executorGroup: EventExecutorGroup?,
+    private val settings: HttpServerSettings,
+) : ChannelInitializer<SocketChannel>() {
+
+    override fun initChannel(channel: SocketChannel) {
+        val pipeline = channel.pipeline()
+        val sslHandler = sslContext.newHandler(channel.alloc())
+        val handlerSsl = if (sslSettings.clientAuth) sslHandler else null
+
+        pipeline.addLast(sslHandler)
+        pipeline.addLast(HttpServerCodec())
+//        pipeline.addLast(HttpServerKeepAliveHandler())
+        pipeline.addLast(HttpObjectAggregator(Int.MAX_VALUE))
+//        pipeline.addLast(ChunkedWriteHandler())
+
+        if (settings.zip)
+            pipeline.addLast(HttpContentCompressor())
+
+        val serverHandler = NettyServerHandler(handlers, handlerSsl)
+        if (executorGroup == null)
+            pipeline.addLast(serverHandler)
+        else
+            pipeline.addLast(executorGroup, serverHandler)
+    }
+}
diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt
@@ -15,21 +15,17 @@ import com.hexagonkt.http.handlers.HttpHandler
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.*
 import io.netty.channel.nio.NioEventLoopGroup
-import io.netty.channel.socket.SocketChannel
 import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.handler.codec.http.*
 import io.netty.handler.ssl.ClientAuth.OPTIONAL
 import io.netty.handler.ssl.ClientAuth.REQUIRE
 import io.netty.handler.ssl.SslContext
 import io.netty.handler.ssl.SslContextBuilder
-import io.netty.handler.stream.ChunkedWriteHandler
 import io.netty.util.concurrent.DefaultEventExecutorGroup
-import io.netty.util.concurrent.EventExecutorGroup
 import java.net.InetSocketAddress
 import java.util.concurrent.TimeUnit.SECONDS
 import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.TrustManagerFactory
-import kotlin.Int.Companion.MAX_VALUE
 
 /**
  * Implements [HttpServerPort] using Netty [Channel].
@@ -196,57 +192,4 @@ open class NettyServerAdapter(
             NettyServerAdapter::shutdownQuietSeconds to shutdownQuietSeconds,
             NettyServerAdapter::shutdownTimeoutSeconds to shutdownTimeoutSeconds,
         )
-
-    class HttpChannelInitializer(
-        private val handlers: Map<HttpMethod, HttpHandler>,
-        private val executorGroup: EventExecutorGroup?,
-        private val settings: HttpServerSettings,
-    ) : ChannelInitializer<SocketChannel>() {
-
-        override fun initChannel(channel: SocketChannel) {
-            val pipeline = channel.pipeline()
-
-            pipeline.addLast(HttpServerCodec())
-            pipeline.addLast(HttpServerKeepAliveHandler())
-            pipeline.addLast(HttpObjectAggregator(MAX_VALUE))
-            pipeline.addLast(ChunkedWriteHandler())
-
-            if (settings.zip)
-                pipeline.addLast(HttpContentCompressor())
-
-            if (executorGroup == null)
-                pipeline.addLast(NettyServerHandler(handlers, null))
-            else
-                pipeline.addLast(executorGroup, NettyServerHandler(handlers, null))
-        }
-    }
-
-    class HttpsChannelInitializer(
-        private val handlers: Map<HttpMethod, HttpHandler>,
-        private val sslContext: SslContext,
-        private val sslSettings: SslSettings,
-        private val executorGroup: EventExecutorGroup?,
-        private val settings: HttpServerSettings,
-    ) : ChannelInitializer<SocketChannel>() {
-
-        override fun initChannel(channel: SocketChannel) {
-            val pipeline = channel.pipeline()
-            val sslHandler = sslContext.newHandler(channel.alloc())
-            val handlerSsl = if (sslSettings.clientAuth) sslHandler else null
-
-            pipeline.addLast(sslHandler)
-            pipeline.addLast(HttpServerCodec())
-            pipeline.addLast(HttpServerKeepAliveHandler())
-            pipeline.addLast(HttpObjectAggregator(MAX_VALUE))
-            pipeline.addLast(ChunkedWriteHandler())
-
-            if (settings.zip)
-                pipeline.addLast(HttpContentCompressor())
-
-            if (executorGroup == null)
-                pipeline.addLast(NettyServerHandler(handlers, handlerSsl))
-            else
-                pipeline.addLast(executorGroup, NettyServerHandler(handlers, handlerSsl))
-        }
-    }
 }
diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerHandler.kt
@@ -47,10 +47,10 @@ internal class NettyServerHandler(
     }
 
     private fun readHttpRequest(context: ChannelHandlerContext, nettyRequest: HttpRequest) {
-        val result = nettyRequest.decoderResult()
-
-        if (result.isFailure)
-            throw IllegalStateException(result.cause())
+//        val result = nettyRequest.decoderResult()
+//
+//        if (result.isFailure)
+//            throw IllegalStateException(result.cause())
 
         val channel = context.channel()
         val address = channel.remoteAddress() as InetSocketAddress