update ktlint

This commit is contained in:
2024-02-29 01:31:03 +01:00
parent 53cc961c62
commit 03ba14d918
13 changed files with 117 additions and 102 deletions

View File

@@ -10,7 +10,9 @@ sealed interface AggregateId {
@JvmInline
@Serializable(with = GameIdSerializer::class)
value class GameId(override val id: UUID = UUID.randomUUID()) : AggregateId {
value class GameId(
override val id: UUID = UUID.randomUUID(),
) : AggregateId {
constructor(id: String) : this(UUID.fromString(id))
override fun toString(): String = id.toString()

View File

@@ -8,9 +8,7 @@ data class Game(
val id: GameId,
) {
companion object {
fun new(): Game {
return Game(GameId())
}
fun new(): Game = Game(GameId())
}
}

View File

@@ -7,7 +7,9 @@ import java.util.UUID
@JvmInline
@Serializable(with = CommandIdSerializer::class)
value class CommandId(private val id: UUID = UUID.randomUUID()) {
value class CommandId(
private val id: UUID = UUID.randomUUID(),
) {
constructor(id: String) : this(UUID.fromString(id))
override fun toString(): String = id.toString()

View File

@@ -18,11 +18,7 @@ class CommandStream {
commands.forEach { sendRequest(it) }
}
fun readNext(): Command? {
return commandBus.firstOrNull()
}
fun readNext(): Command? = commandBus.firstOrNull()
fun <U : Command> readNext(commandClass: Class<U>): U? {
return commandBus.filterIsInstance(commandClass).firstOrNull()
}
fun <U : Command> readNext(commandClass: Class<U>): U? = commandBus.filterIsInstance(commandClass).firstOrNull()
}

View File

@@ -21,11 +21,7 @@ class EventStream<ID : AggregateId> {
fun <U : Event<ID>> read(
aggregateId: ID,
eventClass: Class<U>,
): U? {
return eventBus.get(aggregateId)?.filterIsInstance(eventClass)?.firstOrNull()
}
): U? = eventBus.get(aggregateId)?.filterIsInstance(eventClass)?.firstOrNull()
}
inline fun <reified U : Event<ID>, ID : AggregateId> EventStream<ID>.read(aggregateId: ID): U? {
return this.read(aggregateId, U::class.java)
}
inline fun <reified U : Event<ID>, ID : AggregateId> EventStream<ID>.read(aggregateId: ID): U? = this.read(aggregateId, U::class.java)

View File

@@ -26,14 +26,20 @@ class Game(
) {
@Serializable
@Resource("card")
class Card(val game: Game) {
class Card(
val game: Game,
) {
@Serializable
@Resource("")
class PutCard(val card: Card)
class PutCard(
val card: Card,
)
@Serializable
@Resource("last")
class LastCard(val card: Card)
class LastCard(
val card: Card,
)
}
}
@@ -47,7 +53,8 @@ fun Routing.card() {
}
get<Game.Card.LastCard> {
eventStream.read<PlayCardEvent, GameId>(it.card.game.id)
eventStream
.read<PlayCardEvent, GameId>(it.card.game.id)
?.let { it1 -> call.respond<Card>(it1.card) }
?: call.response.status(HttpStatusCode.BadRequest)
}

View File

@@ -19,7 +19,9 @@ import org.koin.ktor.ext.inject
@Resource("/command")
class CommandRoute {
@Resource("send")
class Send(val commandRoute: CommandRoute) {
class Send(
val commandRoute: CommandRoute,
) {
@Serializable
data class Response(
val id: CommandId,
@@ -29,7 +31,9 @@ class CommandRoute {
}
@Resource("next")
class Next(val commandRoute: CommandRoute)
class Next(
val commandRoute: CommandRoute,
)
}
fun Routing.command() {

View File

@@ -20,7 +20,9 @@ fun Application.configureHTTP() {
}
}
class BadRequestException(val httpError: HttpErrorBadRequest) : Exception()
class BadRequestException(
val httpError: HttpErrorBadRequest,
) : Exception()
class HttpErrorBadRequest(
statusCode: HttpStatusCode,

View File

@@ -21,7 +21,8 @@ fun Application.configureSockets() {
masking = false
}
routing {
webSocket("/ws") { // websocketSession
webSocket("/ws") {
// websocketSession
for (frame in incoming) {
if (frame is Frame.Text) {
val text = frame.readText()