Skip to content

Commit 3d67b7f

Browse files
Jozott00Jozott00
committed
grpc: Rename GrpcTrailers to GrpcMetadata.kt
Signed-off-by: Johannes Zottele <[email protected]>
1 parent 670d605 commit 3d67b7f

File tree

20 files changed

+107
-107
lines changed

20 files changed

+107
-107
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: GrpcTrailers
13+
public val metadata: GrpcMetadata
1414
public val callOptions: GrpcCallOptions
15-
public fun onHeaders(block: (GrpcTrailers) -> Unit)
16-
public fun onClose(block: (Status, GrpcTrailers) -> Unit)
15+
public fun onHeaders(block: (GrpcMetadata) -> Unit)
16+
public fun onClose(block: (Status, GrpcMetadata) -> Unit)
1717
public fun cancel(message: String, cause: Throwable? = null)
1818
public fun proceed(request: Flow<Request>): Flow<Response>
1919
}

‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcClient.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class GrpcClient internal constructor(
5555

5656
override suspend fun <T> call(call: RpcCall): T = withGrpcCall(call) { methodDescriptor, request ->
5757
val callOptions = GrpcDefaultCallOptions
58-
val trailers = GrpcTrailers()
58+
val trailers = GrpcMetadata()
5959

6060
return when (methodDescriptor.type) {
6161
MethodType.UNARY -> unaryRpc(
@@ -78,7 +78,7 @@ public class GrpcClient internal constructor(
7878

7979
override fun <T> callServerStreaming(call: RpcCall): Flow<T> = withGrpcCall(call) { methodDescriptor, request ->
8080
val callOptions = GrpcDefaultCallOptions
81-
val trailers = GrpcTrailers()
81+
val trailers = GrpcMetadata()
8282

8383
when (methodDescriptor.type) {
8484
MethodType.SERVER_STREAMING -> serverStreamingRpc(

‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcTrailers.kt‎ renamed to ‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/GrpcMetadata.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
package kotlinx.rpc.grpc
66

77
@Suppress("RedundantConstructorKeyword")
8-
public expect class GrpcTrailers constructor() {
9-
public fun merge(trailers: GrpcTrailers)
8+
public expect class GrpcMetadata constructor() {
9+
public fun merge(trailers: GrpcMetadata)
1010
}

‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/ServerInterceptor.kt‎

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

1111
public interface ServerCallScope<Request, Response> {
1212
public val method: MethodDescriptor<Request, Response>
13-
public val requestHeaders: GrpcTrailers
14-
public val responseHeaders: GrpcTrailers
15-
public val responseTrailers: GrpcTrailers
13+
public val requestHeaders: GrpcMetadata
14+
public val responseHeaders: GrpcMetadata
15+
public val responseTrailers: GrpcMetadata
1616

17-
public fun onClose(block: (Status, GrpcTrailers) -> Unit)
18-
public fun close(status: Status, trailers: GrpcTrailers = GrpcTrailers()): Nothing
17+
public fun onClose(block: (Status, GrpcMetadata) -> Unit)
18+
public fun close(status: Status, trailers: GrpcMetadata = GrpcMetadata()): Nothing
1919
public fun proceed(request: Flow<Request>): Flow<Response>
2020

2121
public suspend fun FlowCollector<Response>.proceedFlow(request: Flow<Request>) {

‎grpc/grpc-core/src/commonMain/kotlin/kotlinx/rpc/grpc/StatusException.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ package kotlinx.rpc.grpc
99
*/
1010
public expect class StatusException : Exception {
1111
public constructor(status: Status)
12-
public constructor(status: Status, trailers: GrpcTrailers?)
12+
public constructor(status: Status, trailers: GrpcMetadata?)
1313

1414
public fun getStatus(): Status
15-
public fun getTrailers(): GrpcTrailers?
15+
public fun getTrailers(): GrpcMetadata?
1616
}
1717

1818
public expect class StatusRuntimeException : RuntimeException {
1919
public constructor(status: Status)
20-
public constructor(status: Status, trailers: GrpcTrailers?)
20+
public constructor(status: Status, trailers: GrpcMetadata?)
2121

2222
public fun getStatus(): Status
23-
public fun getTrailers(): GrpcTrailers?
23+
public fun getTrailers(): GrpcMetadata?
2424
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package kotlinx.rpc.grpc.internal
66

7-
import kotlinx.rpc.grpc.GrpcTrailers
7+
import kotlinx.rpc.grpc.GrpcMetadata
88
import kotlinx.rpc.grpc.Status
99
import kotlinx.rpc.internal.utils.InternalRpcApi
1010

@@ -31,13 +31,13 @@ import kotlinx.rpc.internal.utils.InternalRpcApi
3131
public expect abstract class ClientCall<Request, Response> {
3232
@InternalRpcApi
3333
public abstract class Listener<Message> {
34-
public open fun onHeaders(headers: GrpcTrailers)
34+
public open fun onHeaders(headers: GrpcMetadata)
3535
public open fun onMessage(message: Message)
36-
public open fun onClose(status: Status, trailers: GrpcTrailers)
36+
public open fun onClose(status: Status, trailers: GrpcMetadata)
3737
public open fun onReady()
3838
}
3939

40-
public abstract fun start(responseListener: Listener<Response>, headers: GrpcTrailers)
40+
public abstract fun start(responseListener: Listener<Response>, headers: GrpcMetadata)
4141
public abstract fun request(numMessages: Int)
4242
public abstract fun cancel(message: String?, cause: Throwable?)
4343
public abstract fun halfClose()
@@ -47,8 +47,8 @@ public expect abstract class ClientCall<Request, Response> {
4747

4848
@InternalRpcApi
4949
public expect fun <Message> clientCallListener(
50-
onHeaders: (headers: GrpcTrailers) -> Unit,
50+
onHeaders: (headers: GrpcMetadata) -> Unit,
5151
onMessage: (message: Message) -> Unit,
52-
onClose: (status: Status, trailers: GrpcTrailers) -> Unit,
52+
onClose: (status: Status, trailers: GrpcMetadata) -> Unit,
5353
onReady: () -> Unit,
5454
): ClientCall.Listener<Message>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
package kotlinx.rpc.grpc.internal
66

7-
import kotlinx.rpc.grpc.GrpcTrailers
7+
import kotlinx.rpc.grpc.GrpcMetadata
88
import kotlinx.rpc.grpc.Status
99
import kotlinx.rpc.internal.utils.InternalRpcApi
1010

1111
@InternalRpcApi
1212
public expect fun interface ServerCallHandler<Request, Response> {
13-
public fun startCall(call: ServerCall<Request, Response>, headers: GrpcTrailers): ServerCall.Listener<Request>
13+
public fun startCall(call: ServerCall<Request, Response>, headers: GrpcMetadata): ServerCall.Listener<Request>
1414
}
1515

1616
@InternalRpcApi
@@ -25,9 +25,9 @@ public expect abstract class ServerCall<Request, Response> {
2525
}
2626

2727
public abstract fun request(numMessages: Int)
28-
public abstract fun sendHeaders(headers: GrpcTrailers)
28+
public abstract fun sendHeaders(headers: GrpcMetadata)
2929
public abstract fun sendMessage(message: Response)
30-
public abstract fun close(status: Status, trailers: GrpcTrailers)
30+
public abstract fun close(status: Status, trailers: GrpcMetadata)
3131

3232
public open fun isReady(): Boolean
3333
public abstract fun isCancelled(): Boolean

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
1919
import kotlinx.coroutines.withContext
2020
import kotlinx.rpc.grpc.ClientCallScope
2121
import kotlinx.rpc.grpc.GrpcClient
22-
import kotlinx.rpc.grpc.GrpcTrailers
22+
import kotlinx.rpc.grpc.GrpcMetadata
2323
import kotlinx.rpc.grpc.Status
2424
import kotlinx.rpc.grpc.StatusCode
2525
import kotlinx.rpc.grpc.StatusException
@@ -34,7 +34,7 @@ public suspend fun <Request, Response> GrpcClient.unaryRpc(
3434
descriptor: MethodDescriptor<Request, Response>,
3535
request: Request,
3636
callOptions: GrpcCallOptions = GrpcDefaultCallOptions,
37-
trailers: GrpcTrailers = GrpcTrailers(),
37+
trailers: GrpcMetadata = GrpcMetadata(),
3838
): Response {
3939
val type = descriptor.type
4040
require(type == MethodType.UNARY) {
@@ -54,7 +54,7 @@ public fun <Request, Response> GrpcClient.serverStreamingRpc(
5454
descriptor: MethodDescriptor<Request, Response>,
5555
request: Request,
5656
callOptions: GrpcCallOptions = GrpcDefaultCallOptions,
57-
trailers: GrpcTrailers = GrpcTrailers(),
57+
trailers: GrpcMetadata = GrpcMetadata(),
5858
): Flow<Response> {
5959
val type = descriptor.type
6060
require(type == MethodType.SERVER_STREAMING) {
@@ -74,7 +74,7 @@ public suspend fun <Request, Response> GrpcClient.clientStreamingRpc(
7474
descriptor: MethodDescriptor<Request, Response>,
7575
requests: Flow<Request>,
7676
callOptions: GrpcCallOptions = GrpcDefaultCallOptions,
77-
trailers: GrpcTrailers = GrpcTrailers(),
77+
trailers: GrpcMetadata = GrpcMetadata(),
7878
): Response {
7979
val type = descriptor.type
8080
require(type == MethodType.CLIENT_STREAMING) {
@@ -94,7 +94,7 @@ public fun <Request, Response> GrpcClient.bidirectionalStreamingRpc(
9494
descriptor: MethodDescriptor<Request, Response>,
9595
requests: Flow<Request>,
9696
callOptions: GrpcCallOptions = GrpcDefaultCallOptions,
97-
trailers: GrpcTrailers = GrpcTrailers(),
97+
trailers: GrpcMetadata = GrpcMetadata(),
9898
): Flow<Response> {
9999
val type = descriptor.type
100100
check(type == MethodType.BIDI_STREAMING) {
@@ -141,7 +141,7 @@ private sealed interface ClientRequest<Request> {
141141
private fun <Request, Response> GrpcClient.rpcImpl(
142142
descriptor: MethodDescriptor<Request, Response>,
143143
callOptions: GrpcCallOptions,
144-
trailers: GrpcTrailers,
144+
trailers: GrpcMetadata,
145145
request: Flow<Request>,
146146
): Flow<Response> {
147147
val clientCallScope = ClientCallScopeImpl(
@@ -205,22 +205,22 @@ 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: GrpcTrailers,
208+
override val metadata: GrpcMetadata,
209209
override val callOptions: GrpcCallOptions,
210210
) : ClientCallScope<Request, Response> {
211211

212212
val call = client.channel.platformApi.newCall(method, callOptions)
213213
val interceptors = client.interceptors
214-
val onHeadersFuture = CallbackFuture<GrpcTrailers>()
215-
val onCloseFuture = CallbackFuture<Pair<Status, GrpcTrailers>>()
214+
val onHeadersFuture = CallbackFuture<GrpcMetadata>()
215+
val onCloseFuture = CallbackFuture<Pair<Status, GrpcMetadata>>()
216216

217217
var interceptorIndex = 0
218218

219-
override fun onHeaders(block: (GrpcTrailers) -> Unit) {
219+
override fun onHeaders(block: (GrpcMetadata) -> Unit) {
220220
onHeadersFuture.onComplete { block(it) }
221221
}
222222

223-
override fun onClose(block: (Status, GrpcTrailers) -> Unit) {
223+
override fun onClose(block: (Status, GrpcMetadata) -> Unit) {
224224
onCloseFuture.onComplete { block(it.first, it.second) }
225225
}
226226

@@ -308,7 +308,7 @@ private class ClientCallScopeImpl<Request, Response>(
308308
throw e ?: AssertionError("onMessage should never be called until responses is ready")
309309
}
310310
},
311-
onClose = { status: Status, trailers: GrpcTrailers ->
311+
onClose = { status: Status, trailers: GrpcMetadata ->
312312
var cause = when {
313313
status.statusCode == StatusCode.OK -> null
314314
status.getCause() is CancellationException -> status.getCause()

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.map
1616
import kotlinx.coroutines.launch
1717
import kotlinx.coroutines.sync.Mutex
1818
import kotlinx.coroutines.sync.withLock
19-
import kotlinx.rpc.grpc.GrpcTrailers
19+
import kotlinx.rpc.grpc.GrpcMetadata
2020
import kotlinx.rpc.grpc.ServerCallScope
2121
import kotlinx.rpc.grpc.ServerInterceptor
2222
import kotlinx.rpc.grpc.Status
@@ -130,7 +130,7 @@ private fun <Request, Response> CoroutineScope.serverCallListenerImpl(
130130
responseKType: KType,
131131
interceptors: List<ServerInterceptor>,
132132
implementation: (Flow<Request>) -> Flow<Response>,
133-
requestHeaders: GrpcTrailers,
133+
requestHeaders: GrpcMetadata,
134134
): ServerCall.Listener<Request> {
135135
val ready = Ready { handler.isReady() }
136136
val requestsChannel = Channel<Request>(1)
@@ -177,7 +177,7 @@ private fun <Request, Response> CoroutineScope.serverCallListenerImpl(
177177
// once we have a response message, check if we've sent headers yet - if not, do so
178178
if (headersSent.value.compareAndSet(expect = false, update = true)) {
179179
mutex.withLock {
180-
handler.sendHeaders(GrpcTrailers())
180+
handler.sendHeaders(GrpcMetadata())
181181
}
182182
}
183183
ready.suspendUntilReady()
@@ -190,7 +190,7 @@ private fun <Request, Response> CoroutineScope.serverCallListenerImpl(
190190
// no elements or threw an exception, then we wouldn't have sent them
191191
if (failure == null && headersSent.value.compareAndSet(expect = false, update = true)) {
192192
mutex.withLock {
193-
handler.sendHeaders(GrpcTrailers())
193+
handler.sendHeaders(GrpcMetadata())
194194
}
195195
}
196196

@@ -216,7 +216,7 @@ private fun <Request, Response> CoroutineScope.serverCallListenerImpl(
216216
null
217217
}
218218
}
219-
} ?: GrpcTrailers()
219+
} ?: GrpcMetadata()
220220

221221
mutex.withLock {
222222
handler.close(closeStatus, trailers)
@@ -271,22 +271,22 @@ private class ServerCallScopeImpl<Request, Response>(
271271
override val method: MethodDescriptor<Request, Response>,
272272
val interceptors: List<ServerInterceptor>,
273273
val implementation: (Flow<Request>) -> Flow<Response>,
274-
override val requestHeaders: GrpcTrailers,
274+
override val requestHeaders: GrpcMetadata,
275275
val serverCall: ServerCall<Request, Response>,
276276
) : ServerCallScope<Request, Response> {
277277

278-
override val responseHeaders: GrpcTrailers = GrpcTrailers()
279-
override val responseTrailers: GrpcTrailers = GrpcTrailers()
278+
override val responseHeaders: GrpcMetadata = GrpcMetadata()
279+
override val responseTrailers: GrpcMetadata = GrpcMetadata()
280280

281281
// keeps track of already processed interceptors
282282
var interceptorIndex = 0
283-
val onCloseFuture = CallbackFuture<Pair<Status, GrpcTrailers>>()
283+
val onCloseFuture = CallbackFuture<Pair<Status, GrpcMetadata>>()
284284

285-
override fun onClose(block: (Status, GrpcTrailers) -> Unit) {
285+
override fun onClose(block: (Status, GrpcMetadata) -> Unit) {
286286
onCloseFuture.onComplete { block(it.first, it.second) }
287287
}
288288

289-
override fun close(status: Status, trailers: GrpcTrailers): Nothing {
289+
override fun close(status: Status, trailers: GrpcMetadata): Nothing {
290290
// this will be cached by the rpcImpl() runCatching{} and turns it into a close()
291291
throw StatusException(status, trailers)
292292
}

0 commit comments

Comments
 (0)