refactor: migrate all logger calls to new braces style

Author: xeruf

src/main/kotlin/sc/gui/GuiApp.kt

@@ -31,7 +31,7 @@ open class ServerApp(primaryView: KClass<out UIComponent>) : App(primaryView, Ap
         AppModel.save()
         super.stop()
         server.stopServer()
-        logger.info("App stopped, Terminating")
+        logger.info { "App stopped, Terminating" }
     }
 
     init {

src/main/kotlin/sc/gui/LobbyManager.kt

@@ -39,7 +39,7 @@ class LobbyManager(host: String, port: Int): Controller(), Consumer<ResponsePack
     private val client: AdminClient = try {
         LobbyClient(host, port).authenticate(Configuration.get(Configuration.PASSWORD_KEY), this)
     } catch (e: ConnectException) {
-        logger.error("Could not connect to server: " + e.message)
+        logger.error(e) { "Could not connect to server: " + e.message }
         exitProcess(1)
     }
 
@@ -53,7 +53,7 @@ class LobbyManager(host: String, port: Int): Controller(), Consumer<ResponsePack
                         player.joinGameRoom(packet.roomId)
                     } else {
                         if (reservationIndex >= packet.reservations.size) {
-                            logger.warn("More players than reservations, left with {}", pendingPlayers)
+                            logger.warn { "More players than reservations, left with $pendingPlayers" }
                             return@removeAll false
                         }
                         player.joinGameWithReservation(packet.reservations[reservationIndex++])
@@ -62,7 +62,7 @@ class LobbyManager(host: String, port: Int): Controller(), Consumer<ResponsePack
                 }
             }
             is ErrorPacket -> {
-                logger.error("$packet")
+                logger.error { "$packet" }
                 // if (packet.originalRequest !is CancelRequest)
                 Platform.runLater {
                     error("Fehler in der Kommunikation mit dem Server", packet.toString()).setOnCloseRequest {
@@ -81,11 +81,11 @@ class LobbyManager(host: String, port: Int): Controller(), Consumer<ResponsePack
         gameFlowController.controller = client.control(roomId)
         subscribe<NewGameState>(1) { fire(GameReadyEvent()) }
         client.observe(roomId) { msg ->
-            logger.trace("New RoomMessage in {}: {}", roomId, msg)
-            when (msg) {
+            logger.trace { "New RoomMessage in $roomId: $msg" }
+            when(msg) {
                 is MementoMessage -> fire(NewGameState(msg.state))
                 is GameResult -> if(gameFlowController.controller != null) fire(GameOverEvent(msg))
-                is ErrorMessage -> logger.warn("Error in $roomId: $msg")
+                is ErrorMessage -> logger.warn { "Error in $roomId: $msg" }
                 is GamePaused -> fire(GamePausedEvent(msg.paused))
             }
         }

src/main/kotlin/sc/gui/controller/AppController.kt

@@ -36,9 +36,9 @@ class AppController: Controller() {
 
     private fun changeViewTo(newView: ViewType) {
         val current = model.currentView.get()
-        logger.debug("Requested View change from ${current.name} -> $newView")
+        logger.debug { "Requested View change from ${current.name} -> $newView" }
         if (current == newView) {
-            logger.warn("Noop view change request!")
+            logger.warn { "Noop view change request!" }
             return
         }
         find(current.view).replaceWith(newView.view)

src/main/kotlin/sc/gui/controller/GameFlowController.kt

@@ -99,7 +99,7 @@ class GameFlowController: Controller() {
         subscribe<NewGameState> { event ->
             val state = event.gameState
             history.add(state)
-            logger.debug("New state: {}", state)
+            logger.debug { "New state: $state" }
             gameModel.run {
                 if(stepController || gameState.value == null || gameResult.value != null) {
                     gameResult.set(null)
@@ -117,7 +117,7 @@ class GameFlowController: Controller() {
             throw ReplayLoaderException("Trying to load replay into a running game")
         val result = loader.loadHistory()
         history.addAll(result.first)
-        logger.debug("Loaded {} states from {}", history.size, loader)
+        logger.debug { "Loaded ${history.size} states from $loader" }
         if(history.isEmpty())
             throw ReplayLoaderException("Replay history from $loader is empty")
 

src/main/kotlin/sc/gui/util/DesktopUtils.kt

@@ -21,14 +21,14 @@ fun browse(file: File) {
 fun <T> T.openDesktop(action: Desktop.Action, open: Desktop.(T) -> Unit) {
     val desktop = Desktop.getDesktop()
     if(desktop.isSupported(action)) {
-        logger.debug("Opening {} on {}", this, desktop)
+        logger.debug { "Opening $this on $desktop" }
         open(desktop, this)
     } else {
-        logger.debug("Opening {} with xdg-open", this)
+        logger.debug { "Opening $this with xdg-open" }
         try {
             ProcessBuilder("xdg-open", this.toString()).start()
         } catch(ex: IOException) {
-            logger.warn("Failed to open {}", this, ex)
+            logger.warn(ex) { "Failed to open $this" }
         }
     }
 }

src/main/kotlin/sc/gui/view/GameView.kt

@@ -39,7 +39,7 @@ abstract class GameBoard<GameState: IGameState>: View(), ChangeListener<IGameSta
     protected val awaitingHumanMove =
         gameModel.isHumanTurn.booleanBinding(gameModel.atLatestTurn) {
             (gameModel.atLatestTurn.value && gameModel.isHumanTurn.value).also {
-                logger.trace { "Awaiting Human Turn: $it"}
+                logger.trace { "Awaiting Human Turn: $it" }
             }
         }
 
@@ -116,7 +116,9 @@ abstract class GameBoard<GameState: IGameState>: View(), ChangeListener<IGameSta
 
     protected fun sendHumanMove(move: IMove): Boolean {
         if(awaitingHumanMove.value) {
-            fire(HumanMoveAction(move.also { logger.debug("Human Move: {}", it) }))
+            fire(HumanMoveAction(move.also {
+                logger.debug { "Human Move: $it" }
+            }))
             return true
         }
         return false

src/main/kotlin/sc/gui/view/game/MississippiBoard.kt

@@ -136,12 +136,12 @@ class MississippiBoard: GameBoard<GameState>() {
             }
             originalState = state
         }
-        logger.trace("New state for board: ${state.longString()}")
+        logger.trace { "New state for board: ${state.longString()}" }
 
         state.currentShip.movement += state.currentShip.maxAcc
         val pushes = state.getPossiblePushs()
         state.currentShip.movement -= state.currentShip.maxAcc
-        logger.trace("Available Pushes: {}", pushes)
+        logger.trace { "Available Pushes: $pushes"}
 
         val neighbors = hashMapOf<CubeCoordinates, ArrayList<CubeDirection>>()
         state.board.forEachField { cubeCoordinates, field ->
@@ -167,7 +167,7 @@ class MississippiBoard: GameBoard<GameState>() {
                         state.currentShip.position + it.direction.vector == cubeCoordinates
                     }
                     if(push != null) {
-                        logger.debug("Registering Push '{}' for {}", push, piece)
+                        logger.debug { "Registering Push '$push' for $piece" }
                         piece.glow(.4)
                         piece.onHover { hover ->
                             // TODO hover not recognized when stream is on top
@@ -237,7 +237,7 @@ class MississippiBoard: GameBoard<GameState>() {
                         2 -> "border"
                         3 -> "border_outer"
                         else -> {
-                            logger.warn("Piece at $coords has wrong border directions: $dirs")
+                            logger.warn { "Piece at $coords has wrong border directions: $dirs" }
                             ""
                         }
                     }
@@ -417,7 +417,7 @@ class MississippiBoard: GameBoard<GameState>() {
             }
         }
 
-        logger.debug("Adding Human Action from keypress {}", action)
+        logger.debug { "Adding Human Action from keypress $action" }
         if(action != null) {
             addHumanAction(action)
             return true
@@ -539,7 +539,7 @@ class MississippiBoard: GameBoard<GameState>() {
 
     private fun <T: Node> addPiece(node: T, coordinates: CubeCoordinates): T {
         if(grid.children.contains(node))
-            logger.warn("Attempting to add duplicate grid child at $coordinates: $node")
+            logger.warn { "Attempting to add duplicate grid child at $coordinates: $node" }
         else
             grid.add(node)
         calculatedBlockSize.listenImmediately {

src/main/kotlin/sc/gui/view/game/PenguinsBoard.kt

@@ -66,7 +66,7 @@ class PenguinBoard: View() {
                 rotate = state.startTeam.index * 180.0
                 rotationAxis = Rotate.Y_AXIS
                 // TODO finish pending movements
-                logger.trace("New state for board: ${state.longString()}")
+                logger.trace { "New state for board: ${state.longString()}" }
 
                 val lastMove = arrayOf(state to state.lastMove, oldState to oldState?.lastMove?.reversed()).maxByOrNull {
                     it.first?.turn ?: -1
@@ -207,7 +207,7 @@ class PenguinBoard: View() {
                                 event.consume()
                             }
                         } else {
-                            logger.error("Invalid State!")
+                            logger.error { "Invalid State!" }
                         }
                     }
                     //image.viewOrder = BOARD_SIZE - coordinates.y.toDouble()
@@ -285,13 +285,13 @@ class PenguinBoard: View() {
 
     private fun humanMove(move: Move) {
         if(gameModel.atLatestTurn.value && gameModel.isHumanTurn.value) {
-            fire(HumanMoveAction(move.also { logger.debug("Human Move: $it") }))
+            fire(HumanMoveAction(move.also { logger.debug { "Human Move: $it" } }))
         }
     }
 
     private fun <T: Region> addPiece(node: T, coordinates: Coordinates): T {
         if(grid.children.contains(node))
-            logger.warn("Attempting to add duplicate grid child at $coordinates: $node")
+            logger.warn { "Attempting to add duplicate grid child at $coordinates: $node" }
         else
             grid.add(node)
         size.listenImmediately {