Add additional HttpServer extensions and tests

Signed-off-by: Dmitry Sulman <[email protected]>

Author: dmitrysulman

logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/Extensions.kt

@@ -1,11 +1,37 @@
 package io.github.dmitrysulman.logback.access.reactor.netty
 
 import reactor.netty.http.server.HttpServer
+import java.net.URL
 
 /**
  * Extension for [HttpServer] providing [HttpServer.accessLog] method alternative.
  *
  * @param reactorNettyAccessLogFactory The [ReactorNettyAccessLogFactory] instance for access log configuration.
+ * @return a new [HttpServer]
  */
 fun HttpServer.enableLogbackAccess(reactorNettyAccessLogFactory: ReactorNettyAccessLogFactory): HttpServer =
     accessLog(true, reactorNettyAccessLogFactory)
+
+/**
+ * Extension for [HttpServer] providing [HttpServer.accessLog] method alternative with a default
+ * [ReactorNettyAccessLogFactory] configuration.
+ *
+ * @return a new [HttpServer]
+ */
+fun HttpServer.enableLogbackAccess(): HttpServer = enableLogbackAccess(ReactorNettyAccessLogFactory())
+
+/**
+ * Extension for [HttpServer] providing [HttpServer.accessLog] method alternative.
+ *
+ * @param fileName The file name of the configuration file to load.
+ * @return a new [HttpServer].
+ */
+fun HttpServer.enableLogbackAccess(fileName: String): HttpServer = enableLogbackAccess(ReactorNettyAccessLogFactory(fileName))
+
+/**
+ * Extension for [HttpServer] providing [HttpServer.accessLog] method alternative.
+ *
+ * @param config the [URL] pointing to the configuration file to be used for setup.
+ * @return a new [HttpServer].
+ */
+fun HttpServer.enableLogbackAccess(config: URL): HttpServer = enableLogbackAccess(ReactorNettyAccessLogFactory(config))

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ExtensionsTests.kt

@@ -0,0 +1,45 @@
+package io.github.dmitrysulman.logback.access.reactor.netty
+
+import io.kotest.matchers.string.shouldEndWith
+import io.mockk.mockk
+import io.mockk.slot
+import io.mockk.verify
+import org.junit.jupiter.api.Test
+import reactor.netty.http.server.HttpServer
+
+class ExtensionsTests {
+    @Test
+    fun `test HttpServer#enableLogbackAccess() extension`() {
+        val httpServerMock = mockk<HttpServer>(relaxed = true)
+        val factoryCapture = slot<ReactorNettyAccessLogFactory>()
+        httpServerMock.enableLogbackAccess()
+        verify(exactly = 1) { httpServerMock.accessLog(true, capture(factoryCapture)) }
+        factoryCapture.captured.accessContext.name shouldEndWith "logback-access.xml"
+    }
+
+    @Test
+    fun `test HttpServer#enableLogbackAccess(factory) extension`() {
+        val factory = ReactorNettyAccessLogFactory()
+        val httpServerMock = mockk<HttpServer>(relaxed = true)
+        httpServerMock.enableLogbackAccess(factory)
+        verify(exactly = 1) { httpServerMock.accessLog(true, factory) }
+    }
+
+    @Test
+    fun `test HttpServer#enableLogbackAccess(filename) extension`() {
+        val httpServerMock = mockk<HttpServer>(relaxed = true)
+        val factoryCapture = slot<ReactorNettyAccessLogFactory>()
+        httpServerMock.enableLogbackAccess("logback-access-resource.xml")
+        verify(exactly = 1) { httpServerMock.accessLog(true, capture(factoryCapture)) }
+        factoryCapture.captured.accessContext.name shouldEndWith "logback-access-resource.xml"
+    }
+
+    @Test
+    fun `test HttpServer#enableLogbackAccess(url) extension`() {
+        val httpServerMock = mockk<HttpServer>(relaxed = true)
+        val factoryCapture = slot<ReactorNettyAccessLogFactory>()
+        httpServerMock.enableLogbackAccess(this::class.java.classLoader.getResource("logback-access-url.xml")!!)
+        verify(exactly = 1) { httpServerMock.accessLog(true, capture(factoryCapture)) }
+        factoryCapture.captured.accessContext.name shouldEndWith "logback-access-url.xml"
+    }
+}

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/integration/IntegrationTests.kt

@@ -4,7 +4,6 @@ import ch.qos.logback.access.common.joran.JoranConfigurator
 import ch.qos.logback.access.common.spi.IAccessEvent
 import ch.qos.logback.core.spi.FilterReply
 import io.github.dmitrysulman.logback.access.reactor.netty.ReactorNettyAccessLogFactory
-import io.github.dmitrysulman.logback.access.reactor.netty.enableLogbackAccess
 import io.kotest.assertions.nondeterministic.continually
 import io.kotest.assertions.nondeterministic.eventually
 import io.kotest.matchers.collections.shouldBeEmpty
@@ -199,7 +198,7 @@ class IntegrationTests {
         responseContent: String,
     ) = HttpServer
         .create()
-        .enableLogbackAccess(accessLogFactory)
+        .accessLog(true, accessLogFactory)
         .handle { request, response ->
             val remoteHost = request.remoteAddress()!!.hostString
             val remoteAddress = request.remoteAddress()!!.address.hostAddress