update conformance interfaces to use CallOptions

connectrpc · May 16, 2024 · c717f39 · c717f39
1 parent 68069a8
commit c717f39
Show file tree

Hide file tree

Showing 17 changed files with 86 additions and 91 deletions.
diff --git a/...oogle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaBidiStreamClient.kt b/...oogle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaBidiStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.BidiStreamClient
 import com.connectrpc.conformance.v1.BidiStreamRequest
 import com.connectrpc.conformance.v1.BidiStreamResponse
@@ -26,7 +26,7 @@ class JavaBidiStreamClient(
     BidiStreamRequest.getDefaultInstance(),
     BidiStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(headers: Headers): BidiStream<BidiStreamRequest, BidiStreamResponse> {
-        return BidiStream.new(client.bidiStream(headers))
+    override suspend fun execute(options: CallOptions): BidiStream<BidiStreamRequest, BidiStreamResponse> {
+        return BidiStream.new(client.bidiStream(options))
     }
 }
diff --git a/...gle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaClientStreamClient.kt b/...gle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaClientStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.ClientStreamClient
 import com.connectrpc.conformance.v1.ClientStreamRequest
 import com.connectrpc.conformance.v1.ClientStreamResponse
@@ -26,7 +26,7 @@ class JavaClientStreamClient(
     ClientStreamRequest.getDefaultInstance(),
     ClientStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(headers: Headers): ClientStream<ClientStreamRequest, ClientStreamResponse> {
-        return ClientStream.new(client.clientStream(headers))
+    override suspend fun execute(options: CallOptions): ClientStream<ClientStreamRequest, ClientStreamResponse> {
+        return ClientStream.new(client.clientStream(options))
     }
 }
diff --git a/...-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaIdempotentUnaryClient.kt b/...-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaIdempotentUnaryClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,19 +29,19 @@ class JavaIdempotentUnaryClient(
     IdempotentUnaryRequest.getDefaultInstance(),
     IdempotentUnaryResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: IdempotentUnaryRequest, headers: Headers): ResponseMessage<IdempotentUnaryResponse> {
-        return client.idempotentUnary(req, headers)
+    override suspend fun execute(req: IdempotentUnaryRequest, options: CallOptions): ResponseMessage<IdempotentUnaryResponse> {
+        return client.idempotentUnary(req, options)
     }
 
     override fun execute(
         req: IdempotentUnaryRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<IdempotentUnaryResponse>) -> Unit,
     ): Cancelable {
-        return client.idempotentUnary(req, headers, onFinish)
+        return client.idempotentUnary(req, options, onFinish)
     }
 
-    override fun blocking(req: IdempotentUnaryRequest, headers: Headers): UnaryBlockingCall<IdempotentUnaryResponse> {
-        return client.idempotentUnaryBlocking(req, headers)
+    override fun blocking(req: IdempotentUnaryRequest, options: CallOptions): UnaryBlockingCall<IdempotentUnaryResponse> {
+        return client.idempotentUnaryBlocking(req, options)
     }
 }
diff --git a/...gle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaServerStreamClient.kt b/...gle-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaServerStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.ResponseStream
 import com.connectrpc.conformance.client.adapt.ServerStreamClient
 import com.connectrpc.conformance.v1.ConformanceServiceClient
@@ -27,8 +27,8 @@ class JavaServerStreamClient(
     ServerStreamRequest.getDefaultInstance(),
     ServerStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: ServerStreamRequest, headers: Headers): ResponseStream<ServerStreamResponse> {
-        val stream = client.serverStream(headers)
+    override suspend fun execute(req: ServerStreamRequest, options: CallOptions): ResponseStream<ServerStreamResponse> {
+        val stream = client.serverStream(options)
         val sendResult: Result<Unit>
         try {
             sendResult = stream.sendAndClose(req)

diff --git a/...ent/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaUnaryClient.kt b/...ent/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaUnaryClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,19 +29,19 @@ class JavaUnaryClient(
     UnaryRequest.getDefaultInstance(),
     UnaryResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: UnaryRequest, headers: Headers): ResponseMessage<UnaryResponse> {
-        return client.unary(req, headers)
+    override suspend fun execute(req: UnaryRequest, options: CallOptions): ResponseMessage<UnaryResponse> {
+        return client.unary(req, options)
     }
 
     override fun execute(
         req: UnaryRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<UnaryResponse>) -> Unit,
     ): Cancelable {
-        return client.unary(req, headers, onFinish)
+        return client.unary(req, options, onFinish)
     }
 
-    override fun blocking(req: UnaryRequest, headers: Headers): UnaryBlockingCall<UnaryResponse> {
-        return client.unaryBlocking(req, headers)
+    override fun blocking(req: UnaryRequest, options: CallOptions): UnaryBlockingCall<UnaryResponse> {
+        return client.unaryBlocking(req, options)
     }
 }
diff --git a/...le-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaUnimplementedClient.kt b/...le-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaUnimplementedClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.java
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,19 +29,19 @@ class JavaUnimplementedClient(
     UnimplementedRequest.getDefaultInstance(),
     UnimplementedResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: UnimplementedRequest, headers: Headers): ResponseMessage<UnimplementedResponse> {
-        return client.unimplemented(req, headers)
+    override suspend fun execute(req: UnimplementedRequest, options: CallOptions): ResponseMessage<UnimplementedResponse> {
+        return client.unimplemented(req, options)
     }
 
     override fun execute(
         req: UnimplementedRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<UnimplementedResponse>) -> Unit,
     ): Cancelable {
-        return client.unimplemented(req, headers, onFinish)
+        return client.unimplemented(req, options, onFinish)
     }
 
-    override fun blocking(req: UnimplementedRequest, headers: Headers): UnaryBlockingCall<UnimplementedResponse> {
-        return client.unimplementedBlocking(req, headers)
+    override fun blocking(req: UnimplementedRequest, options: CallOptions): UnaryBlockingCall<UnimplementedResponse> {
+        return client.unimplementedBlocking(req, options)
     }
 }
diff --git a/...te/src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteBidiStreamClient.kt b/...te/src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteBidiStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.BidiStreamClient
 import com.connectrpc.conformance.v1.BidiStreamRequest
 import com.connectrpc.conformance.v1.BidiStreamResponse
@@ -26,7 +26,7 @@ class JavaLiteBidiStreamClient(
     BidiStreamRequest.getDefaultInstance(),
     BidiStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(headers: Headers): BidiStream<BidiStreamRequest, BidiStreamResponse> {
-        return BidiStream.new(client.bidiStream(headers))
+    override suspend fun execute(options: CallOptions): BidiStream<BidiStreamRequest, BidiStreamResponse> {
+        return BidiStream.new(client.bidiStream(options))
     }
 }
diff --git a/.../src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteClientStreamClient.kt b/.../src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteClientStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.ClientStreamClient
 import com.connectrpc.conformance.v1.ClientStreamRequest
 import com.connectrpc.conformance.v1.ClientStreamResponse
@@ -26,7 +26,7 @@ class JavaLiteClientStreamClient(
     ClientStreamRequest.getDefaultInstance(),
     ClientStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(headers: Headers): ClientStream<ClientStreamRequest, ClientStreamResponse> {
-        return ClientStream.new(client.clientStream(headers))
+    override suspend fun execute(options: CallOptions): ClientStream<ClientStreamRequest, ClientStreamResponse> {
+        return ClientStream.new(client.clientStream(options))
     }
 }
diff --git a/...c/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteIdempotentUnaryClient.kt b/...c/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteIdempotentUnaryClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,22 +29,19 @@ class JavaLiteIdempotentUnaryClient(
     IdempotentUnaryRequest.getDefaultInstance(),
     IdempotentUnaryResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(
-        req: IdempotentUnaryRequest,
-        headers: Headers,
-    ): ResponseMessage<IdempotentUnaryResponse> {
-        return client.idempotentUnary(req, headers)
+    override suspend fun execute(req: IdempotentUnaryRequest, options: CallOptions): ResponseMessage<IdempotentUnaryResponse> {
+        return client.idempotentUnary(req, options)
     }
 
     override fun execute(
         req: IdempotentUnaryRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<IdempotentUnaryResponse>) -> Unit,
     ): Cancelable {
-        return client.idempotentUnary(req, headers, onFinish)
+        return client.idempotentUnary(req, options, onFinish)
     }
 
-    override fun blocking(req: IdempotentUnaryRequest, headers: Headers): UnaryBlockingCall<IdempotentUnaryResponse> {
-        return client.idempotentUnaryBlocking(req, headers)
+    override fun blocking(req: IdempotentUnaryRequest, options: CallOptions): UnaryBlockingCall<IdempotentUnaryResponse> {
+        return client.idempotentUnaryBlocking(req, options)
     }
 }
diff --git a/.../src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteServerStreamClient.kt b/.../src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteServerStreamClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.conformance.client.adapt.ResponseStream
 import com.connectrpc.conformance.client.adapt.ServerStreamClient
 import com.connectrpc.conformance.v1.ConformanceServiceClient
@@ -27,8 +27,8 @@ class JavaLiteServerStreamClient(
     ServerStreamRequest.getDefaultInstance(),
     ServerStreamResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: ServerStreamRequest, headers: Headers): ResponseStream<ServerStreamResponse> {
-        val stream = client.serverStream(headers)
+    override suspend fun execute(req: ServerStreamRequest, options: CallOptions): ResponseStream<ServerStreamResponse> {
+        val stream = client.serverStream(options)
         val sendResult: Result<Unit>
         try {
             sendResult = stream.sendAndClose(req)

diff --git a/...avalite/src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteUnaryClient.kt b/...avalite/src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteUnaryClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,22 +29,19 @@ class JavaLiteUnaryClient(
     UnaryRequest.getDefaultInstance(),
     UnaryResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(
-        req: UnaryRequest,
-        headers: Headers,
-    ): ResponseMessage<UnaryResponse> {
-        return client.unary(req, headers)
+    override suspend fun execute(req: UnaryRequest, options: CallOptions): ResponseMessage<UnaryResponse> {
+        return client.unary(req, options)
     }
 
     override fun execute(
         req: UnaryRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<UnaryResponse>) -> Unit,
     ): Cancelable {
-        return client.unary(req, headers, onFinish)
+        return client.unary(req, options, onFinish)
     }
 
-    override fun blocking(req: UnaryRequest, headers: Headers): UnaryBlockingCall<UnaryResponse> {
-        return client.unaryBlocking(req, headers)
+    override fun blocking(req: UnaryRequest, options: CallOptions): UnaryBlockingCall<UnaryResponse> {
+        return client.unaryBlocking(req, options)
     }
 }
diff --git a/...src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteUnimplementedClient.kt b/...src/main/kotlin/com/connectrpc/conformance/client/javalite/JavaLiteUnimplementedClient.kt
@@ -14,7 +14,7 @@
 
 package com.connectrpc.conformance.client.javalite
 
-import com.connectrpc.Headers
+import com.connectrpc.CallOptions
 import com.connectrpc.ResponseMessage
 import com.connectrpc.UnaryBlockingCall
 import com.connectrpc.conformance.client.adapt.UnaryClient
@@ -29,19 +29,19 @@ class JavaLiteUnimplementedClient(
     UnimplementedRequest.getDefaultInstance(),
     UnimplementedResponse.getDefaultInstance(),
 ) {
-    override suspend fun execute(req: UnimplementedRequest, headers: Headers): ResponseMessage<UnimplementedResponse> {
-        return client.unimplemented(req, headers)
+    override suspend fun execute(req: UnimplementedRequest, options: CallOptions): ResponseMessage<UnimplementedResponse> {
+        return client.unimplemented(req, options)
     }
 
     override fun execute(
         req: UnimplementedRequest,
-        headers: Headers,
+        options: CallOptions,
         onFinish: (ResponseMessage<UnimplementedResponse>) -> Unit,
     ): Cancelable {
-        return client.unimplemented(req, headers, onFinish)
+        return client.unimplemented(req, options, onFinish)
     }
 
-    override fun blocking(req: UnimplementedRequest, headers: Headers): UnaryBlockingCall<UnimplementedResponse> {
-        return client.unimplementedBlocking(req, headers)
+    override fun blocking(req: UnimplementedRequest, options: CallOptions): UnaryBlockingCall<UnimplementedResponse> {
+        return client.unimplementedBlocking(req, options)
     }
 }
diff --git a/conformance/client/src/main/kotlin/com/connectrpc/conformance/client/Client.kt b/conformance/client/src/main/kotlin/com/connectrpc/conformance/client/Client.kt
@@ -14,6 +14,7 @@
 
 package com.connectrpc.conformance.client
 
+import com.connectrpc.CallOptions
 import com.connectrpc.ConnectException
 import com.connectrpc.Headers
 import com.connectrpc.ProtocolClientConfig
@@ -132,7 +133,7 @@ class Client(
         val canceler = client.execute(
             args.invokeStyle,
             msg,
-            req.requestHeaders,
+            CallOptions.headers(req.requestHeaders),
             resp::complete,
         )
         when (val cancel = req.cancel) {
@@ -161,7 +162,7 @@ class Client(
         ) {
             throw RuntimeException("client stream calls can only support `BeforeCloseSend` and 'AfterCloseSendMs' cancellation field, instead got ${req.cancel!!::class.simpleName}")
         }
-        return client.execute(req.requestHeaders) { stream ->
+        return client.execute(CallOptions.headers(req.requestHeaders)) { stream ->
             var numUnsent = 0
             for (i in req.requestMessages.indices) {
                 if (req.requestDelayMs > 0) {
@@ -217,7 +218,7 @@ class Client(
         val msg = fromAny(req.requestMessages[0], client.reqTemplate, SERVER_STREAM_REQUEST_NAME)
         var sent = false
         try {
-            return client.execute(msg, req.requestHeaders) { stream ->
+            return client.execute(msg, CallOptions.headers(req.requestHeaders)) { stream ->
                 sent = true
                 val cancel = req.cancel
                 if (cancel is Cancel.AfterCloseSendMs) {
@@ -255,7 +256,7 @@ class Client(
         client: BidiStreamClient<Req, Resp>,
         req: ClientCompatRequest,
     ): ClientResponseResult {
-        return client.execute(req.requestHeaders) { stream ->
+        return client.execute(CallOptions.headers(req.requestHeaders)) { stream ->
             var numUnsent = 0
             for (i in req.requestMessages.indices) {
                 if (req.requestDelayMs > 0) {
@@ -296,7 +297,7 @@ class Client(
         client: BidiStreamClient<Req, Resp>,
         req: ClientCompatRequest,
     ): ClientResponseResult {
-        return client.execute(req.requestHeaders) { stream ->
+        return client.execute(CallOptions.headers(req.requestHeaders)) { stream ->
             val cancel = req.cancel
             val payloads: MutableList<MessageLite> = mutableListOf()
             for (i in req.requestMessages.indices) {