Rewrite Java code to Kotlin

build.gradle.kts

@@ -1,4 +1,3 @@
-
 plugins {
     `java-library`
     `maven-publish`
@@ -8,6 +7,14 @@ plugins {
     id("io.spring.dependency-management") version "1.1.2"
 }
 
+buildscript {
+    val kotlinVersion = "1.8.21"
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-noarg:$kotlinVersion")
+        classpath("org.jmailen.gradle:kotlinter-gradle:3.14.0")
+    }
+}
+
 repositories {
     mavenLocal()
     maven {
@@ -19,11 +26,11 @@ repositories {
 group = "com.github.firetail-io"
 version = "0.0.1.SNAPSHOT"
 description = "firetail-java-lib"
-java.sourceCompatibility = JavaVersion.VERSION_1_8
+// java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
     implementation(
-        platform("org.springframework.boot:spring-boot-dependencies:2.7.14"),
+        platform("org.springframework.boot:spring-boot-dependencies:2.7.15"),
     )
     api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     api("commons-io:commons-io:2.7")
@@ -40,7 +47,8 @@ dependencies {
     compileOnly("org.springframework:spring-webmvc")
     testImplementation(kotlin("test"))
     testImplementation("javax.servlet:javax.servlet-api")
-    testImplementation("org.springframework:spring-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework:spring-webmvc")
     testImplementation("org.assertj:assertj-core")
     testImplementation("org.mockito.kotlin:mockito-kotlin:5.0.0")
 }
@@ -51,7 +59,7 @@ publishing {
     }
 }
 kotlin {
-    jvmToolchain(8)
+    jvmToolchain(17)
 }
 
 tasks.test { // See 5️⃣

src/main/kotlin/io/firetail/logging/Constants.kt → src/main/kotlin/io/firetail/logging/base/Constants.kt

@@ -1,4 +1,4 @@
-package io.firetail.logging
+package io.firetail.logging.base
 
 class Constants {
     companion object {
@@ -7,6 +7,7 @@ class Constants {
         const val OP_NAME = "X-Operation-Name"
         const val RESPONSE_TIME = "X-Response-Time"
         const val RESPONSE_STATUS = "X-Response-Status"
+        const val AUDIT = "audit"
         val empty = ByteArray(0)
     }
 }

src/main/kotlin/io/firetail/logging/base/FiretailConfig.kt

@@ -0,0 +1,27 @@
+package io.firetail.logging.base
+
+import io.firetail.logging.servlet.FiretailFilter
+import io.firetail.logging.util.LogContext
+import io.firetail.logging.util.StringUtils
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.ApplicationContext
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
+
+@Configuration
+@Import(
+    FiretailLogger::class,
+    StringUtils::class,
+    LogContext::class,
+    FiretailFilter::class,
+)
+class FiretailConfig @Autowired constructor(
+    @Value("\${firetail.ignorePatterns:#null}")
+    val ignorePatterns: String?,
+    @Value("\${firetail.logHeaders:false}")
+    val logHeaders: Boolean = false,
+) {
+    @Autowired
+    lateinit var context: ApplicationContext
+}

src/main/kotlin/io/firetail/logging/base/FiretailLogger.kt

@@ -0,0 +1,89 @@
+package io.firetail.logging.base
+
+import io.firetail.logging.servlet.SpringRequestWrapper
+import io.firetail.logging.servlet.SpringResponseWrapper
+import io.firetail.logging.util.StringUtils
+import net.logstash.logback.argument.StructuredArguments
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Service
+
+@Service
+class FiretailLogger(
+    private val stringUtils: StringUtils = StringUtils(),
+    private val firetailConfig: FiretailConfig,
+) {
+    fun logRequest(wrappedRequest: SpringRequestWrapper) =
+        if (firetailConfig.logHeaders) {
+            logWithHeaders(wrappedRequest)
+        } else {
+            logNoHeaders(wrappedRequest)
+        }
+
+    private fun logNoHeaders(wrappedRequest: SpringRequestWrapper) {
+        LOGGER.info(
+            "Request: method={}, uri={}, payload={}, audit={}",
+            wrappedRequest.method,
+            wrappedRequest.requestURI,
+            stringUtils.toString(wrappedRequest.inputStream.readAllBytes(), wrappedRequest.characterEncoding),
+            StructuredArguments.value(Constants.AUDIT, true),
+        )
+    }
+
+    private fun logWithHeaders(wrappedRequest: SpringRequestWrapper) {
+        LOGGER.info(
+            "Request: method={}, uri={}, payload={}, headers={}, audit={}",
+            wrappedRequest.method,
+            wrappedRequest.requestURI,
+            stringUtils.toString(wrappedRequest.inputStream.readAllBytes(), wrappedRequest.characterEncoding),
+            wrappedRequest.allHeaders,
+            StructuredArguments.value(Constants.AUDIT, true),
+        )
+    }
+
+    fun logResponse(
+        startTime: Long,
+        wrappedResponse: SpringResponseWrapper,
+        status: Int = wrappedResponse.status,
+    ) {
+        val duration = System.currentTimeMillis() - startTime
+        wrappedResponse.characterEncoding = stringUtils.charSet()
+        if (firetailConfig.logHeaders) {
+            logWithHeaders(duration, status, wrappedResponse)
+        } else {
+            logNoHeaders(duration, status, wrappedResponse)
+        }
+    }
+
+    private fun logNoHeaders(
+        duration: Long,
+        status: Int,
+        wrappedResponse: SpringResponseWrapper,
+    ) {
+        LOGGER.info(
+            "Response({} ms): status={}, payload={}, audit={}",
+            StructuredArguments.value(Constants.RESPONSE_TIME, duration),
+            StructuredArguments.value(Constants.RESPONSE_STATUS, status),
+            stringUtils.toString(wrappedResponse.contentAsByteArray),
+            StructuredArguments.value(Constants.AUDIT, true),
+        )
+    }
+
+    private fun logWithHeaders(
+        duration: Long,
+        status: Int,
+        wrappedResponse: SpringResponseWrapper,
+    ) {
+        LOGGER.info(
+            "Response({} ms): status={}, payload={}, headers={}, audit={}",
+            StructuredArguments.value(Constants.RESPONSE_TIME, duration),
+            StructuredArguments.value(Constants.RESPONSE_STATUS, status),
+            stringUtils.toString(wrappedResponse.contentAsByteArray),
+            wrappedResponse.allHeaders,
+            StructuredArguments.value(Constants.AUDIT, true),
+        )
+    }
+
+    companion object {
+        private val LOGGER = LoggerFactory.getLogger(this::class.java)
+    }
+}

src/main/kotlin/io/firetail/logging/config/SpringLoggerAutoConfiguration.kt → src/main/kotlin/io/firetail/logging/base/SpringLoggerAutoConfiguration.kt

@@ -1,14 +1,13 @@
-package io.firetail.logging.config
+package io.firetail.logging.base
 
-import io.firetail.logging.client.RestTemplateSetHeaderInterceptor
-import io.firetail.logging.filter.SpringLoggerFilter
-import io.firetail.logging.util.UniqueIDGenerator
+import io.firetail.logging.servlet.FiretailHeaderInterceptor
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
 import org.springframework.http.client.ClientHttpRequestInterceptor
 import org.springframework.web.client.RestTemplate
 import java.util.*
@@ -18,6 +17,7 @@ import javax.annotation.PostConstruct
 // import net.logstash.logback.encoder.LogstashEncoder;
 @Configuration
 @ConfigurationProperties(prefix = "logging.logstash")
+@Import(FiretailConfig::class)
 class SpringLoggerAutoConfiguration {
     // private static final String FIRETAIL_APPENDER_NAME = "FIRETAIL";
     var url = "localhost:8500"
@@ -32,22 +32,12 @@ class SpringLoggerAutoConfiguration {
     @Autowired(required = false)
     var template: Optional<RestTemplate>? = null
 
-    @Bean
-    fun generator(): UniqueIDGenerator {
-        return UniqueIDGenerator()
-    }
-
-    @Bean
-    fun loggingFilter(): SpringLoggerFilter {
-        return SpringLoggerFilter(generator(), ignorePatterns, isLogHeaders)
-    }
-
     @Bean
     @ConditionalOnMissingBean(RestTemplate::class)
     fun restTemplate(): RestTemplate {
         val restTemplate = RestTemplate()
         val interceptorList: MutableList<ClientHttpRequestInterceptor> = ArrayList()
-        interceptorList.add(RestTemplateSetHeaderInterceptor())
+        interceptorList.add(FiretailHeaderInterceptor())
         restTemplate.interceptors = interceptorList
         return restTemplate
     }
@@ -84,7 +74,7 @@ class SpringLoggerAutoConfiguration {
     fun init() {
         template!!.ifPresent { restTemplate: RestTemplate ->
             val interceptorList: MutableList<ClientHttpRequestInterceptor> = ArrayList()
-            interceptorList.add(RestTemplateSetHeaderInterceptor())
+            interceptorList.add(FiretailHeaderInterceptor())
             restTemplate.interceptors = interceptorList
         }
     }