Skip to content

Commit 89f1dee

Browse files
committed
grpc: Adjust metadata names
Signed-off-by: Johannes Zottele <[email protected]>
1 parent 7916e12 commit 89f1dee

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ClientInterceptor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import kotlinx.rpc.grpc.internal.MethodDescriptor
1010

1111
public interface ClientCallScope<Request, Response> {
1212
public val method: MethodDescriptor<Request, Response>
13-
public val metadata: GrpcMetadata
13+
public val requestHeaders: GrpcMetadata
1414
public val callOptions: GrpcCallOptions
15-
public fun onHeaders(block: (GrpcMetadata) -> Unit)
16-
public fun onClose(block: (Status, GrpcMetadata) -> Unit)
15+
public fun onHeaders(block: (responseHeaders: GrpcMetadata) -> Unit)
16+
public fun onClose(block: (closeStatus: Status, responseTrailers: GrpcMetadata) -> Unit)
1717
public fun cancel(message: String, cause: Throwable? = null): Nothing
1818
public fun proceed(request: Flow<Request>): Flow<Response>
1919
}

grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/internal/suspendClientCalls.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private fun <Request, Response> GrpcClient.rpcImpl(
147147
val clientCallScope = ClientCallScopeImpl(
148148
client = this,
149149
method = descriptor,
150-
metadata = trailers,
150+
requestHeaders = trailers,
151151
callOptions = callOptions,
152152
)
153153
return clientCallScope.proceed(request)
@@ -205,7 +205,7 @@ internal class Ready(private val isReallyReady: () -> Boolean) {
205205
private class ClientCallScopeImpl<Request, Response>(
206206
val client: GrpcClient,
207207
override val method: MethodDescriptor<Request, Response>,
208-
override val metadata: GrpcMetadata,
208+
override val requestHeaders: GrpcMetadata,
209209
override val callOptions: GrpcCallOptions,
210210
) : ClientCallScope<Request, Response> {
211211

@@ -250,7 +250,7 @@ private class ClientCallScopeImpl<Request, Response>(
250250
val responses = Channel<Response>(1)
251251
val ready = Ready { call.isReady() }
252252

253-
call.start(channelResponseListener(responses, ready), metadata)
253+
call.start(channelResponseListener(responses, ready), requestHeaders)
254254

255255
suspend fun Flow<Request>.send() {
256256
if (method.type == MethodType.UNARY || method.type == MethodType.SERVER_STREAMING) {

0 commit comments

Comments
 (0)