Fixes (#45)

Author: slinkydeveloper

build.gradle.kts

@@ -32,11 +32,9 @@ dependencies {
   implementation(libs.clikt)
   implementation(libs.mordant)
 
-  implementation(libs.restate.sdk.client)
-  implementation(libs.restate.sdk.client.kotlin)
-
   ksp(libs.restate.sdk.api.kotlin.gen)
   implementation(libs.restate.sdk.api.kotlin)
+  implementation(libs.restate.sdk.client.kotlin)
 
   implementation(libs.junit.all)
   implementation(libs.junit.launcher)

src/main/kotlin/dev/restate/sdktesting/contracts/AwakeableHolder.kt

@@ -11,10 +11,12 @@ package dev.restate.sdktesting.contracts
 import dev.restate.sdk.annotation.Exclusive
 import dev.restate.sdk.annotation.VirtualObject
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 
 // 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")
+@VirtualObject
+@Name("AwakeableHolder")
 interface AwakeableHolder {
   @Exclusive suspend fun hold(context: ObjectContext, id: String)
 

src/main/kotlin/dev/restate/sdktesting/contracts/BlockAndWaitWorkflow.kt

@@ -12,8 +12,10 @@ import dev.restate.sdk.annotation.Shared
 import dev.restate.sdk.annotation.Workflow
 import dev.restate.sdk.kotlin.SharedWorkflowContext
 import dev.restate.sdk.kotlin.WorkflowContext
+import jdk.jfr.Name
 
-@Workflow(name = "BlockAndWaitWorkflow")
+@Workflow
+@Name("BlockAndWaitWorkflow")
 interface BlockAndWaitWorkflow {
   @Workflow suspend fun run(context: WorkflowContext, input: String): String
 

src/main/kotlin/dev/restate/sdktesting/contracts/CancelTest.kt

@@ -10,6 +10,7 @@ package dev.restate.sdktesting.contracts
 
 import dev.restate.sdk.annotation.*
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -21,14 +22,16 @@ enum class BlockingOperation {
 
 interface CancelTest {
 
-  @VirtualObject(name = "CancelTestRunner")
+  @VirtualObject
+  @Name("CancelTestRunner")
   interface Runner {
     @Exclusive suspend fun startTest(context: ObjectContext, operation: BlockingOperation)
 
     @Exclusive suspend fun verifyTest(context: ObjectContext): Boolean
   }
 
-  @VirtualObject(name = "CancelTestBlockingService")
+  @VirtualObject
+  @Name("CancelTestBlockingService")
   interface BlockingService {
     @Exclusive suspend fun block(context: ObjectContext, operation: BlockingOperation)
 

src/main/kotlin/dev/restate/sdktesting/contracts/Counter.kt

@@ -13,12 +13,14 @@ import dev.restate.sdk.annotation.Shared
 import dev.restate.sdk.annotation.VirtualObject
 import dev.restate.sdk.kotlin.ObjectContext
 import dev.restate.sdk.kotlin.SharedObjectContext
+import jdk.jfr.Name
 import kotlinx.serialization.Serializable
 
-@Serializable data class CounterUpdateResponse(val oldValue: Long, val newValue: Long)
-
-@VirtualObject(name = "Counter")
+@VirtualObject
+@Name("Counter")
 interface Counter {
+  @Serializable data class CounterUpdateResponse(val oldValue: Long, val newValue: Long)
+
   /** Add value to counter */
   @Handler suspend fun add(context: ObjectContext, value: Long): CounterUpdateResponse
 

src/main/kotlin/dev/restate/sdktesting/contracts/Failing.kt

@@ -11,8 +11,10 @@ package dev.restate.sdktesting.contracts
 import dev.restate.sdk.annotation.Handler
 import dev.restate.sdk.annotation.VirtualObject
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 
-@VirtualObject(name = "Failing")
+@VirtualObject
+@Name("Failing")
 interface Failing {
   @Handler suspend fun terminallyFailingCall(context: ObjectContext, errorMessage: String)
 

src/main/kotlin/dev/restate/sdktesting/contracts/KillTest.kt

@@ -10,14 +10,17 @@ package dev.restate.sdktesting.contracts
 
 import dev.restate.sdk.annotation.*
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 
 interface KillTest {
-  @VirtualObject(name = "KillTestRunner")
+  @VirtualObject
+  @Name("KillTestRunner")
   interface Runner {
     @Handler suspend fun startCallTree(context: ObjectContext)
   }
 
-  @VirtualObject(name = "KillTestSingleton")
+  @VirtualObject
+  @Name("KillTestSingleton")
   interface Singleton {
     @Handler suspend fun recursiveCall(context: ObjectContext)
 

src/main/kotlin/dev/restate/sdktesting/contracts/ListObject.kt

@@ -10,8 +10,10 @@ package dev.restate.sdktesting.contracts
 
 import dev.restate.sdk.annotation.*
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 
-@VirtualObject(name = "ListObject")
+@VirtualObject
+@Name("ListObject")
 interface ListObject {
   /** Append a value to the list object */
   @Handler suspend fun append(context: ObjectContext, value: String)

src/main/kotlin/dev/restate/sdktesting/contracts/MapObject.kt

@@ -11,12 +11,14 @@ package dev.restate.sdktesting.contracts
 import dev.restate.sdk.annotation.Handler
 import dev.restate.sdk.annotation.VirtualObject
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 import kotlinx.serialization.Serializable
 
-@Serializable data class Entry(val key: String, val value: String)
-
-@VirtualObject(name = "MapObject")
+@VirtualObject
+@Name("MapObject")
 interface MapObject {
+  @Serializable data class Entry(val key: String, val value: String)
+
   /**
    * Set value in map.
    *

src/main/kotlin/dev/restate/sdktesting/contracts/NonDeterministic.kt

@@ -10,8 +10,10 @@ package dev.restate.sdktesting.contracts
 
 import dev.restate.sdk.annotation.*
 import dev.restate.sdk.kotlin.ObjectContext
+import jdk.jfr.Name
 
-@VirtualObject(name = "NonDeterministic")
+@VirtualObject
+@Name("NonDeterministic")
 interface NonDeterministic {
   /** On first invocation sleeps, on second invocation calls */
   @Handler suspend fun eitherSleepOrCall(context: ObjectContext)