fix(kotlin): create kotlinModule using Builder instead constructor (s…

…pinnaker#4219) (spinnaker#4220)

(cherry picked from commit d24ce6d)

Co-authored-by: Edgar Garcia <63310723+edgarulg@users.noreply.github.com>

keiko-redis-spring/src/main/kotlin/com/netflix/spinnaker/config/RedisQueueConfiguration.kt

@@ -194,7 +194,7 @@ class RedisQueueConfiguration {
   @ConditionalOnMissingBean
   fun redisQueueObjectMapper(properties: Optional<ObjectMapperSubtypeProperties>): ObjectMapper =
     ObjectMapper().apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
 
       SpringObjectMapperConfigurer(

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/RedisClusterDeadMessageHandler.kt

@@ -16,7 +16,7 @@ class RedisClusterDeadMessageHandler(
 
   private val dlqKey = "{$deadLetterQueueName}.messages"
 
-  private val mapper = ObjectMapper().registerModule(KotlinModule())
+  private val mapper = ObjectMapper().registerModule(KotlinModule.Builder().build())
 
   override fun invoke(queue: Queue, message: Message) {
     jedisCluster.use { cluster ->

keiko-redis/src/main/kotlin/com/netflix/spinnaker/q/redis/RedisDeadMessageHandler.kt

@@ -36,7 +36,7 @@ class RedisDeadMessageHandler(
 
   private val dlqKey = "$deadLetterQueueName.messages"
 
-  private val mapper = ObjectMapper().registerModule(KotlinModule())
+  private val mapper = ObjectMapper().registerModule(KotlinModule.Builder().build())
 
   override fun invoke(queue: Queue, message: Message) {
     pool.resource.use { redis ->

keiko-redis/src/test/kotlin/com/netflix/spinnaker/q/redis/RedisQueueTest.kt

@@ -61,7 +61,7 @@ private fun createQueue(clock: Clock,
       }
       ),
     mapper = ObjectMapper().apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
 
       registerSubtypes(TestMessage::class.java)

keiko-sql/src/test/kotlin/com/netflix/spinnaker/q/sql/SqlQueueTest.kt

@@ -45,7 +45,7 @@ private fun createQueue(clock: Clock,
     clock = clock,
     lockTtlSeconds = 2,
     mapper = ObjectMapper().apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
 
       registerSubtypes(TestMessage::class.java)

orca-core/src/main/java/com/netflix/spinnaker/orca/jackson/OrcaObjectMapper.java

@@ -50,7 +50,7 @@ public static ObjectMapper newInstance() {
     instance.registerModule(new Jdk8Module());
     instance.registerModule(new GuavaModule());
     instance.registerModule(new JavaTimeModule());
-    instance.registerModule(new KotlinModule());
+    instance.registerModule(new KotlinModule.Builder().build());
     instance.disable(READ_DATE_TIMESTAMPS_AS_NANOSECONDS);
     instance.disable(WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS);
     instance.disable(FAIL_ON_UNKNOWN_PROPERTIES);

orca-keel/src/main/kotlin/com/netflix/spinnaker/orca/config/KeelConfiguration.kt

@@ -66,6 +66,6 @@ class KeelConfiguration {
 
   @Bean fun keelObjectMapper() =
     OrcaObjectMapper.newInstance()
-      .registerModule(KotlinModule())
+      .registerModule(KotlinModule.Builder().build())
       .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
 }

orca-pipelinetemplate/src/main/java/com/netflix/spinnaker/orca/config/PipelineTemplateConfiguration.java

@@ -56,7 +56,7 @@ ObjectMapper pipelineTemplateObjectMapper() {
     return new ObjectMapper()
         .enable(SerializationFeature.INDENT_OUTPUT)
         .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .registerModule(new KotlinModule());
+        .registerModule(new KotlinModule.Builder().build());
   }
 
   @Bean

orca-pipelinetemplate/src/test/groovy/com/netflix/spinnaker/orca/pipelinetemplate/TemplatedPipelineRequestSpec.groovy

@@ -27,7 +27,7 @@ class TemplatedPipelineRequestSpec extends Specification {
   def objectMapper = new ObjectMapper()
     .enable(SerializationFeature.INDENT_OUTPUT)
     .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-    .registerModule(new KotlinModule())
+    .registerModule(new KotlinModule.Builder().build())
 
   @Unroll
   def 'should deserialize config'() {

orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt

@@ -60,7 +60,7 @@ class RedisOrcaQueueConfiguration : RedisQueueConfiguration() {
     taskResolver: TaskResolver
   ) {
     mapper.apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       registerModule(
         SimpleModule()
           .addDeserializer(ExecutionType::class.java, ExecutionTypeDeserializer())

orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/pending/RedisPendingExecutionServiceTest.kt

@@ -15,7 +15,7 @@ internal object RedisPendingExecutionServiceTest : SubjectSpek<RedisPendingExecu
 
   val redis = EmbeddedRedis.embed()
   val mapper = ObjectMapper().apply {
-    registerModule(KotlinModule())
+    registerModule(KotlinModule.Builder().build())
     registerSubtypes(StartExecution::class.java, RestartStage::class.java)
   }
 

orca-queue-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlOrcaQueueConfiguration.kt

@@ -53,7 +53,7 @@ class SqlOrcaQueueConfiguration : SqlQueueConfiguration() {
     taskResolver: TaskResolver
   ) {
     mapper.apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       registerModule(
         SimpleModule()
           .addDeserializer(ExecutionType::class.java, ExecutionTypeDeserializer())

orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/SqlQueueIntegrationTest.kt

@@ -74,7 +74,7 @@ class SqlTestConfig {
     taskResolver: TaskResolver
   ) {
     mapper.apply {
-      registerModule(KotlinModule())
+      registerModule(KotlinModule.Builder().build())
       registerModule(
         SimpleModule()
           .addDeserializer(ExecutionType::class.java, ExecutionTypeDeserializer())

orca-queue-sql/src/test/kotlin/com/netflix/spinnaker/orca/q/sql/pending/SqlPendingExecutionServiceTest.kt

@@ -44,7 +44,7 @@ internal object SqlPendingExecutionServiceTest : SubjectSpek<SqlPendingExecution
   val maxDepth = 4
 
   val mapper = ObjectMapper().apply {
-    registerModule(KotlinModule())
+    registerModule(KotlinModule.Builder().build())
     registerSubtypes(StartExecution::class.java, RestartStage::class.java)
   }
 

orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/migration/TaskTypeDeserializerTest.kt

@@ -32,7 +32,7 @@ object TaskTypeDeserializerTest : Spek({
   val taskResolver = TaskResolver(TasksProvider(listOf(DummyTask())), false)
 
   val objectMapper = ObjectMapper().apply {
-    registerModule(KotlinModule())
+    registerModule(KotlinModule.Builder().build())
     registerModule(
       SimpleModule()
         .addDeserializer(Class::class.java, TaskTypeDeserializer(taskResolver))

orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/pending/DualPendingExecutionServiceTest.kt

@@ -30,7 +30,7 @@ internal object DualPendingExecutionServiceTest : SubjectSpek<DualPendingExecuti
   val primaryRedis = EmbeddedRedis.embed()
   val previousRedis = EmbeddedRedis.embed()
   val mapper = ObjectMapper().apply {
-    registerModule(KotlinModule())
+    registerModule(KotlinModule.Builder().build())
     registerSubtypes(StartExecution::class.java, RestartStage::class.java)
   }
 

orca-sql/src/test/groovy/com/netflix/spinnaker/orca/sql/cleanup/OldPipelineCleanupPollingNotificationAgentSpec.groovy

@@ -46,7 +46,7 @@ import static java.time.temporal.ChronoUnit.DAYS
 abstract class OldPipelineCleanupPollingNotificationAgentSpec extends Specification {
   @Shared
   ObjectMapper mapper = OrcaObjectMapper.newInstance().with {
-    registerModule(new KotlinModule())
+    registerModule(new KotlinModule.Builder().build())
     it
   }
 

orca-sql/src/test/groovy/com/netflix/spinnaker/orca/sql/cleanup/TopApplicationExecutionCleanupPollingNotificationAgentSpec.groovy

@@ -43,7 +43,7 @@ import static java.time.temporal.ChronoUnit.DAYS
 abstract class TopApplicationExecutionCleanupPollingNotificationAgentSpec extends Specification {
   @Shared
   ObjectMapper mapper = OrcaObjectMapper.newInstance().with {
-    registerModule(new KotlinModule())
+    registerModule(new KotlinModule.Builder().build())
     it
   }
 

orca-sql/src/test/groovy/com/netflix/spinnaker/orca/sql/pipeline/persistence/SqlPipelineExecutionRepositorySpec.groovy

@@ -55,7 +55,7 @@ abstract class SqlPipelineExecutionRepositorySpec extends PipelineExecutionRepos
 
   @Shared
   ObjectMapper mapper = OrcaObjectMapper.newInstance().with {
-    registerModule(new KotlinModule())
+    registerModule(new KotlinModule.Builder().build())
     it
   }