Skip to content

Commit f6c7e99

Browse files
committed
Enhancing logger builder
1 parent 41e73d9 commit f6c7e99

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ java {
1717
withSourcesJar()
1818
}
1919

20-
val apiVersion = "0.0.4"
20+
val apiVersion = "0.0.5"
2121

2222

2323
group = "com.softwareplace"

src/main/kotlin/com/softwareplace/json/logger/log/JsonLogger.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory
77
import org.slf4j.event.Level
88

99

10-
inline val <reified T : Any> T.logger: Logger get() = LoggerFactory.getLogger(T::class.java)
11-
val Logger.jsonLog: JsonLog get() = JsonLog(this)
10+
inline val <reified T : Any> T.kLogger: Logger get() = LoggerFactory.getLogger(T::class.java)
1211

1312
private data class LoggerModel(
1413
val message: String?,
1514
val properties: Map<String, Any>?,
1615
val errorMessage: String? = null,
1716
)
1817

19-
data class JsonLog(private val logger: Logger) {
18+
data class JsonLog(
19+
val kLog: Logger
20+
) {
2021
private var message: String? = null
2122
private var properties: HashMap<String, Any>? = null
2223
private var error: Throwable? = null
2324
private var printStackTraceEnable: Boolean = false
2425
private var level: Level = Level.TRACE
2526

26-
2727
fun level(level: Level): JsonLog {
2828
this.level = level
2929
return this
@@ -64,9 +64,9 @@ data class JsonLog(private val logger: Logger) {
6464
)
6565

6666
return if (printStackTraceEnable) {
67-
logger.run(level, loggerMessage, error)
67+
kLog.run(level, loggerMessage, error)
6868
} else {
69-
logger.run(level, loggerMessage)
69+
kLog.run(level, loggerMessage)
7070
}
7171
}
7272

@@ -79,9 +79,9 @@ data class JsonLog(private val logger: Logger) {
7979
)
8080
)
8181
return if (printStackTraceEnable) {
82-
logger.run(level, loggerMessage, error)
82+
kLog.run(level, loggerMessage, error)
8383
} else {
84-
logger.run(level, loggerMessage)
84+
kLog.run(level, loggerMessage)
8585
}
8686
}
8787
}

src/test/kotlin/com/softwareplace/json/logger/log/JsonLogTestExt.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import java.time.LocalDate
1414
class JsonLogTestExt {
1515
@Test
1616
fun `must to call logger with expected json`() {
17-
val logger = spyk(logger)
18-
.jsonLog
17+
val logger = spyk(kLogger)
18+
19+
JsonLog(logger)
1920
.add("test-key", "test-value")
2021
.level(Level.INFO)
2122
.run()
@@ -28,7 +29,8 @@ class JsonLogTestExt {
2829

2930
@Test
3031
fun `must to call log debug with expected json`() {
31-
val logger = spyk(logger)
32+
val logger = spyk(kLogger)
33+
3234
JsonLog(logger)
3335
.add("test-key", "test-value")
3436
.level(Level.DEBUG)
@@ -42,7 +44,7 @@ class JsonLogTestExt {
4244

4345
@Test
4446
fun `must to call log warn with expected json`() {
45-
val logger = spyk(logger)
47+
val logger = spyk(kLogger)
4648
JsonLog(logger)
4749
.add("test-key", "test-value")
4850
.level(Level.WARN)
@@ -56,7 +58,7 @@ class JsonLogTestExt {
5658

5759
@Test
5860
fun `must to call logger with error message`() {
59-
val logger = spyk(logger)
61+
val logger = spyk(kLogger)
6062
val error = IllegalArgumentException("test error log message")
6163
JsonLog(logger)
6264
.add("test-key", "test-value")
@@ -73,7 +75,7 @@ class JsonLogTestExt {
7375

7476
@Test
7577
fun `must to call logInfo with message`() {
76-
val logger = spyk(logger)
78+
val logger = spyk(kLogger)
7779
JsonLog(logger)
7880
.add("test-key", "test-value")
7981
.message("this is a test log message created in {} of lib version {}", LocalDate.of(2022, 8, 12), "1.0.0")
@@ -94,7 +96,7 @@ class JsonLogTestExt {
9496

9597
@Test
9698
fun `must to call log error with message`() {
97-
val logger = spyk(logger)
99+
val logger = spyk(kLogger)
98100
val error = IllegalArgumentException("test error log message")
99101
JsonLog(logger)
100102
.add("test-key", "test-value")

0 commit comments

Comments
 (0)