yaml object mapper

sokomishalov · Sep 18, 2019 · c4e56cf · c4e56cf
1 parent 9486abe
commit c4e56cf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/commons-core/pom.xml b/commons-core/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core-common</artifactId>
+            <version>${kotlinx.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-coroutines-core</artifactId>
@@ -86,6 +91,11 @@
             <artifactId>jackson-datatype-guava</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/...ons-core/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ObjectMapperHelper.kt b/...ons-core/src/main/kotlin/ru/sokomishalov/commons/core/serialization/ObjectMapperHelper.kt
@@ -7,11 +7,13 @@ package ru.sokomishalov.commons.core.serialization
  */
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL
+import com.fasterxml.jackson.core.JsonFactory
 import com.fasterxml.jackson.databind.DeserializationFeature.*
 import com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature.FAIL_ON_EMPTY_BEANS
 import com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import com.fasterxml.jackson.datatype.guava.GuavaModule
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
@@ -22,8 +24,10 @@ import com.fasterxml.jackson.module.kotlin.registerKotlinModule
  */
 val OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper()
 
-private fun buildComplexObjectMapper(): ObjectMapper {
-    return ObjectMapper()
+val YAML_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(YAMLFactory())
+
+private fun buildComplexObjectMapper(factory: JsonFactory? = null): ObjectMapper {
+    return ObjectMapper(factory)
             .registerKotlinModule()
             .registerModule(JavaTimeModule())
             .registerModule(GuavaModule())