From 8f29f3496b821daa2e1da124f52ff588e5bab29b Mon Sep 17 00:00:00 2001 From: jini Date: Sun, 4 Dec 2022 02:55:04 +0900 Subject: [PATCH] :heavy_plus_sign: springmockk --- build.gradle.kts | 1 + .../kotlin/me/jiniworld/demohx/GsonUtils.kt | 23 +++---------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 928ab77..32e3558 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,7 @@ subprojects { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.springframework.boot:spring-boot-starter-test") + implementation("com.ninja-squad:springmockk:3.1.1") // implementation("com.google.code.gson:gson:2.9.0") // implementation("org.jetbrains:annotations:23.0.0") diff --git a/util/common-util/src/main/kotlin/me/jiniworld/demohx/GsonUtils.kt b/util/common-util/src/main/kotlin/me/jiniworld/demohx/GsonUtils.kt index 9a9a03d..f069ce2 100644 --- a/util/common-util/src/main/kotlin/me/jiniworld/demohx/GsonUtils.kt +++ b/util/common-util/src/main/kotlin/me/jiniworld/demohx/GsonUtils.kt @@ -5,18 +5,15 @@ import com.google.gson.GsonBuilder import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter -import mu.KotlinLogging import java.time.LocalDate import java.time.LocalDateTime import java.time.LocalTime import java.time.format.DateTimeFormatter object GsonUtils { - private val logger = KotlinLogging.logger {} - - private val patternDate = "yyyy-MM-dd" - private val patternTime = "HH:mm:ss" - private val patternDateTime = "yyyy-MM-dd HH:mm:ss" + private const val patternDate = "yyyy-MM-dd" + private const val patternTime = "HH:mm:ss" + private const val patternDateTime = "yyyy-MM-dd HH:mm:ss" private val gson = GsonBuilder() .disableHtmlEscaping() @@ -34,20 +31,6 @@ object GsonUtils { fun fromJson(str: String, clazz: Class): T { return gson.fromJson(str, clazz) } - -// fun toJson(obj: Any): String? { -// val result = gson.toJson(obj) -// return if("null" == result) null else result -// } -// -// fun fromJson(str: String, clazz: Class): T? { -// try { -// return gson.fromJson(str, clazz) -// } catch (e: JsonSyntaxException) { -// logger.error{ e.message } -// } -// return null -// } class LocalDateAdapter : TypeAdapter() { private val format: DateTimeFormatter = DateTimeFormatter.ofPattern(patternDate)