Package and jdk target update

Author: eliasmeireles

Makefile

@@ -1,5 +1,6 @@
 local-publish:
+	./gradlew test
 	./gradlew publishToMavenLocal
 
 test:
-	./gradlew test
+	./gradlew test

README.md

@@ -15,11 +15,11 @@ JsonLog(kLogger)
 
 ```java
 new JsonLog(logger)
+		.level(Level.INFO)
 		.add("test-key","test-value")
 		.error(error)
-		.level(Level.INFO)
-		.printStackTracker(true)
-		.message("this is a test log message created in {} of lib version {}",LocalDate.of(2022,8,12),"1.0.0")
+		.printStackTrackerEnable()
+		.message("this is a test log message created in {} of lib version {}", LocalDate.of(2022,8,12), "1.0.0")
 		.run()
 ```
 

build.gradle.kts

@@ -1,10 +1,11 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     `maven-publish`
-    kotlin("jvm") version "1.7.22"
+    kotlin("jvm") version "1.8.20"
 }
 
 repositories {
@@ -17,33 +18,41 @@ java {
     withSourcesJar()
 }
 
-val apiVersion = "0.0.5"
+val apiVersion = "0.0.7"
 
 
-group = "com.softwareplace"
+val appGroup = "com.softwareplace.jsonlogger"
+
+group = appGroup
+
 version = apiVersion
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+
 publishing {
     publications {
         create<MavenPublication>("maven") {
-            groupId = "com.softwareplace"
+            groupId = appGroup
             artifactId = "json-logger"
             version = apiVersion
-
             from(components["java"])
         }
-    }
-}
 
-afterEvaluate {
-    publishing {
-        publications {
-            create<MavenPublication>("release") {
-                from(components["java"])
-                groupId = "com.github.eliasmeireles"
-                artifactId = "json-logger"
-                version = apiVersion
-            }
+        create<MavenPublication>("release") {
+            from(components["java"])
+            groupId = "com.github.eliasmeireles"
+            artifactId = "json-logger"
+            version = apiVersion
         }
     }
 }
@@ -76,3 +85,5 @@ tasks.withType<Test> {
         )
     }
 }
+
+

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-package com.softwareplace.json.logger.format
+package com.softwareplace.jsonlogger.format
 
 import java.text.DateFormat
 import java.text.SimpleDateFormat

…replace/json/logger/format/DateFormat.kt …areplace/jsonlogger/format/DateFormat.ktsrc/main/kotlin/com/softwareplace/json/logger/format/DateFormat.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/format/DateFormat.kt src/main/kotlin/com/softwareplace/json/logger/format/DateFormat.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/format/DateFormat.kt

@@ -1,14 +1,17 @@
-package com.softwareplace.json.logger.log
+package com.softwareplace.jsonlogger.log
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.softwareplace.json.logger.mapper.getObjectMapper
+import com.softwareplace.jsonlogger.mapper.getObjectMapper
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.slf4j.event.Level
 
 
 inline val <reified T : Any> T.kLogger: Logger get() = LoggerFactory.getLogger(T::class.java)
 
+val Logger.jsonLog: JsonLog get() = JsonLog(this)
+
+
 private data class LoggerModel(
     val message: String?,
     val properties: Map<String, Any>?,
@@ -34,21 +37,33 @@ data class JsonLog(
         return this
     }
 
-    fun printStackTracker(value: Boolean): JsonLog {
-        this.printStackTraceEnable = value
+    fun printStackTrackerEnable(): JsonLog {
+        this.printStackTraceEnable = true
         return this
     }
 
-    fun message(message: String, vararg args: Any?): JsonLog {
-        this.message = String.format(message.replace("{}", "%s"), *args)
+    fun printStackTrackerDisable(): JsonLog {
+        this.printStackTraceEnable = false
         return this
     }
 
-    fun add(key: String, value: Any): JsonLog {
-        if (properties == null) {
-            properties = HashMap()
+    fun message(message: String?, vararg args: Any?): JsonLog {
+        message?.let {
+            this.message = String.format(message.replace("{}", "%s"), *args)
+        }
+        return this
+    }
+
+    fun add(key: String?, value: Any?): JsonLog {
+        key?.let {
+            value?.let {
+                if (properties == null) {
+                    properties = HashMap()
+                }
+
+                properties?.let { it[key] = value }
+            }
         }
-        properties?.let { it[key] = value }
         return this
     }
 

…twareplace/json/logger/log/JsonLogger.kt …ftwareplace/jsonlogger/log/JsonLogger.ktsrc/main/kotlin/com/softwareplace/json/logger/log/JsonLogger.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/log/JsonLogger.kt src/main/kotlin/com/softwareplace/json/logger/log/JsonLogger.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/log/JsonLogger.kt

@@ -1,9 +1,9 @@
-package com.softwareplace.json.logger.mapper
+package com.softwareplace.jsonlogger.mapper
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-import com.softwareplace.json.logger.format.dateFormat
+import com.softwareplace.jsonlogger.format.dateFormat
 
 fun getObjectMapper(): ObjectMapper {
     return ObjectMapper()

…eplace/json/logger/mapper/MapperBuild.kt …replace/jsonlogger/mapper/MapperBuild.ktsrc/main/kotlin/com/softwareplace/json/logger/mapper/MapperBuild.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/mapper/MapperBuild.kt src/main/kotlin/com/softwareplace/json/logger/mapper/MapperBuild.kt renamed to src/main/kotlin/com/softwareplace/jsonlogger/mapper/MapperBuild.kt

@@ -1,6 +1,5 @@
-package com.softwareplace.json.logger.log
+package com.softwareplace.jsonlogger.log
 
-import com.softwareplace.json.logger.log.*
 import io.mockk.junit5.MockKExtension
 import io.mockk.spyk
 import io.mockk.verify
@@ -63,12 +62,19 @@ class JsonLogTestExt {
             .add("test-key", "test-value")
             .error(error)
             .level(Level.INFO)
-            .printStackTracker(true)
+            .printStackTrackerEnable()
             .run()
 
         verify {
-            logger.run(Level.INFO, "{\"properties\":{\"test-key\":\"test-value\"},\"errorMessage\":\"test error log message\"}", error)
-            logger.info("{\"properties\":{\"test-key\":\"test-value\"},\"errorMessage\":\"test error log message\"}", error)
+            logger.run(
+                Level.INFO,
+                "{\"properties\":{\"test-key\":\"test-value\"},\"errorMessage\":\"test error log message\"}",
+                error
+            )
+            logger.info(
+                "{\"properties\":{\"test-key\":\"test-value\"},\"errorMessage\":\"test error log message\"}",
+                error
+            )
         }
     }
 
@@ -102,7 +108,7 @@ class JsonLogTestExt {
             .error(error)
             .message("this is a test log message created in {} of lib version {}", LocalDate.of(2022, 8, 12), "1.0.0")
             .level(Level.ERROR)
-            .printStackTracker(true)
+            .printStackTrackerEnable()
             .run()
 
         verify {