WIP: Migrate to kotlin-logging - Main, DefaultContext, AbstractPath, SimpleTrack, RailSwitch partial

Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com>

Author: Copilot

build.gradle.kts

@@ -44,6 +44,7 @@ plugins {
 val jdiscoVersion: String by project
 val slf4jVersion: String by project
 val logbackVersion: String by project
+val kotlinLoggingVersion: String by project
 val junitPlatformVersion: String by project
 val junitJupiterVersion: String by project
 val assertjVersion: String by project
@@ -86,6 +87,7 @@ dependencies {
     implementation("dk.ruc.keld:jdisco:$jdiscoVersion")              // Discrete event simulation library
     implementation("org.slf4j:slf4j-api:$slf4jVersion")               // Logging facade
     implementation("ch.qos.logback:logback-classic:$logbackVersion")  // SLF4J implementation (includes logback-core)
+    implementation("io.github.oshai:kotlin-logging-jvm:$kotlinLoggingVersion") // Kotlin logging library
 
     // Kotlin dependencies (for Phase 1 migration)
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")  // Kotlin standard library

gradle.properties

@@ -17,6 +17,7 @@ kotlinVersion=2.0.20
 jdiscoVersion=1.2.0
 slf4jVersion=2.0.17
 logbackVersion=1.5.23
+kotlinLoggingVersion=7.0.3
 junitPlatformVersion=1.11.4
 junitJupiterVersion=5.11.4
 assertjVersion=3.27.6

src/main/kotlin/cz/vutbr/fit/interlockSim/Main.kt

@@ -23,7 +23,7 @@ import cz.vutbr.fit.interlockSim.sim.ShuntingLoop
 import cz.vutbr.fit.interlockSim.sim.SimulationException
 import cz.vutbr.fit.interlockSim.util.Util
 import cz.vutbr.fit.interlockSim.xml.XMLContextFactory
-import org.slf4j.LoggerFactory
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.io.File
 import java.io.InputStream
 import java.io.PrintStream
@@ -104,10 +104,10 @@ class Main private constructor() {
 				out.println(cause.message + " cannot convert to number")
 				return
 			}
-			logger.error("Example initialization failed", cause)
+			logger.error(cause) { "Example initialization failed" }
 		} catch (e: Exception) {
 			out.println("Example inilialization failed")
-			logger.error("Example initialization failed", e)
+			logger.error(e) { "Example initialization failed" }
 		}
 	}
 
@@ -172,7 +172,7 @@ class Main private constructor() {
 		 */
 		const val PROGRAM_FULL_NAME = "$PROGRAM_NAME $PROGRAM_VERSION"
 
-		private val logger = LoggerFactory.getLogger(Main::class.java)
+		private val logger = KotlinLogging.logger {}
 
 		private val instance = Main()
 

src/main/kotlin/cz/vutbr/fit/interlockSim/context/DefaultContext.kt

@@ -37,8 +37,7 @@ import cz.vutbr.fit.interlockSim.util.Util
 import jDisco.DiscoException
 import jDisco.Process
 import jDisco.Random
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.beans.PropertyChangeSupport
 import java.util.ArrayList
 import java.util.Collection
@@ -122,14 +121,13 @@ abstract class DefaultContext :
 		/**
 		 * Logger for general class operations.
 		 */
-		private val logger: Logger = LoggerFactory.getLogger(DefaultContext::class.java)
+		private val logger = KotlinLogging.logger {}
 
 		/**
 		 * Separate logger for simulation events to allow independent level control.
 		 * Configured in logback.xml as "cz.vutbr.fit.interlockSim.simulation".
 		 */
-		private val simulationLogger: Logger =
-			LoggerFactory.getLogger("cz.vutbr.fit.interlockSim.simulation")
+		private val simulationLogger = KotlinLogging.logger("cz.vutbr.fit.interlockSim.simulation")
 
 		/**
 		 * Constant - square root of 2
@@ -140,7 +138,7 @@ abstract class DefaultContext :
 
 	protected constructor(cols: Int, rows: Int) {
 		this.railwayNetGrid = DefaultRailWayNetGrid(cols, rows)
-		logger.debug("Initialized railway network grid: {}x{} cells", cols, rows)
+		logger.debug { "Initialized railway network grid: ${cols}x${rows} cells" }
 	}
 
 	override fun getRailWayNetGrid(): DefaultRailWayNetGrid = railwayNetGrid
@@ -461,13 +459,9 @@ abstract class DefaultContext :
 		val lineParts = findTrackLineParts(key1, key2, trackBlock)
 
 		if (lineParts == null || lineParts.isEmpty()) {
-			logger.debug(
-				"Join failed between ({},{}) and ({},{})",
-				key1.x,
-				key1.y,
-				key2.x,
-				key2.y
-			)
+			logger.debug {
+				"Join failed between (${key1.x},${key1.y}) and (${key2.x},${key2.y})"
+			}
 			changeSupport.firePropertyChange(
 				ContextChangeListener.JOIN_FAILED,
 				null,
@@ -483,14 +477,9 @@ abstract class DefaultContext :
 		}
 
 		val mapSize = (lineParts as? MutableMap<Point, TrackBlockPart>)?.size ?: 0
-		logger.debug(
-			"Created track join ({},{})->({},{}) with {} intermediate cells",
-			key1.x,
-			key1.y,
-			key2.x,
-			key2.y,
-			mapSize
-		)
+		logger.debug {
+			"Created track join (${key1.x},${key1.y})->(${key2.x},${key2.y}) with $mapSize intermediate cells"
+		}
 		changeSupport.firePropertyChange(
 			ContextChangeListener.JOIN_CREATED,
 			null,
@@ -543,9 +532,7 @@ abstract class DefaultContext :
 		}
 		if (nodeCell is InOut) getInOuts().add(nodeCell as InOut)
 		changeSupport.firePropertyChange(ContextChangeListener.CELL_ADDED, null, key)
-		if (logger.isTraceEnabled()) {
-			logger.trace("Added {} at ({},{})", nodeCell.javaClass.simpleName, key.x, key.y)
-		}
+		logger.trace { "Added ${nodeCell.javaClass.simpleName} at (${key.x},${key.y})" }
 	}
 
 	/**
@@ -742,12 +729,8 @@ abstract class DefaultContext :
 
 		@Suppress("UNCHECKED_CAST")
 		val result = nextTrackBlock?.getNextTrackSection(nodeCell, null as TrackSection?)
-		if (logger.isTraceEnabled()) {
-			logger.trace(
-				"getNextTrackSection: navigating network from {}, result: {}",
-				separator,
-				if (result != null) "found" else "not found"
-			)
+		logger.trace {
+			"getNextTrackSection: navigating network from $separator, result: ${if (result != null) "found" else "not found"}"
 		}
 		return result
 	}
@@ -758,22 +741,19 @@ abstract class DefaultContext :
 	@Throws(EmptyContextException::class, SimulationException::class)
 	override fun run() {
 		if (getGraph().isEmpty() || getGrid().isEmpty() || inouts.isEmpty()) {
-			logger.warn(
-				"Cannot start simulation: graph={}, grid={}, inouts={}",
-				if (getGraph().isEmpty()) "empty" else "ok",
-				if (getGrid().isEmpty()) "empty" else "ok",
-				if (inouts.isEmpty()) "empty" else "ok"
-			)
+			logger.warn {
+				"Cannot start simulation: graph=${if (getGraph().isEmpty()) "empty" else "ok"}, " +
+					"grid=${if (getGrid().isEmpty()) "empty" else "ok"}, " +
+					"inouts=${if (inouts.isEmpty()) "empty" else "ok"}"
+			}
 			throw EmptyContextException()
 		}
 		if (mainProcess == null) mainProcess = Generator(this)
 
-		logger.info(
-			"Starting simulation: {} InOut points, {} track blocks, main process={}",
-			inouts.size,
-			getGraph().size(),
-			mainProcess!!.javaClass.simpleName
-		)
+		logger.info {
+			"Starting simulation: ${inouts.size} InOut points, ${getGraph().size()} track blocks, " +
+				"main process=${mainProcess!!.javaClass.simpleName}"
+		}
 
 		for (i in inouts) {
 			workers[i] = InOutWorker(this, i)
@@ -782,7 +762,7 @@ abstract class DefaultContext :
 		try {
 			Process.activate(mainProcess)
 		} catch (e: DiscoException) {
-			logger.error("Failed to activate main simulation process", e)
+			logger.error(e) { "Failed to activate main simulation process" }
 			throw SimulationException(e)
 		}
 	}
@@ -854,9 +834,7 @@ abstract class DefaultContext :
 		if (sep == null || nxt == null) {
 			throw IllegalArgumentException("wrong arguments for aPath finding")
 		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("pathToNextSemaphore: searching path from {} via track section", sep)
-		}
+		logger.debug { "pathToNextSemaphore: searching path from $sep via track section" }
 		var separator = sep
 		var previous: TrackSection? = null
 		var next: TrackSection? = nxt
@@ -874,14 +852,12 @@ abstract class DefaultContext :
 			if (separator is OrientedPathSeparator) {
 				if (isSeparatorInDirection(separator, next, previous)) {
 					path.add(separator)
-					if (logger.isTraceEnabled()) {
-						logger.trace("pathToNextSemaphore: found complete path with length {}", path.length())
-					}
+					logger.trace { "pathToNextSemaphore: found complete path with length ${path.length()}" }
 					return path
 				}
 			}
 		} while (next != null)
-		logger.debug("pathToNextSemaphore: no path found from {}", sep)
+		logger.debug { "pathToNextSemaphore: no path found from $sep" }
 		return null
 	}
 
@@ -918,7 +894,6 @@ abstract class DefaultContext :
 		type: ReportType
 	) {
 		if (!isReporting(type)) return
-		if (!simulationLogger.isInfoEnabled()) return
 
 		val buf = if (report is StringBuilder) report else StringBuilder(report)
 		try {
@@ -927,11 +902,11 @@ abstract class DefaultContext :
 				buf.insert(0, obj)
 			}
 		} catch (e: Exception) {
-			logger.error("Error generating simulation report for type {}", type, e)
+			logger.error(e) { "Error generating simulation report for type $type" }
 		}
 		buf.insert(0, ' ')
 		buf.insert(0, jDisco.Process.time())
-		simulationLogger.info("{}", buf)
+		simulationLogger.info { buf }
 	}
 
 	/**

src/main/kotlin/cz/vutbr/fit/interlockSim/objects/cells/RailSwitch.kt

@@ -11,8 +11,8 @@ package cz.vutbr.fit.interlockSim.objects.cells
 
 import cz.vutbr.fit.interlockSim.sim.PathSeparatorChangeException
 import cz.vutbr.fit.interlockSim.util.EnumUnorientedGraph
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import io.github.oshai.kotlinlogging.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLoggingFactory
 import java.util.EnumMap
 import java.util.EnumSet
 import java.util.Map.Entry
@@ -259,7 +259,7 @@ class RailSwitch : NodeCell {
 	}
 
 	companion object {
-		private val logger: Logger = LoggerFactory.getLogger(RailSwitch::class.java)
+		private val logger = KotlinLogging.logger {}
 
 		/**
 		 * allowed speed