Merge pull request #2 from caplin/add-object-mapper

Add object mapper as optional parameter to SimpleDatasourceFactory.

Author: rossdanderson

buildSrc/src/main/kotlin/common-library.gradle.kts

@@ -1,6 +1,5 @@
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinJvm
-import gradle.kotlin.dsl.accessors._94cffe4e74c4f6a3b1c88c3e0c336ef5.mavenPublishing
 import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.api.file.DuplicatesStrategy.WARN
 

spring/src/main/kotlin/com/caplin/integration/datasourcex/spring/internal/DataSourceAutoConfiguration.kt

@@ -7,7 +7,7 @@ import com.caplin.datasource.messaging.json.JacksonJsonHandler
 import com.caplin.integration.datasourcex.spring.DataSourceConfigurationProperties
 import com.caplin.integration.datasourcex.util.SimpleDataSourceConfig.Discovery
 import com.caplin.integration.datasourcex.util.SimpleDataSourceConfig.Peer
-import com.caplin.integration.datasourcex.util.SimpleDatasourceFactory.createDataSource
+import com.caplin.integration.datasourcex.util.SimpleDataSourceFactory.createDataSource
 import com.caplin.integration.datasourcex.util.getLogger
 import com.fasterxml.jackson.databind.ObjectMapper
 import java.nio.file.Paths

util/api/datasourcex-util.api

@@ -133,9 +133,11 @@ public final class com/caplin/integration/datasourcex/util/SimpleDataSourceConfi
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/caplin/integration/datasourcex/util/SimpleDatasourceFactory {
-	public static final field INSTANCE Lcom/caplin/integration/datasourcex/util/SimpleDatasourceFactory;
-	public static final fun createDataSource (Lcom/caplin/integration/datasourcex/util/SimpleDataSourceConfig;)Lcom/caplin/datasource/DataSource;
+public final class com/caplin/integration/datasourcex/util/SimpleDataSourceFactory {
+	public static final field INSTANCE Lcom/caplin/integration/datasourcex/util/SimpleDataSourceFactory;
+	public static final fun createDataSource (Lcom/caplin/integration/datasourcex/util/SimpleDataSourceConfig;Lcom/fasterxml/jackson/databind/ObjectMapper;)Lcom/caplin/datasource/DataSource;
+	public static synthetic fun createDataSource$default (Lcom/caplin/integration/datasourcex/util/SimpleDataSourceConfig;Lcom/fasterxml/jackson/databind/ObjectMapper;ILjava/lang/Object;)Lcom/caplin/datasource/DataSource;
+	public final fun getDefaultObjectMapper ()Lcom/fasterxml/jackson/databind/ObjectMapper;
 }
 
 public final class com/caplin/integration/datasourcex/util/TimeoutKt {

util/build.gradle.kts

@@ -8,6 +8,9 @@ dependencies {
   api("org.slf4j:slf4j-api")
   api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
   api("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm")
+  api("com.fasterxml.jackson.core:jackson-core")
+  implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 
   implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
   implementation(libs.kotlin.collections.immutable)

…asourcex/util/SimpleDatasourceFactory.kt …asourcex/util/SimpleDataSourceFactory.ktutil/src/main/kotlin/com/caplin/integration/datasourcex/util/SimpleDatasourceFactory.kt renamed to util/src/main/kotlin/com/caplin/integration/datasourcex/util/SimpleDataSourceFactory.kt util/src/main/kotlin/com/caplin/integration/datasourcex/util/SimpleDatasourceFactory.kt renamed to util/src/main/kotlin/com/caplin/integration/datasourcex/util/SimpleDataSourceFactory.kt

@@ -1,14 +1,24 @@
 package com.caplin.integration.datasourcex.util
 
 import com.caplin.datasource.DataSource
+import com.caplin.datasource.messaging.json.JacksonJsonHandler
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature.WRITE_DATES_AS_TIMESTAMPS
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import java.nio.file.Files
 import java.util.logging.Logger
 
-object SimpleDatasourceFactory {
+object SimpleDataSourceFactory {
 
   private const val MAX_PATH_LENGTH = 32
 
-  private val logger = getLogger<SimpleDatasourceFactory>()
+  private val logger = getLogger<SimpleDataSourceFactory>()
+
+  val defaultObjectMapper: ObjectMapper =
+      jacksonObjectMapper()
+          .configure(WRITE_DATES_AS_TIMESTAMPS, false)
+          .registerModule(JavaTimeModule())
 
   /**
    * Creates a data source based on the given simple configuration.
@@ -17,13 +27,17 @@ object SimpleDatasourceFactory {
    * @return The created data source.
    */
   @JvmStatic
-  fun createDataSource(simpleConfig: SimpleDataSourceConfig): DataSource {
+  fun createDataSource(
+      simpleConfig: SimpleDataSourceConfig,
+      objectMapper: ObjectMapper = defaultObjectMapper
+  ): DataSource {
     val logPath =
         simpleConfig.logDirectory
             ?: run {
               val tmpLogPath =
                   Files.createTempDirectory(
-                      simpleConfig.name.replace("\\s".toRegex(), "").take(MAX_PATH_LENGTH))
+                      simpleConfig.name.replace("\\s".toRegex(), "").take(MAX_PATH_LENGTH),
+                  )
               logger.warn {
                 "log file path is not specified, writing datasource logs to $tmpLogPath"
               }
@@ -50,24 +64,24 @@ object SimpleDatasourceFactory {
                 |datasrc-dev-override ${simpleConfig.devOverride}
                 |discovery-require-service ${simpleConfig.requiredServices.joinToString(" ")}
                 ${
-                    simpleConfig.incoming?.let { 
-                        """
+              simpleConfig.incoming?.let {
+                """
                         |${if (it.isWebsocket) "datasrc-ws-port" else "datasrc-port"} ${it.port}
                         """
-                    }.orEmpty()
-                }
+              }.orEmpty()
+            }
                 ${
-                    simpleConfig.outgoing.joinToString("\n") {
-                        """
+              simpleConfig.outgoing.joinToString("\n") {
+                """
                         |add-peer
                         |    addr         ${it.hostname}
                         |    port         ${it.port}
                         |    local-type   active|contrib
                         |    websocket    ${it.isWebsocket}
                         |end-peer
                         """
-                    }
-                }
+              }
+            }
                 """
         }
 
@@ -99,5 +113,12 @@ object SimpleDatasourceFactory {
             .trimMargin()
 
     return DataSource.fromConfigString(config, Logger.getLogger(DataSource::class.qualifiedName))
+        .apply {
+          extraConfiguration.jsonHandler =
+              JacksonJsonHandler(
+                  Logger.getLogger(JacksonJsonHandler::class.qualifiedName),
+                  objectMapper,
+              )
+        }
   }
 }