Fix kotlinx serde API usage

slinkydeveloper · slinkydeveloper · commit 0f691e3a0c68 · 2025-03-31T19:50:08.000+02:00
diff --git a/client-kotlin/build.gradle.kts b/client-kotlin/build.gradle.kts
@@ -8,4 +8,6 @@ description = "Restate Client to interact with services from within other Kotlin
 dependencies {
   api(project(":client"))
   implementation(libs.kotlinx.coroutines.core)
+
+  runtimeOnly(project(":sdk-serde-kotlinx"))
 }
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -15,6 +15,5 @@ dependencies {
   implementation(libs.jackson.core)
   implementation(libs.log4j.api)
 
-  testImplementation(libs.junit.jupiter)
-  testImplementation(libs.assertj)
+  runtimeOnly(project(":sdk-serde-jackson"))
 }
diff --git a/common/src/main/java/dev/restate/serde/SerdeFactory.java b/common/src/main/java/dev/restate/serde/SerdeFactory.java
@@ -17,11 +17,11 @@
  * </ul>
  *
  * When using the Java APIs, a Jackson based implementation is used by default, see {@link
- * dev.restate.sdk.serde.jackson.JacksonSerdeFactory} in {@code sdk-serde-jackson} module.
+ * dev.restate.serde.jackson.JacksonSerdeFactory} in {@code sdk-serde-jackson} module.
  *
  * <p>When using the Kotlin APIs, a Kotlin Serialization implementation is used by default, see
- * {@link dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory} in {@code
- * sdk-api-kotlin} module.
+ * {@link dev.restate.serde.kotlinx.KotlinSerializationSerdeFactory} in {@code sdk-api-kotlin}
+ * module.
  *
  * <p>You can override the default factory used for a given service by adding the annotation {@link
  * dev.restate.sdk.annotation.CustomSerdeFactory} on the interface/class annotated with {@link
diff --git a/sdk-api-gen/src/main/java/dev/restate/sdk/gen/ElementConverter.java b/sdk-api-gen/src/main/java/dev/restate/sdk/gen/ElementConverter.java
@@ -84,7 +84,7 @@ Service fromTypeElement(MetaRestateAnnotation metaAnnotation, TypeElement elemen
           Diagnostic.Kind.WARNING, "The service " + serviceName + " has no handlers", element);
     }
 
-    String serdeFactoryDecl = "new dev.restate.sdk.serde.jackson.JacksonSerdeFactory()";
+    String serdeFactoryDecl = "new dev.restate.serde.jackson.JacksonSerdeFactory()";
     CustomSerdeFactory customSerdeFactory = element.getAnnotation(CustomSerdeFactory.class);
     if (customSerdeFactory != null) {
       serdeFactoryDecl = "new " + getCustomSerdeClassCanonicalName(customSerdeFactory) + "()";
diff --git a/sdk-api-kotlin-gen/src/main/kotlin/dev/restate/sdk/kotlin/gen/KElementConverter.kt b/sdk-api-kotlin-gen/src/main/kotlin/dev/restate/sdk/kotlin/gen/KElementConverter.kt
@@ -33,10 +33,7 @@ class KElementConverter(
     private val SUPPORTED_CLASS_KIND: Set<ClassKind> = setOf(ClassKind.CLASS, ClassKind.INTERFACE)
     private val EMPTY_PAYLOAD: PayloadType =
         PayloadType(
-            true,
-            "",
-            "Unit",
-            "dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory.UNIT")
+            true, "", "Unit", "dev.restate.serde.kotlinx.KotlinSerializationSerdeFactory.UNIT")
     private const val RAW_SERDE: String = "dev.restate.serde.Serde.RAW"
   }
 
@@ -94,7 +91,7 @@ class KElementConverter(
           classDeclaration)
     }
 
-    var serdeFactoryDecl = "dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory()"
+    var serdeFactoryDecl = "dev.restate.serde.kotlinx.KotlinSerializationSerdeFactory()"
     val customSerdeFactory: CustomSerdeFactory? =
         classDeclaration.getAnnotationsByType(CustomSerdeFactory::class).firstOrNull()
     if (customSerdeFactory != null) {
@@ -297,7 +294,7 @@ class KElementConverter(
     return when (ty) {
       builtIns.unitType -> EMPTY_PAYLOAD.serdeDecl
       else ->
-          "SERDE_FACTORY.create(dev.restate.sdk.kotlin.serialization.typeTag<${boxedType(ty, qualifiedTypeName)}>())"
+          "SERDE_FACTORY.create(dev.restate.serde.kotlinx.typeTag<${boxedType(ty, qualifiedTypeName)}>())"
     }
   }
 
diff --git a/sdk-api-kotlin/build.gradle.kts b/sdk-api-kotlin/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
   api(libs.kotlinx.serialization.json)
 
   api(project(":sdk-common"))
+  api(project(":sdk-serde-kotlinx"))
 
   implementation(libs.log4j.api)
   implementation(libs.opentelemetry.kotlin)
diff --git a/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/api.kt b/sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/api.kt
@@ -10,12 +10,12 @@ package dev.restate.sdk.kotlin
 
 import dev.restate.common.Output
 import dev.restate.common.Request
-import dev.restate.sdk.kotlin.serialization.typeTag
 import dev.restate.sdk.types.DurablePromiseKey
 import dev.restate.sdk.types.HandlerRequest
 import dev.restate.sdk.types.StateKey
 import dev.restate.sdk.types.TerminalException
 import dev.restate.serde.TypeTag
+import dev.restate.serde.kotlinx.*
 import java.util.*
 import kotlin.random.Random
 import kotlin.time.Duration
diff --git a/sdk-core/src/test/java/dev/restate/sdk/core/javaapi/JavaAPITests.java b/sdk-core/src/test/java/dev/restate/sdk/core/javaapi/JavaAPITests.java
@@ -21,8 +21,8 @@
 import dev.restate.sdk.endpoint.definition.HandlerType;
 import dev.restate.sdk.endpoint.definition.ServiceDefinition;
 import dev.restate.sdk.endpoint.definition.ServiceType;
-import dev.restate.sdk.serde.jackson.JacksonSerdeFactory;
 import dev.restate.serde.Serde;
+import dev.restate.serde.jackson.JacksonSerdeFactory;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/CodegenDiscoveryTest.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/CodegenDiscoveryTest.kt
@@ -52,11 +52,12 @@ class CodegenDiscoveryTest {
 
   @Test
   fun explicitNames() {
-    assertThatDiscovery(object : GreeterWithExplicitName {
-      override fun greet(context: dev.restate.sdk.kotlin.Context, request: String): String {
-        TODO("Not yet implemented")
-      }
-    })
+    assertThatDiscovery(
+            object : GreeterWithExplicitName {
+              override fun greet(context: dev.restate.sdk.kotlin.Context, request: String): String {
+                TODO("Not yet implemented")
+              }
+            })
         .extractingService("MyExplicitName")
         .extractingHandler("my_greeter")
     Assertions.assertThat(GreeterWithExplicitNameHandlers.Metadata.SERVICE_NAME)
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/CodegenTest.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/CodegenTest.kt
@@ -19,11 +19,11 @@ import dev.restate.sdk.core.TestDefinitions.testInvocation
 import dev.restate.sdk.core.TestSerdes
 import dev.restate.sdk.core.statemachine.ProtoUtils.*
 import dev.restate.sdk.kotlin.*
-import dev.restate.sdk.kotlin.serialization.*
 import dev.restate.serde.Serde
 import dev.restate.serde.SerdeFactory
 import dev.restate.serde.TypeRef
 import dev.restate.serde.TypeTag
+import dev.restate.serde.kotlinx.*
 import java.util.stream.Stream
 import kotlinx.serialization.Serializable
 
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/GreeterWithExplicitName.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/GreeterWithExplicitName.kt
@@ -8,13 +8,11 @@
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
 package dev.restate.sdk.core.kotlinapi
 
-import dev.restate.sdk.kotlin.*
 import dev.restate.sdk.annotation.*
+import dev.restate.sdk.kotlin.*
 
 @Service
 @Name("MyExplicitName")
 interface GreeterWithExplicitName {
-  @Handler
-  @Name("my_greeter")
-  fun greet(context: Context, request: String): String
+  @Handler @Name("my_greeter") fun greet(context: Context, request: String): String
 }
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/KotlinAPITests.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/KotlinAPITests.kt
@@ -18,7 +18,7 @@ import dev.restate.sdk.endpoint.definition.HandlerType
 import dev.restate.sdk.endpoint.definition.ServiceDefinition
 import dev.restate.sdk.endpoint.definition.ServiceType
 import dev.restate.sdk.kotlin.*
-import dev.restate.sdk.kotlin.serialization.*
+import dev.restate.serde.kotlinx.*
 import java.util.stream.Stream
 import kotlinx.coroutines.Dispatchers
 
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/SideEffectTest.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/SideEffectTest.kt
@@ -17,8 +17,8 @@ import dev.restate.sdk.endpoint.definition.HandlerType
 import dev.restate.sdk.endpoint.definition.ServiceDefinition
 import dev.restate.sdk.endpoint.definition.ServiceType
 import dev.restate.sdk.kotlin.*
-import dev.restate.sdk.kotlin.serialization.*
 import dev.restate.sdk.types.RetryPolicy
+import dev.restate.serde.kotlinx.*
 import java.util.*
 import kotlin.coroutines.coroutineContext
 import kotlin.time.toKotlinDuration
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/StateTest.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/StateTest.kt
@@ -14,8 +14,8 @@ import dev.restate.sdk.core.TestSerdes
 import dev.restate.sdk.core.kotlinapi.KotlinAPITests.Companion.testDefinitionForVirtualObject
 import dev.restate.sdk.core.statemachine.ProtoUtils.*
 import dev.restate.sdk.kotlin.*
-import dev.restate.sdk.kotlin.serialization.jsonSerde
 import dev.restate.sdk.types.StateKey
+import dev.restate.serde.kotlinx.*
 import java.util.stream.Stream
 import kotlinx.serialization.Serializable
 
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/vertx/RestateHttpServerTest.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/vertx/RestateHttpServerTest.kt
@@ -20,9 +20,8 @@ import dev.restate.sdk.http.vertx.RestateHttpServer
 import dev.restate.sdk.kotlin.HandlerRunner
 import dev.restate.sdk.kotlin.ObjectContext
 import dev.restate.sdk.kotlin.endpoint.endpoint
-import dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory
-import dev.restate.sdk.kotlin.serialization.jsonSerde
 import dev.restate.sdk.kotlin.stateKey
+import dev.restate.serde.kotlinx.*
 import io.netty.buffer.Unpooled
 import io.netty.handler.codec.http.HttpResponseStatus
 import io.vertx.core.Vertx
diff --git a/sdk-core/src/test/kotlin/dev/restate/sdk/core/vertx/ThreadTrampoliningTestSuite.kt b/sdk-core/src/test/kotlin/dev/restate/sdk/core/vertx/ThreadTrampoliningTestSuite.kt
@@ -18,9 +18,9 @@ import dev.restate.sdk.endpoint.definition.ServiceType
 import dev.restate.sdk.kotlin.Context
 import dev.restate.sdk.kotlin.HandlerRunner
 import dev.restate.sdk.kotlin.runBlock
-import dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory
-import dev.restate.sdk.serde.jackson.JacksonSerdeFactory
 import dev.restate.serde.Serde
+import dev.restate.serde.jackson.JacksonSerdeFactory
+import dev.restate.serde.kotlinx.*
 import io.vertx.core.Vertx
 import java.util.stream.Stream
 import kotlin.coroutines.coroutineContext
diff --git a/sdk-serde-jackson/build.gradle.kts b/sdk-serde-jackson/build.gradle.kts
@@ -10,6 +10,8 @@ description = "Restate SDK Jackson integration"
 dependencies {
   compileOnly(libs.jspecify)
 
+  implementation(project(":common"))
+
   api(libs.jackson.databind)
   implementation(libs.jackson.core)
 
@@ -18,6 +20,4 @@ dependencies {
 
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.assertj)
-
-  implementation(project(":sdk-common"))
 }
diff --git a/sdk-serde-jackson/src/main/java/dev/restate/serde/jackson/JacksonSerdeFactory.java b/sdk-serde-jackson/src/main/java/dev/restate/serde/jackson/JacksonSerdeFactory.java
@@ -6,9 +6,9 @@
 // You can find a copy of the license in file LICENSE in the root
 // directory of this repository or package, or at
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
-package dev.restate.sdk.serde.jackson;
+package dev.restate.serde.jackson;
 
-import static dev.restate.sdk.serde.jackson.JacksonSerdes.sneakyThrow;
+import static dev.restate.serde.jackson.JacksonSerdes.sneakyThrow;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
diff --git a/sdk-serde-jackson/src/main/java/dev/restate/serde/jackson/JacksonSerdes.java b/sdk-serde-jackson/src/main/java/dev/restate/serde/jackson/JacksonSerdes.java
@@ -6,7 +6,7 @@
 // You can find a copy of the license in file LICENSE in the root
 // directory of this repository or package, or at
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
-package dev.restate.sdk.serde.jackson;
+package dev.restate.serde.jackson;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/sdk-serde-jackson/src/test/java/dev/restate/serde/jackson/JacksonSerdesTest.java b/sdk-serde-jackson/src/test/java/dev/restate/serde/jackson/JacksonSerdesTest.java
@@ -6,7 +6,7 @@
 // You can find a copy of the license in file LICENSE in the root
 // directory of this repository or package, or at
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
-package dev.restate.sdk.serde.jackson;
+package dev.restate.serde.jackson;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/sdk-serde-kotlinx/build.gradle.kts b/sdk-serde-kotlinx/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+  `kotlin-conventions`
+  `library-publishing-conventions`
+}
+
+description = "Restate SDK Kotlinx Serialization integration"
+
+dependencies {
+  api(libs.kotlinx.serialization.json)
+  implementation(libs.kotlinx.serialization.core)
+
+  implementation(project(":common"))
+}
diff --git a/sdk-serde-kotlinx/src/main/kotlin/dev/restate/serde/kotlinx/KotlinSerializationSerdeFactory.kt b/sdk-serde-kotlinx/src/main/kotlin/dev/restate/serde/kotlinx/KotlinSerializationSerdeFactory.kt
@@ -6,7 +6,7 @@
 // You can find a copy of the license in file LICENSE in the root
 // directory of this repository or package, or at
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
-package dev.restate.sdk.kotlin.serialization
+package dev.restate.serde.kotlinx
 
 import dev.restate.common.Slice
 import dev.restate.serde.Serde
diff --git a/sdk-serde-kotlinx/src/main/kotlin/dev/restate/serde/kotlinx/api.kt b/sdk-serde-kotlinx/src/main/kotlin/dev/restate/serde/kotlinx/api.kt
@@ -6,7 +6,7 @@
 // You can find a copy of the license in file LICENSE in the root
 // directory of this repository or package, or at
 // https://github.com/restatedev/sdk-java/blob/main/LICENSE
-package dev.restate.sdk.kotlin.serialization
+package dev.restate.serde.kotlinx
 
 import dev.restate.serde.Serde
 import dev.restate.serde.TypeTag
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,6 +21,7 @@ include(
     "sdk-api-kotlin",
     "sdk-core",
     "sdk-serde-jackson",
+    "sdk-serde-kotlinx",
     "sdk-request-identity",
     "sdk-http-vertx",
     "sdk-lambda",
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/CancelTestImpl.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/CancelTestImpl.kt
@@ -47,7 +47,8 @@ class CancelTestImpl {
       awakeable.await()
 
       when (operation) {
-        BlockingOperation.CALL -> CancelTestBlockingServiceHandlers.block(context.key(), operation).call(context).await()
+        BlockingOperation.CALL ->
+            CancelTestBlockingServiceHandlers.block(context.key(), operation).call(context).await()
         BlockingOperation.SLEEP -> context.sleep(1024.days)
         BlockingOperation.AWAKEABLE -> {
           val uncompletable: Awakeable<String> = context.awakeable<String>()
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/FailingImpl.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/FailingImpl.kt
@@ -41,7 +41,8 @@ class FailingImpl : Failing {
   ): String {
     LOG.info("Invoked failAndHandle")
 
-    FailingHandlers.terminallyFailingCall( context.random().nextUUID().toString(), errorMessage).call(context)
+    FailingHandlers.terminallyFailingCall(context.random().nextUUID().toString(), errorMessage)
+        .call(context)
         .await()
 
     throw IllegalStateException("This should be unreachable")
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/Main.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/Main.kt
@@ -17,7 +17,10 @@ val KNOWN_SERVICES_FACTORIES: Map<String, () -> Any> =
     mapOf(
         AwakeableHolderHandlers.Metadata.SERVICE_NAME to { AwakeableHolderImpl() },
         BlockAndWaitWorkflowHandlers.Metadata.SERVICE_NAME to { BlockAndWaitWorkflowImpl() },
-        CancelTestBlockingServiceHandlers.Metadata.SERVICE_NAME to { CancelTestImpl.BlockingService() },
+        CancelTestBlockingServiceHandlers.Metadata.SERVICE_NAME to
+            {
+              CancelTestImpl.BlockingService()
+            },
         CancelTestRunnerHandlers.Metadata.SERVICE_NAME to { CancelTestImpl.RunnerImpl() },
         CounterHandlers.Metadata.SERVICE_NAME to { CounterImpl() },
         FailingHandlers.Metadata.SERVICE_NAME to { FailingImpl() },
@@ -35,7 +38,10 @@ val KNOWN_SERVICES_FACTORIES: Map<String, () -> Any> =
         interpreterName(0) to { ObjectInterpreterImpl.getInterpreterDefinition(0) },
         interpreterName(1) to { ObjectInterpreterImpl.getInterpreterDefinition(1) },
         interpreterName(2) to { ObjectInterpreterImpl.getInterpreterDefinition(2) },
-        ServiceInterpreterHelperHandlers.Metadata.SERVICE_NAME to { ServiceInterpreterHelperImpl() })
+        ServiceInterpreterHelperHandlers.Metadata.SERVICE_NAME to
+            {
+              ServiceInterpreterHelperImpl()
+            })
 
 val NEEDS_EXPERIMENTAL_CONTEXT: Set<String> = setOf()
 
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/NonDeterministicImpl.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/NonDeterministicImpl.kt
@@ -9,8 +9,8 @@
 package dev.restate.sdk.testservices
 
 import dev.restate.sdk.kotlin.*
-import dev.restate.sdk.testservices.contracts.NonDeterministic
 import dev.restate.sdk.testservices.contracts.CounterHandlers
+import dev.restate.sdk.testservices.contracts.NonDeterministic
 import dev.restate.sdk.types.StateKey
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.time.Duration.Companion.milliseconds
@@ -65,7 +65,7 @@ class NonDeterministicImpl : NonDeterministic {
   }
 
   private suspend fun incrementCounter(context: ObjectContext) {
-    CounterHandlers.add( context.key(), 1).call(context).await()
+    CounterHandlers.add(context.key(), 1).call(context).await()
   }
 
   private fun doLeftAction(context: ObjectContext): Boolean {
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/ProxyImpl.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/ProxyImpl.kt
@@ -41,12 +41,12 @@ class ProxyImpl : Proxy {
   override suspend fun oneWayCall(context: Context, request: ProxyRequest): String =
       context
           .send(
-            Request.of(request.toTarget(), Serde.RAW, Serde.SLICE, request.message)
-                  .also {
-                    if (request.idempotencyKey != null) {
-                      it.idempotencyKey = request.idempotencyKey
-                    }
-                  }, request.delayMillis?.milliseconds ?: Duration.ZERO)
+              Request.of(request.toTarget(), Serde.RAW, Serde.SLICE, request.message).also {
+                if (request.idempotencyKey != null) {
+                  it.idempotencyKey = request.idempotencyKey
+                }
+              },
+              request.delayMillis?.milliseconds ?: Duration.ZERO)
           .invocationId()
 
   override suspend fun manyCalls(context: Context, requests: List<ManyCallRequest>) {
@@ -64,7 +64,8 @@ class ProxyImpl : Proxy {
                   if (request.proxyRequest.idempotencyKey != null) {
                     it.idempotencyKey = request.proxyRequest.idempotencyKey
                   }
-                }, (request.proxyRequest.delayMillis?.milliseconds ?: Duration.ZERO))
+                },
+            (request.proxyRequest.delayMillis?.milliseconds ?: Duration.ZERO))
       } else {
         val awaitable =
             context.call(
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/AwakeableHolder.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/AwakeableHolder.kt
@@ -14,7 +14,7 @@ import dev.restate.sdk.kotlin.*
 // This is a generic utility service that can be used in various situations where
 // we need to synchronize the services with the test runner using an awakeable.
 @VirtualObject
-@Name( "AwakeableHolder")
+@Name("AwakeableHolder")
 interface AwakeableHolder {
   @Exclusive suspend fun hold(context: ObjectContext, id: String)
 
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/BlockAndWaitWorkflow.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/BlockAndWaitWorkflow.kt
@@ -12,7 +12,7 @@ import dev.restate.sdk.annotation.*
 import dev.restate.sdk.kotlin.*
 
 @Workflow
-@Name( "BlockAndWaitWorkflow")
+@Name("BlockAndWaitWorkflow")
 interface BlockAndWaitWorkflow {
   @Workflow suspend fun run(context: WorkflowContext, input: String): String
 
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/CancelTest.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/CancelTest.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Counter.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Counter.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Failing.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Failing.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/KillTest.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/KillTest.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/ListObject.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/ListObject.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/MapObject.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/MapObject.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/NonDeterministic.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/NonDeterministic.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Proxy.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/Proxy.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/TestUtils.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/TestUtils.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/VirtualObjectCommandInterpreter.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/VirtualObjectCommandInterpreter.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/interpreter.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/contracts/interpreter.kt
diff --git a/test-services/src/main/kotlin/dev/restate/sdk/testservices/interpreter.kt b/test-services/src/main/kotlin/dev/restate/sdk/testservices/interpreter.kt

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ description = "Restate Client to interact with services from within other Kotlin`
`8`	`8`	`dependencies {`
`9`	`9`	`api(project(":client"))`
`10`	`10`	`implementation(libs.kotlinx.coroutines.core)`
	`11`	`+`
	`12`	`+ runtimeOnly(project(":sdk-serde-kotlinx"))`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,5 @@ dependencies {`
`15`	`15`	`implementation(libs.jackson.core)`
`16`	`16`	`implementation(libs.log4j.api)`
`17`	`17`
`18`		`- testImplementation(libs.junit.jupiter)`
`19`		`- testImplementation(libs.assertj)`
	`18`	`+ runtimeOnly(project(":sdk-serde-jackson"))`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@`
`17`	`17`	`* </ul>`
`18`	`18`	`*`
`19`	`19`	`* When using the Java APIs, a Jackson based implementation is used by default, see {@link`
`20`		`- * dev.restate.sdk.serde.jackson.JacksonSerdeFactory} in {@code sdk-serde-jackson} module.`
	`20`	`+ * dev.restate.serde.jackson.JacksonSerdeFactory} in {@code sdk-serde-jackson} module.`
`21`	`21`	`*`
`22`	`22`	`* <p>When using the Kotlin APIs, a Kotlin Serialization implementation is used by default, see`
`23`		`- * {@link dev.restate.sdk.kotlin.serialization.KotlinSerializationSerdeFactory} in {@code`
`24`		`- * sdk-api-kotlin} module.`
	`23`	`+ * {@link dev.restate.serde.kotlinx.KotlinSerializationSerdeFactory} in {@code sdk-api-kotlin}`
	`24`	`+ * module.`
`25`	`25`	`*`
`26`	`26`	`* <p>You can override the default factory used for a given service by adding the annotation {@link`
`27`	`27`	`* dev.restate.sdk.annotation.CustomSerdeFactory} on the interface/class annotated with {@link`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ Service fromTypeElement(MetaRestateAnnotation metaAnnotation, TypeElement elemen`
`84`	`84`	`Diagnostic.Kind.WARNING, "The service " + serviceName + " has no handlers", element);`
`85`	`85`	`}`
`86`	`86`
`87`		`- String serdeFactoryDecl = "new dev.restate.sdk.serde.jackson.JacksonSerdeFactory()";`
	`87`	`+ String serdeFactoryDecl = "new dev.restate.serde.jackson.JacksonSerdeFactory()";`
`88`	`88`	`CustomSerdeFactory customSerdeFactory = element.getAnnotation(CustomSerdeFactory.class);`
`89`	`89`	`if (customSerdeFactory != null) {`
`90`	`90`	`serdeFactoryDecl = "new " + getCustomSerdeClassCanonicalName(customSerdeFactory) + "()";`