Skip to content

Commit f194f88

Browse files
CopilotbedaHovorka
andcommitted
Complete kotlin-logging migration for all files - imports updated
Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com>
1 parent d913a49 commit f194f88

3 files changed

Lines changed: 10 additions & 16 deletions

File tree

src/main/kotlin/cz/vutbr/fit/interlockSim/sim/Generator.kt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package cz.vutbr.fit.interlockSim.sim
1111

1212
import cz.vutbr.fit.interlockSim.context.SimulationContext
1313
import jDisco.Random
14-
import org.slf4j.LoggerFactory
14+
import io.github.oshai.kotlinlogging.KotlinLogging
1515

1616
/**
1717
* Testing Generator
@@ -21,7 +21,7 @@ open class Generator(
2121
protected val shuffleInOuts: Boolean = true
2222
) : LoopProcess() {
2323
companion object {
24-
private val logger = LoggerFactory.getLogger(Generator::class.java)
24+
private val logger = KotlinLogging.logger {}
2525

2626
init {
2727
dtMin = 1e-6
@@ -42,22 +42,17 @@ open class Generator(
4242
}
4343
val timeIn = time() + random.normal(15.0, 5.0)
4444
val timeOut = timeIn + random.normal(15.0, 5.0)
45-
if (logger.isDebugEnabled) {
46-
logger.debug(
47-
"Generating random timetable: from {} to {}, arrival at {}, departure at {}",
48-
inOutsList[0].getName(),
49-
inOutsList[1].getName(),
50-
timeIn,
51-
timeOut
52-
)
45+
logger.debug {
46+
"Generating random timetable: from ${inOutsList[0].getName()} to ${inOutsList[1].getName()}, " +
47+
"arrival at $timeIn, departure at $timeOut"
5348
}
5449

5550
return Timetable(inOutsList[0], inOutsList[1], Time(timeIn), Time(timeOut), 40.0)
5651
}
5752

5853
override fun iteration() {
5954
val train = Train(context, generateRandomTimetable())
60-
logger.debug("Generator: creating and placing train (total trains: {})", trains.size + 1)
55+
logger.debug { "Generator: creating and placing train (total trains: ${trains.size + 1})" }
6156
placeTrain(train)
6257
trains.add(train)
6358
}

src/main/kotlin/cz/vutbr/fit/interlockSim/sim/InOutWorker.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import jDisco.Condition
1818
import jDisco.Head
1919
import jDisco.Link
2020
import jDisco.Process
21-
import org.slf4j.LoggerFactory
21+
import io.github.oshai.kotlinlogging.KotlinLogging
2222

2323
/**
2424
* Behaviour of InOut process
@@ -29,7 +29,7 @@ class InOutWorker(
2929
private val inOut: InOut
3030
) : LoopProcess() {
3131
companion object {
32-
private val logger = LoggerFactory.getLogger(InOutWorker::class.java)
32+
private val logger = KotlinLogging.logger {}
3333
}
3434

3535
private val queqe = Head()

src/main/kotlin/cz/vutbr/fit/interlockSim/sim/ShuntingLoop.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ import cz.vutbr.fit.interlockSim.objects.tracks.TrackFacility.State
2828
import cz.vutbr.fit.interlockSim.util.ExtendedUnorientedGraph
2929
import cz.vutbr.fit.interlockSim.util.Point
3030
import cz.vutbr.fit.interlockSim.util.Util
31-
import org.slf4j.Logger
32-
import org.slf4j.LoggerFactory
31+
import io.github.oshai.kotlinlogging.KotlinLogging
3332
import java.util.ArrayList
3433
import java.util.Collections
3534
import java.util.HashMap
@@ -42,7 +41,7 @@ import java.util.Queue
4241
*/
4342
class ShuntingLoop : Interlocking {
4443
companion object {
45-
private val logger: Logger = LoggerFactory.getLogger(ShuntingLoop::class.java)
44+
private val logger = KotlinLogging.logger {}
4645
private const val MAX_TRAINS: Int = 2 // maximalni pocet odsouhlasených vlaků v systému
4746
}
4847

0 commit comments

Comments
 (0)