Change a bit the request api

Author: slinkydeveloper

client-kotlin/src/main/kotlin/dev/restate/client/kotlin/ingress.kt

@@ -429,10 +429,10 @@ internal constructor(
    * @return a [KClientRequest] with the correct response type
    */
   @Suppress("UNCHECKED_CAST")
-  fun <Res> request(block: suspend (SVC) -> Res): KClientRequest<Any?, Res> {
+  fun <Res> request(block: suspend SVC.() -> Res): KClientRequest<Any?, Res> {
     return KClientRequestImpl(
         client,
-        RequestCaptureProxy(clazz, key).capture(block as suspend (SVC) -> Any?).toRequest(),
+        RequestCaptureProxy(clazz, key).capture(block as suspend SVC.() -> Any?).toRequest(),
     )
         as KClientRequest<Any?, Res>
   }
@@ -444,7 +444,7 @@ internal constructor(
  * Example usage:
  * ```kotlin
  * client.toService<CounterKt>()
- *     .request { it.add(1) }
+ *     .request { add(1) }
  *     .withOptions { idempotencyKey = "123" }
  *     .call()
  * ```
@@ -485,7 +485,7 @@ interface KClientRequest<Req, Res> : Request<Req, Res> {
  * Example usage:
  * ```kotlin
  * val response = client.toService<Greeter>()
- *     .request { it.greet("Alice") }
+ *     .request { greet("Alice") }
  *     .call()
  * ```
  *
@@ -507,7 +507,7 @@ inline fun <reified SVC : Any> Client.toService(): KClientRequestBuilder<SVC> {
  * Example usage:
  * ```kotlin
  * val response = client.toVirtualObject<Counter>("my-counter")
- *     .request { it.add(1) }
+ *     .request { add(1) }
  *     .call()
  * ```
  *
@@ -530,7 +530,7 @@ inline fun <reified SVC : Any> Client.toVirtualObject(key: String): KClientReque
  * Example usage:
  * ```kotlin
  * val response = client.toWorkflow<MyWorkflow>("workflow-123")
- *     .request { it.run("input") }
+ *     .request { run("input") }
  *     .call()
  * ```
  *

common-kotlin/src/main/kotlin/dev/restate/common/reflection/kotlin/RequestCaptureProxy.kt

@@ -37,7 +37,7 @@ class RequestCaptureProxy<SVC : Any>(private val clazz: Class<SVC>, private val
    * @param block the suspend lambda that invokes a method on the service proxy
    * @return the captured invocation information
    */
-  fun capture(block: suspend (SVC) -> Any?): CapturedInvocation {
+  fun capture(block: suspend SVC.() -> Any?): CapturedInvocation {
     var capturedInvocation: CapturedInvocation? = null
 
     val proxy =
@@ -60,7 +60,7 @@ class RequestCaptureProxy<SVC : Any>(private val clazz: Class<SVC>, private val
           }
         }
 
-    val suspendBlock: suspend () -> Any? = { block(proxy) }
+    val suspendBlock: suspend () -> Any? = { proxy.block() }
     suspendBlock.startCoroutine(capturingContinuation)
 
     return capturedInvocation

sdk-api-kotlin/src/main/kotlin/dev/restate/sdk/kotlin/api.kt

@@ -1142,7 +1142,7 @@ private class KotlinStateImpl(
  * Example usage:
  * ```kotlin
  * toService<CounterKt>()
- *     .request { it.add(1) }
+ *     .request { add(1) }
  *     .withOptions { idempotencyKey = "123" }
  *     .call()
  * ```
@@ -1203,9 +1203,9 @@ internal constructor(
    * @return a [KRequest] with the correct response type
    */
   @Suppress("UNCHECKED_CAST")
-  fun <Res> request(block: suspend (SVC) -> Res): KRequest<Any?, Res> {
+  fun <Res> request(block: suspend SVC.() -> Res): KRequest<Any?, Res> {
     return KRequestImpl(
-        RequestCaptureProxy(clazz, key).capture(block as suspend (SVC) -> Any?).toRequest()
+        RequestCaptureProxy(clazz, key).capture(block as suspend SVC.() -> Any?).toRequest()
     )
         as KRequest<Any?, Res>
   }
@@ -1219,7 +1219,7 @@ internal constructor(
  * @Handler
  * suspend fun myHandler(): String {
  *     val result = toService<Greeter>()
- *         .request { it.greet("Alice") }
+ *         .request { greet("Alice") }
  *         .call()
  *         .await()
  *     return result
@@ -1246,7 +1246,7 @@ inline fun <reified SVC : Any> toService(): KRequestBuilder<SVC> {
  * @Handler
  * suspend fun myHandler(): Long {
  *     val result = toVirtualObject<Counter>("my-counter")
- *         .request { it.add(1) }
+ *         .request { add(1) }
  *         .call()
  *         .await()
  *     return result
@@ -1274,7 +1274,7 @@ inline fun <reified SVC : Any> toVirtualObject(key: String): KRequestBuilder<SVC
  * @Handler
  * suspend fun myHandler(): String {
  *     val result = toWorkflow<MyWorkflow>("workflow-123")
- *         .request { it.run("input") }
+ *         .request { run("input") }
  *         .call()
  *         .await()
  *     return result

sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/reflections/ReflectionDiscoveryTest.kt

@@ -14,6 +14,7 @@ import dev.restate.sdk.core.generated.manifest.Input
 import dev.restate.sdk.core.generated.manifest.Output
 import dev.restate.sdk.core.generated.manifest.Service
 import dev.restate.sdk.kotlin.endpoint.*
+import dev.restate.serde.Serde
 import org.assertj.core.api.InstanceOfAssertFactories.type
 import org.junit.jupiter.api.Test
 
@@ -49,6 +50,26 @@ class ReflectionDiscoveryTest {
         .isEqualTo("application/vnd.my.custom")
   }
 
+  @Test
+  fun checkRawInputContentType() {
+    assertThatDiscovery(RawInputOutput())
+      .extractingService("RawInputOutput")
+      .extractingHandler("rawInput")
+      .extracting({ it.input }, type(Input::class.java))
+      .extracting { it.contentType }
+      .isEqualTo(Serde.RAW.contentType())
+  }
+
+  @Test
+  fun checkRawOutputContentType() {
+    assertThatDiscovery(RawInputOutput())
+      .extractingService("RawInputOutput")
+      .extractingHandler("rawOutput")
+      .extracting({ it.output }, type(Output::class.java))
+      .extracting { it.contentType }
+      .isEqualTo(Serde.RAW.contentType())
+  }
+
   @Test
   fun explicitNames() {
     assertThatDiscovery(

sdk-core/src/test/kotlin/dev/restate/sdk/core/kotlinapi/reflections/testClasses.kt

@@ -110,7 +110,7 @@ open class CornerCases {
 
   @Exclusive
   open suspend fun badReturnTypeInferred(): Unit {
-    toVirtualObject<CornerCases>(key()).request { it.badReturnTypeInferred() }.send()
+    toVirtualObject<CornerCases>(key()).request { badReturnTypeInferred() }.send()
   }
 }
 
@@ -149,7 +149,7 @@ open class RawInputOutput {
 open class MyWorkflow {
   @Workflow
   open suspend fun run(myInput: String) {
-    toWorkflow<MyWorkflow>(key()).request { it.sharedHandler(myInput) }.send()
+    toWorkflow<MyWorkflow>(key()).request { sharedHandler(myInput) }.send()
   }
 
   @Handler

sdk-spring-boot-kotlin-starter/src/test/kotlin/dev/restate/sdk/springboot/kotlin/SdkTestingIntegrationTest.kt

@@ -49,7 +49,7 @@ class SdkTestingIntegrationTest {
   @Timeout(value = 10)
   fun greetNewApiWithRequestTo(@RestateClient ingressClient: Client) = runTest {
     val response: String =
-        ingressClient.toService<GreeterNewApi>().request { it.greet("Francesco") }.call().response()
+        ingressClient.toService<GreeterNewApi>().request { greet("Francesco") }.call().response()
 
     assertThat(response).isEqualTo("Something something Francesco")
   }

test-services/src/main/kotlin/dev/restate/sdk/testservices/KillTestImpl.kt

@@ -28,7 +28,7 @@ class KillTestImpl {
   class SingletonImpl : KillTest.Singleton {
     override suspend fun recursiveCall() {
       val awakeable = awakeable(Serde.RAW)
-      toVirtualObject<AwakeableHolder>(key()).request { it.hold(awakeable.id) }.send()
+      toVirtualObject<AwakeableHolder>(key()).request { hold(awakeable.id) }.send()
       awakeable.await()
 
       virtualObject<KillTest.Singleton>(key()).recursiveCall()

test-services/src/main/kotlin/dev/restate/sdk/testservices/NonDeterministicImpl.kt

@@ -44,9 +44,9 @@ class NonDeterministicImpl : NonDeterministic {
 
   override suspend fun backgroundInvokeWithDifferentTargets() {
     if (doLeftAction()) {
-      toVirtualObject<Counter>("abc").request { it.get() }.send()
+      toVirtualObject<Counter>("abc").request { get() }.send()
     } else {
-      toVirtualObject<Counter>("abc").request { it.reset() }.send()
+      toVirtualObject<Counter>("abc").request { reset() }.send()
     }
     // This is required to cause a suspension after the non-deterministic operation
     sleep(100.milliseconds)
@@ -65,7 +65,7 @@ class NonDeterministicImpl : NonDeterministic {
   }
 
   private suspend fun incrementCounter() {
-    toVirtualObject<Counter>("abc").request { it.add(1) }.send()
+    toVirtualObject<Counter>("abc").request { add(1) }.send()
   }
 
   private suspend fun doLeftAction(): Boolean {

test-services/src/main/kotlin/dev/restate/sdk/testservices/interpreter.kt

@@ -116,14 +116,14 @@ class ObjectInterpreterImpl(private val layer: Int) : ObjectInterpreter {
         }
         is CallService -> {
           val expected = "hello-$i"
-          val awaitable = toService<ServiceInterpreterHelper>().request { it.echo(expected) }.call()
+          val awaitable = toService<ServiceInterpreterHelper>().request { echo(expected) }.call()
           promises[i] = { checkAwaitable(awaitable, expected, i, cmd) }
         }
         is CallSlowService -> {
           val expected = "hello-$i"
           val awaitable =
               toService<ServiceInterpreterHelper>()
-                  .request { it.echoLater(EchoLaterRequest(cmd.sleep, expected)) }
+                  .request { echoLater(EchoLaterRequest(cmd.sleep, expected)) }
                   .call()
           promises[i] = { checkAwaitable(awaitable, expected, i, cmd) }
         }
@@ -138,15 +138,15 @@ class ObjectInterpreterImpl(private val layer: Int) : ObjectInterpreter {
         }
         is IncrementStateCounterIndirectly -> {
           toService<ServiceInterpreterHelper>()
-              .request { it.incrementIndirectly(interpreterId()) }
+              .request { incrementIndirectly(interpreterId()) }
               .send()
         }
         is IncrementStateCounterViaAwakeable -> {
           // Dancing in the mooonlight!
           val awakeable = awakeable<String>()
           toService<ServiceInterpreterHelper>()
               .request {
-                it.incrementViaAwakeableDance(
+                incrementViaAwakeableDance(
                     IncrementViaAwakeableDanceRequest(interpreterId(), awakeable.id)
                 )
               }
@@ -156,7 +156,7 @@ class ObjectInterpreterImpl(private val layer: Int) : ObjectInterpreter {
         }
         is IncrementViaDelayedCall -> {
           toService<ServiceInterpreterHelper>()
-              .request { it.incrementIndirectly(interpreterId()) }
+              .request { incrementIndirectly(interpreterId()) }
               .send(delay = cmd.duration.milliseconds)
         }
         is RecoverTerminalCall -> {
@@ -174,18 +174,18 @@ class ObjectInterpreterImpl(private val layer: Int) : ObjectInterpreter {
         }
         is RecoverTerminalCallMaybeUnAwaited -> {
           val awaitable =
-              toService<ServiceInterpreterHelper>().request { it.terminalFailure() }.call()
+              toService<ServiceInterpreterHelper>().request { terminalFailure() }.call()
           promises[i] = { checkAwaitableFails(awaitable, i, cmd) }
         }
         is RejectAwakeable -> {
           val awakeable = awakeable<String>()
           promises[i] = { checkAwaitableFails(awakeable, i, cmd) }
-          toService<ServiceInterpreterHelper>().request { it.rejectAwakeable(awakeable.id) }.send()
+          toService<ServiceInterpreterHelper>().request { rejectAwakeable(awakeable.id) }.send()
         }
         is ResolveAwakeable -> {
           val awakeable = awakeable<String>()
           promises[i] = { checkAwaitable(awakeable, "ok", i, cmd) }
-          toService<ServiceInterpreterHelper>().request { it.resolveAwakeable(awakeable.id) }.send()
+          toService<ServiceInterpreterHelper>().request { resolveAwakeable(awakeable.id) }.send()
         }
         is SetState -> {
           state().set(cmdStateKey(cmd.key), "value-${cmd.key}")