Skip to content

Commit 50fa9d9

Browse files
committed
Fix semantics
1 parent 6ad20ca commit 50fa9d9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

kcommand-core/src/main/kotlin/io/github/theunic/kcommand/core/AbstractMessageBus.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ abstract class AbstractMessageBus<M : Any, R : Any>(
1818
}
1919

2020
protected suspend fun processCommand(
21-
command: M,
21+
message: M,
2222
deferred: CompletableDeferred<R>,
2323
) {
2424
val next: suspend (M) -> CompletableDeferred<R> = { cmd ->
2525
try {
26-
deferred.complete(handleCommand(cmd))
26+
deferred.complete(handleMessage(cmd))
2727
deferred
2828
} catch (e: Exception) {
2929
deferred.completeExceptionally(e)
@@ -36,15 +36,15 @@ abstract class AbstractMessageBus<M : Any, R : Any>(
3636
{ cmd -> middleware.handle(cmd, proceed) }
3737
}
3838

39-
chain(command)
39+
chain(message)
4040
}
4141

42-
private suspend fun handleCommand(command: M): R = getCommandHandler(command::class).handle(command)
42+
private suspend fun handleMessage(message: M): R = getMessageHandler(message::class).handle(message)
4343

44-
private fun getCommandHandler(commandClass: KClass<out M>): MessageHandler<M, R> {
44+
private fun getMessageHandler(messageClass: KClass<out M>): MessageHandler<M, R> {
4545
synchronized(subscriptions) {
46-
return subscriptions[commandClass]
47-
?: throw IllegalArgumentException("No handler found for command: $commandClass")
46+
return subscriptions[messageClass]
47+
?: throw IllegalArgumentException("No handler found for message: $messageClass")
4848
}
4949
}
5050
}

kcommand-core/src/main/kotlin/io/github/theunic/kcommand/core/transport/LocalTransport.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import kotlinx.coroutines.flow.MutableSharedFlow
88
import kotlinx.coroutines.flow.asSharedFlow
99

1010
class LocalTransport<M : Any, R : Any> : Transport<M, R> {
11-
private val commandEmitter: MutableSharedFlow<Pair<M, Either<Unit, CompletableDeferred<R>>>> = MutableSharedFlow()
11+
private val messageEmitter: MutableSharedFlow<Pair<M, Either<Unit, CompletableDeferred<R>>>> = MutableSharedFlow()
1212

1313
override suspend fun send(message: M): Either<Unit, CompletableDeferred<R>> {
1414
val result = Either.Right(CompletableDeferred<R>())
15-
commandEmitter.emit(message to result)
15+
messageEmitter.emit(message to result)
1616
return result
1717
}
1818

19-
override fun receive(): Flow<Pair<M, Either<Unit, CompletableDeferred<R>>>> = commandEmitter.asSharedFlow()
19+
override fun receive(): Flow<Pair<M, Either<Unit, CompletableDeferred<R>>>> = messageEmitter.asSharedFlow()
2020
}

0 commit comments

Comments
 (0)