From 280729c229c649af72bb8a739e8f72254fd993a6 Mon Sep 17 00:00:00 2001 From: Benedikt Schwab Date: Thu, 9 May 2024 08:14:45 +0200 Subject: [PATCH] updated kotlin-logging --- buildSrc/src/main/kotlin/Dependencies.kt | 4 ++-- .../main/kotlin/io/rtron/io/logging/ProgressBar.kt | 6 +++--- .../main/processor/OpendriveToCitygmlProcessor.kt | 14 +++++++------- .../main/processor/ValidateOpendriveProcessor.kt | 12 ++++++------ .../kotlin/io/rtron/main/project/ProjectDSL.kt | 14 +++++++------- .../kotlin/io/rtron/math/analysis/FresnelTest.kt | 2 +- .../geometry/euclidean/twod/curve/Spiral2DTest.kt | 2 +- .../euclidean/twod/curve/SpiralSegment2DTest.kt | 2 +- .../io/rtron/readerwriter/citygml/CitygmlWriter.kt | 4 ++-- .../readerwriter/opendrive/OpendriveReader.kt | 6 +++--- .../readerwriter/opendrive/OpendriveValidator.kt | 14 +++++++++----- .../readerwriter/opendrive/OpendriveWriter.kt | 4 ++-- .../mapper/opendrive14/Opendrive14RoadMapper.kt | 4 ++-- .../mapper/opendrive16/Opendrive16CoreMapper.kt | 2 +- .../opendrive16/Opendrive16JunctionMapper.kt | 2 +- .../reader/mapper/opendrive16/Opendrive16Mapper.kt | 2 +- .../Opendrive2RoadspacesTransformer.kt | 6 +++--- .../Roadspaces2CitygmlTransformer.kt | 6 +++--- .../evaluator/opendrive/OpendriveEvaluator.kt | 4 ++-- .../evaluator/roadspaces/RoadspacesEvaluator.kt | 4 ++-- 20 files changed, 59 insertions(+), 55 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 807031ba..4f5b90ec 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ object DependencyVersions { const val mockk = "1.13.10" // logging libraries - const val kotlinLogging = "3.0.5" + const val kotlinLogging = "6.0.9" const val slf4jSimple = "2.0.13" // object creation libraries @@ -75,7 +75,7 @@ object Dependencies { const val mockk = "io.mockk:mockk:${DependencyVersions.mockk}" // logging libraries - const val kotlinLogging = "io.github.microutils:kotlin-logging:${DependencyVersions.kotlinLogging}" + const val kotlinLogging = "io.github.oshai:kotlin-logging-jvm:${DependencyVersions.kotlinLogging}" const val slf4jSimple = "org.slf4j:slf4j-simple:${DependencyVersions.slf4jSimple}" // object creation libraries diff --git a/rtron-io/src/main/kotlin/io/rtron/io/logging/ProgressBar.kt b/rtron-io/src/main/kotlin/io/rtron/io/logging/ProgressBar.kt index a4d42d1c..5dda8ba9 100644 --- a/rtron-io/src/main/kotlin/io/rtron/io/logging/ProgressBar.kt +++ b/rtron-io/src/main/kotlin/io/rtron/io/logging/ProgressBar.kt @@ -16,7 +16,7 @@ package io.rtron.io.logging -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import kotlin.math.roundToInt import kotlin.time.Duration import kotlin.time.DurationUnit @@ -59,10 +59,10 @@ class ProgressBar( private fun printUpdate() { val elapsedTime = getElapsedTime() if (elapsedTime > PRINT_AFTER && (getElapsedTimeSinceLastUpdate() > PRINT_AT_LEAST || isCompleted())) { - logger.info( + logger.info { "$taskName $currentStatus/$completion ${getProgressPercent().roundToInt()}% " + "[ET $elapsedTime, ETA ${getEstimatedTimeOfArrival()}]" - ) + } lastPrintUpdateTime = System.currentTimeMillis() } } diff --git a/rtron-main/src/main/kotlin/io/rtron/main/processor/OpendriveToCitygmlProcessor.kt b/rtron-main/src/main/kotlin/io/rtron/main/processor/OpendriveToCitygmlProcessor.kt index 56a98c32..bfc475dc 100644 --- a/rtron-main/src/main/kotlin/io/rtron/main/processor/OpendriveToCitygmlProcessor.kt +++ b/rtron-main/src/main/kotlin/io/rtron/main/processor/OpendriveToCitygmlProcessor.kt @@ -18,6 +18,7 @@ package io.rtron.main.processor import arrow.core.getOrElse import com.charleskorn.kaml.Yaml +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.issues.getTextSummary import io.rtron.io.serialization.serializeToJsonFile import io.rtron.main.project.processAllFiles @@ -34,7 +35,6 @@ import io.rtron.transformer.modifiers.opendrive.cropper.OpendriveCropper import io.rtron.transformer.modifiers.opendrive.offset.adder.OpendriveOffsetAdder import io.rtron.transformer.modifiers.opendrive.offset.resolver.OpendriveOffsetResolver import io.rtron.transformer.modifiers.opendrive.remover.OpendriveObjectRemover -import mu.KotlinLogging import java.nio.file.Path import kotlin.io.path.Path import kotlin.io.path.createDirectories @@ -58,7 +58,7 @@ class OpendriveToCitygmlProcessor( outputSubDirectoryPath.createDirectories() // check if parameters are valid parameters.isValid().onLeft { issues -> - issues.forEach { logger.warn("Parameters are not valid: $it") } + issues.forEach { logger.warn { "Parameters are not valid: $it" } } return@processAllFiles } // write the parameters as yaml file @@ -66,21 +66,21 @@ class OpendriveToCitygmlProcessor( (outputSubDirectoryPath / PARAMETERS_PATH).toFile().writeText(parametersText) // validate schema of OpenDRIVE model - val opendriveSchemaValidatorReport = OpendriveValidator.validateFromFile(inputFilePath).getOrElse { logger.warn(it.message); return@processAllFiles } + val opendriveSchemaValidatorReport = OpendriveValidator.validateFromFile(inputFilePath).getOrElse { logger.warn { it.message }; return@processAllFiles } opendriveSchemaValidatorReport.serializeToJsonFile(outputSubDirectoryPath / OPENDRIVE_SCHEMA_VALIDATOR_REPORT_PATH) if (opendriveSchemaValidatorReport.validationProcessAborted()) { return@processAllFiles } // read of OpenDRIVE model val opendriveModel = OpendriveReader.readFromFile(inputFilePath) - .getOrElse { logger.warn(it.message); return@processAllFiles } + .getOrElse { logger.warn { it.message }; return@processAllFiles } // evaluate OpenDRIVE model val opendriveEvaluator = OpendriveEvaluator(parameters.deriveOpendriveEvaluatorParameters()) val opendriveEvaluatorResult = opendriveEvaluator.evaluate(opendriveModel) opendriveEvaluatorResult.second.serializeToJsonFile(outputSubDirectoryPath / OPENDRIVE_EVALUATOR_REPORT_PATH) val modifiedOpendriveModel = opendriveEvaluatorResult.first.handleEmpty { - logger.warn(opendriveEvaluatorResult.second.getTextSummary()) + logger.warn { opendriveEvaluatorResult.second.getTextSummary() } return@processAllFiles } @@ -99,7 +99,7 @@ class OpendriveToCitygmlProcessor( val opendriveCroppedResult = opendriveCropper.modify(opendriveOffsetResolvedResult.first) opendriveCroppedResult.second.serializeToJsonFile(outputSubDirectoryPath / OPENDRIVE_CROP_REPORT_PATH) val opendriveCropped = opendriveCroppedResult.first.handleEmpty { - logger.warn("OpendriveCropper: ${opendriveCroppedResult.second.message}") + logger.warn { "OpendriveCropper: ${opendriveCroppedResult.second.message}" } return@processAllFiles } @@ -117,7 +117,7 @@ class OpendriveToCitygmlProcessor( val roadspacesModelResult = opendrive2RoadspacesTransformer.transform(opendriveRemovedObjectResult.first) roadspacesModelResult.second.serializeToJsonFile(outputSubDirectoryPath / OPENDRIVE_TO_ROADSPACES_REPORT_PATH) val roadspacesModel = roadspacesModelResult.first.handleEmpty { - logger.warn("Opendrive2RoadspacesTransformer: ${roadspacesModelResult.second.conversion.getTextSummary()}") + logger.warn { "Opendrive2RoadspacesTransformer: ${roadspacesModelResult.second.conversion.getTextSummary()}" } return@processAllFiles } diff --git a/rtron-main/src/main/kotlin/io/rtron/main/processor/ValidateOpendriveProcessor.kt b/rtron-main/src/main/kotlin/io/rtron/main/processor/ValidateOpendriveProcessor.kt index 9bf068ed..9085e579 100644 --- a/rtron-main/src/main/kotlin/io/rtron/main/processor/ValidateOpendriveProcessor.kt +++ b/rtron-main/src/main/kotlin/io/rtron/main/processor/ValidateOpendriveProcessor.kt @@ -18,6 +18,7 @@ package io.rtron.main.processor import arrow.core.getOrElse import com.charleskorn.kaml.Yaml +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.issues.getTextSummary import io.rtron.io.serialization.serializeToJsonFile import io.rtron.main.project.processAllFiles @@ -31,7 +32,6 @@ import io.rtron.transformer.converter.opendrive2roadspaces.Opendrive2RoadspacesT import io.rtron.transformer.converter.roadspaces2citygml.Roadspaces2CitygmlTransformer import io.rtron.transformer.evaluator.opendrive.OpendriveEvaluator import io.rtron.transformer.evaluator.roadspaces.RoadspacesEvaluator -import mu.KotlinLogging import java.nio.file.Path import kotlin.io.path.Path import kotlin.io.path.div @@ -55,25 +55,25 @@ class ValidateOpendriveProcessor( (outputDirectoryPath / PARAMETERS_PATH).toFile().writeText(parametersText) // validate schema of OpenDRIVE model - val opendriveSchemaValidatorReport = OpendriveValidator.validateFromFile(inputFilePath).getOrElse { logger.warn(it.message); return@processAllFiles } + val opendriveSchemaValidatorReport = OpendriveValidator.validateFromFile(inputFilePath).getOrElse { logger.warn { it.message }; return@processAllFiles } opendriveSchemaValidatorReport.serializeToJsonFile(outputDirectoryPath / OPENDRIVE_SCHEMA_VALIDATOR_REPORT_PATH) if (opendriveSchemaValidatorReport.validationProcessAborted()) { return@processAllFiles } // read of OpenDRIVE model val opendriveModel = OpendriveReader.readFromFile(inputFilePath) - .getOrElse { logger.warn(it.message); return@processAllFiles } + .getOrElse { logger.warn { it.message }; return@processAllFiles } // evaluate OpenDRIVE model val opendriveEvaluator = OpendriveEvaluator(parameters.deriveOpendriveEvaluatorParameters()) val opendriveEvaluatorResult = opendriveEvaluator.evaluate(opendriveModel) opendriveEvaluatorResult.second.serializeToJsonFile(outputDirectoryPath / OPENDRIVE_EVALUATOR_REPORT_PATH) if (opendriveEvaluatorResult.second.containsFatalErrors()) { - logger.warn(opendriveEvaluatorResult.second.getTextSummary()) + logger.warn { opendriveEvaluatorResult.second.getTextSummary() } return@processAllFiles } val modifiedOpendriveModel = opendriveEvaluatorResult.first.handleEmpty { - logger.warn(opendriveEvaluatorResult.second.getTextSummary()) + logger.warn { opendriveEvaluatorResult.second.getTextSummary() } return@processAllFiles } @@ -88,7 +88,7 @@ class ValidateOpendriveProcessor( val roadspacesModelResult = opendrive2RoadspacesTransformer.transform(modifiedOpendriveModel) roadspacesModelResult.second.serializeToJsonFile(outputDirectoryPath / OPENDRIVE_TO_ROADSPACES_REPORT_PATH) val roadspacesModel = roadspacesModelResult.first.handleEmpty { - logger.warn(roadspacesModelResult.second.conversion.getTextSummary()) + logger.warn { roadspacesModelResult.second.conversion.getTextSummary() } return@processAllFiles } diff --git a/rtron-main/src/main/kotlin/io/rtron/main/project/ProjectDSL.kt b/rtron-main/src/main/kotlin/io/rtron/main/project/ProjectDSL.kt index 2a16e228..297b3011 100644 --- a/rtron-main/src/main/kotlin/io/rtron/main/project/ProjectDSL.kt +++ b/rtron-main/src/main/kotlin/io/rtron/main/project/ProjectDSL.kt @@ -16,8 +16,8 @@ package io.rtron.main.project +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.files.walk -import mu.KotlinLogging import java.nio.file.Path import kotlin.io.path.isDirectory import kotlin.io.path.isRegularFile @@ -39,15 +39,15 @@ fun processAllFiles(inputDirectoryPath: Path, withFilenameEndings: Set, val logger = KotlinLogging.logger {} if (!inputDirectoryPath.isDirectory()) { - logger.error("Provided directory does not exist: $inputDirectoryPath") + logger.error { "Provided directory does not exist: $inputDirectoryPath" } return } if (withFilenameEndings.isEmpty()) { - logger.error("No extensions have been provided.") + logger.error { "No extensions have been provided." } return } if (outputDirectoryPath.isRegularFile()) { - logger.error("Output directory must not be a file: $outputDirectoryPath") + logger.error { "Output directory must not be a file: $outputDirectoryPath" } return } @@ -60,7 +60,7 @@ fun processAllFiles(inputDirectoryPath: Path, withFilenameEndings: Set, .sorted() if (inputFilePaths.isEmpty()) { - logger.error("No files have been found with $withFilenameEndings as extension in input directory: $outputDirectoryPath") + logger.error { "No files have been found with $withFilenameEndings as extension in input directory: $outputDirectoryPath" } return } @@ -70,13 +70,13 @@ fun processAllFiles(inputDirectoryPath: Path, withFilenameEndings: Set, val inputFileRelativePath = inputDirectoryPath.relativize(currentPath) val projectOutputDirectoryPath = outputDirectoryPath.resolve(inputFileRelativePath) - logger.info("Starting project (${index + 1}/$totalNumber): $inputFileRelativePath") + logger.info { "Starting project (${index + 1}/$totalNumber): $inputFileRelativePath" } val timeElapsed = measureTime { val project = Project(currentPath, projectOutputDirectoryPath) project.apply(process) } - logger.info("Completed project after $timeElapsed." + System.lineSeparator()) + logger.info { "Completed project after $timeElapsed." + System.lineSeparator() } } } diff --git a/rtron-math/src/test/kotlin/io/rtron/math/analysis/FresnelTest.kt b/rtron-math/src/test/kotlin/io/rtron/math/analysis/FresnelTest.kt index 280bf412..f6fff552 100644 --- a/rtron-math/src/test/kotlin/io/rtron/math/analysis/FresnelTest.kt +++ b/rtron-math/src/test/kotlin/io/rtron/math/analysis/FresnelTest.kt @@ -16,11 +16,11 @@ package io.rtron.math.analysis +import io.github.oshai.kotlinlogging.KotlinLogging import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.doubles.plusOrMinus import io.kotest.matchers.shouldBe import io.rtron.math.std.DBL_EPSILON -import mu.KotlinLogging import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVRecord import java.io.FileReader diff --git a/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/Spiral2DTest.kt b/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/Spiral2DTest.kt index 08c1045e..76bdf387 100644 --- a/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/Spiral2DTest.kt +++ b/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/Spiral2DTest.kt @@ -16,6 +16,7 @@ package io.rtron.math.geometry.euclidean.twod.curve +import io.github.oshai.kotlinlogging.KotlinLogging import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.doubles.plusOrMinus import io.kotest.matchers.shouldBe @@ -26,7 +27,6 @@ import io.rtron.math.std.DBL_EPSILON_1 import io.rtron.math.std.DBL_EPSILON_2 import io.rtron.math.std.DBL_EPSILON_3 import io.rtron.math.std.PI -import mu.KotlinLogging import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVRecord import java.io.FileReader diff --git a/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/SpiralSegment2DTest.kt b/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/SpiralSegment2DTest.kt index 2cf00254..77d2bc9a 100644 --- a/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/SpiralSegment2DTest.kt +++ b/rtron-math/src/test/kotlin/io/rtron/math/geometry/euclidean/twod/curve/SpiralSegment2DTest.kt @@ -16,6 +16,7 @@ package io.rtron.math.geometry.euclidean.twod.curve +import io.github.oshai.kotlinlogging.KotlinLogging import io.kotest.assertions.arrow.core.shouldBeRight import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.doubles.plusOrMinus @@ -33,7 +34,6 @@ import io.rtron.math.std.DBL_EPSILON_6 import io.rtron.math.std.DBL_EPSILON_8 import io.rtron.math.transform.Affine2D import io.rtron.math.transform.AffineSequence2D -import mu.KotlinLogging import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVRecord import java.io.FileReader diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/citygml/CitygmlWriter.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/citygml/CitygmlWriter.kt index 54670dba..d1f0f575 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/citygml/CitygmlWriter.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/citygml/CitygmlWriter.kt @@ -16,10 +16,10 @@ package io.rtron.readerwriter.citygml +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.files.getFileSizeToDisplay import io.rtron.io.files.outputStreamDirectOrCompressed import io.rtron.model.citygml.CitygmlModel -import mu.KotlinLogging import org.citygml4j.xml.CityGMLContext import org.citygml4j.xml.module.citygml.CoreModule import java.io.OutputStream @@ -40,7 +40,7 @@ object CitygmlWriter { writeToStream(model, version, outputStream) outputStream.close() - logger.info("Completed writing of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()}).") + logger.info { "Completed writing of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()})." } } fun writeToStream(model: CitygmlModel, version: CitygmlVersion, outputStream: OutputStream) { diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveReader.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveReader.kt index 3c1bef22..24ce9d12 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveReader.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveReader.kt @@ -19,6 +19,7 @@ package io.rtron.readerwriter.opendrive import arrow.core.Either import arrow.core.left import arrow.core.raise.either +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.files.CompressedFileExtension import io.rtron.io.files.getFileSizeToDisplay import io.rtron.io.files.inputStreamFromDirectOrCompressedFile @@ -30,7 +31,6 @@ import io.rtron.readerwriter.opendrive.reader.mapper.opendrive16.Opendrive16Mapp import io.rtron.readerwriter.opendrive.version.OpendriveVersion import io.rtron.readerwriter.opendrive.version.OpendriveVersionUtils import io.rtron.std.BaseException -import mu.KotlinLogging import org.mapstruct.factory.Mappers import java.io.InputStream import java.nio.file.Path @@ -59,7 +59,7 @@ object OpendriveReader { fileInputStream.close() val opendriveModel = opendriveModelResult.bind() - logger.info("Completed read-in of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()}).") + logger.info { "Completed read-in of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()})." } opendriveModel } fun readFromStream(opendriveVersion: OpendriveVersion, inputStream: InputStream): Either = @@ -75,7 +75,7 @@ object OpendriveReader { OpendriveVersion.V1_7 -> OpendriveVersion.V1_6 } if (opendriveVersion != unmarshallerOpendriveVersion) { - logger.warn("No dedicated reader available for OpenDRIVE $opendriveVersion. Using reader for OpenDRIVE $unmarshallerOpendriveVersion as fallback.") + logger.warn { "No dedicated reader available for OpenDRIVE $opendriveVersion. Using reader for OpenDRIVE $unmarshallerOpendriveVersion as fallback." } } val unmarshaller = OpendriveUnmarshaller.of(unmarshallerOpendriveVersion).bind() diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveValidator.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveValidator.kt index 3a179f65..2d8702d7 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveValidator.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveValidator.kt @@ -20,6 +20,7 @@ import arrow.core.Either import arrow.core.getOrElse import arrow.core.left import arrow.core.raise.either +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.files.inputStreamFromDirectOrCompressedFile import io.rtron.io.issues.IssueList import io.rtron.readerwriter.opendrive.reader.OpendriveUnmarshaller @@ -27,7 +28,6 @@ import io.rtron.readerwriter.opendrive.report.SchemaValidationIssue import io.rtron.readerwriter.opendrive.report.SchemaValidationReport import io.rtron.readerwriter.opendrive.version.OpendriveVersion import io.rtron.readerwriter.opendrive.version.OpendriveVersionUtils -import mu.KotlinLogging import java.io.InputStream import java.nio.file.Path @@ -49,13 +49,17 @@ object OpendriveValidator { fun validateFromStream(opendriveVersion: OpendriveVersion, inputStream: InputStream): Either = either { val issueList = runValidation(opendriveVersion, inputStream) .getOrElse { - logger.warn("Schema validation was aborted due the following error: ${it.message}") - return@either SchemaValidationReport(opendriveVersion, completedSuccessfully = false, validationAbortIssue = it.message) + logger.warn { "Schema validation was aborted due the following error: ${it.message}" } + return@either SchemaValidationReport( + opendriveVersion, + completedSuccessfully = false, + validationAbortIssue = it.message + ) } if (!issueList.isEmpty()) { - logger.warn("Schema validation for OpenDRIVE $opendriveVersion found ${issueList.size} incidents.") + logger.warn { "Schema validation for OpenDRIVE $opendriveVersion found ${issueList.size} incidents." } } else { - logger.info("Schema validation report for OpenDRIVE $opendriveVersion: Everything ok.") + logger.info { "Schema validation report for OpenDRIVE $opendriveVersion: Everything ok." } } SchemaValidationReport(opendriveVersion, issueList) diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveWriter.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveWriter.kt index a6266f7f..e4d62032 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveWriter.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/OpendriveWriter.kt @@ -18,12 +18,12 @@ package io.rtron.readerwriter.opendrive import arrow.core.Either import arrow.core.raise.either +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.files.getFileSizeToDisplay import io.rtron.io.files.outputStreamDirectOrCompressed import io.rtron.model.opendrive.OpendriveModel import io.rtron.readerwriter.opendrive.writer.OpendriveMarshaller import io.rtron.std.BaseException -import mu.KotlinLogging import java.io.OutputStream import java.nio.file.Path @@ -39,7 +39,7 @@ object OpendriveWriter { writeToStream(model, outputStream) outputStream.close() - logger.info("Completed writing of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()}).") + logger.info { "Completed writing of file ${filePath.fileName} (around ${filePath.getFileSizeToDisplay()})." } } fun writeToStream(model: OpendriveModel, outputStream: OutputStream) { diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive14/Opendrive14RoadMapper.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive14/Opendrive14RoadMapper.kt index 784133fb..0307f405 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive14/Opendrive14RoadMapper.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive14/Opendrive14RoadMapper.kt @@ -19,6 +19,7 @@ package io.rtron.readerwriter.opendrive.reader.mapper.opendrive14 import arrow.core.None import arrow.core.Option import arrow.core.some +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.model.opendrive.junction.EContactPoint import io.rtron.model.opendrive.railroad.RoadRailroad import io.rtron.model.opendrive.road.ERoadLinkElementType @@ -34,7 +35,6 @@ import io.rtron.model.opendrive.road.planview.RoadPlanViewGeometryParamPoly3 import io.rtron.model.opendrive.road.planview.RoadPlanViewGeometryPoly3 import io.rtron.model.opendrive.road.planview.RoadPlanViewGeometrySpiral import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper -import mu.KotlinLogging import org.asam.opendrive14.ContactPoint import org.asam.opendrive14.ElementType import org.asam.opendrive14.OpenDRIVE @@ -82,7 +82,7 @@ abstract class Opendrive14RoadMapper { // TODO: reporting if (source.crossfall != null && source.crossfall.isNotEmpty()) { - logger.info("Since crossfall is not in the OpenDRIVE standard from version 1.6, it is not supported.") + logger.info { "Since crossfall is not in the OpenDRIVE standard from version 1.6, it is not supported." } } } diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16CoreMapper.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16CoreMapper.kt index 16694a71..41ef6eb2 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16CoreMapper.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16CoreMapper.kt @@ -19,13 +19,13 @@ package io.rtron.readerwriter.opendrive.reader.mapper.opendrive16 import arrow.core.None import arrow.core.Option import arrow.core.some +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.model.opendrive.core.AdditionalData import io.rtron.model.opendrive.core.EUnit import io.rtron.model.opendrive.core.EUnitSpeed import io.rtron.model.opendrive.core.HeaderGeoReference import io.rtron.model.opendrive.core.HeaderOffset import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper -import mu.KotlinLogging import org.asam.opendrive16.E_UnitDistance import org.asam.opendrive16.E_UnitMass import org.asam.opendrive16.E_UnitSlope diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16JunctionMapper.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16JunctionMapper.kt index 179429ee..e35d8c56 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16JunctionMapper.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16JunctionMapper.kt @@ -19,6 +19,7 @@ package io.rtron.readerwriter.opendrive.reader.mapper.opendrive16 import arrow.core.None import arrow.core.Option import arrow.core.some +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.model.opendrive.junction.EConnectionType import io.rtron.model.opendrive.junction.EContactPoint import io.rtron.model.opendrive.junction.EElementDir @@ -27,7 +28,6 @@ import io.rtron.model.opendrive.junction.JunctionPredecessorSuccessor import io.rtron.model.opendrive.junction.JunctionSurface import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper import io.rtron.readerwriter.opendrive.reader.mapper.common.toUpperCaseVariations -import mu.KotlinLogging import org.asam.opendrive16.E_Junction_Type import org.asam.opendrive16.T_Junction_PredecessorSuccessor import org.asam.opendrive16.T_Junction_Surface diff --git a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16Mapper.kt b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16Mapper.kt index 1941151f..e1342106 100644 --- a/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16Mapper.kt +++ b/rtron-readerwriter/src/main/kotlin/io/rtron/readerwriter/opendrive/reader/mapper/opendrive16/Opendrive16Mapper.kt @@ -16,9 +16,9 @@ package io.rtron.readerwriter.opendrive.reader.mapper.opendrive16 +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.model.opendrive.OpendriveModel import io.rtron.readerwriter.opendrive.reader.mapper.common.OpendriveCommonMapper -import mu.KotlinLogging import org.asam.opendrive16.OpenDRIVE import org.mapstruct.Mapper import org.mapstruct.NullValueCheckStrategy diff --git a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/Opendrive2RoadspacesTransformer.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/Opendrive2RoadspacesTransformer.kt index c496fee3..43781709 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/Opendrive2RoadspacesTransformer.kt +++ b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/opendrive2roadspaces/Opendrive2RoadspacesTransformer.kt @@ -18,6 +18,7 @@ package io.rtron.transformer.converter.opendrive2roadspaces import arrow.core.Option import arrow.core.some +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.issues.ContextIssueList import io.rtron.io.issues.mergeIssueLists import io.rtron.io.logging.ProgressBar @@ -34,7 +35,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking -import mu.KotlinLogging /** * Transformer from OpenDRIVE data model to the RoadSpaces data model. @@ -61,7 +61,7 @@ class Opendrive2RoadspacesTransformer( * @return transformed RoadSpaces model as output */ fun transform(opendriveModel: OpendriveModel): Pair, Opendrive2RoadspacesReport> { - logger.info("Parameters: $parameters.") + logger.info { "Parameters: $parameters." } opendriveModel.updateAdditionalIdentifiers() val report = Opendrive2RoadspacesReport(parameters) @@ -85,7 +85,7 @@ class Opendrive2RoadspacesTransformer( val roadspacesModel = RoadspacesModel(header, roadspaces, junctions) - logger.info("Completed transformation with ${report.getTextSummary()}.") + logger.info { "Completed transformation with ${report.getTextSummary()}." } return roadspacesModel.some() to report } diff --git a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/Roadspaces2CitygmlTransformer.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/Roadspaces2CitygmlTransformer.kt index b8e59aeb..43f2fce7 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/Roadspaces2CitygmlTransformer.kt +++ b/rtron-transformer/src/main/kotlin/io/rtron/transformer/converter/roadspaces2citygml/Roadspaces2CitygmlTransformer.kt @@ -20,6 +20,7 @@ import arrow.core.Option import arrow.core.flattenOption import arrow.core.getOrElse import arrow.core.toOption +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.issues.ContextIssueList import io.rtron.io.issues.DefaultIssueList import io.rtron.io.issues.mergeIssueLists @@ -40,7 +41,6 @@ import io.rtron.transformer.converter.roadspaces2citygml.transformer.deriveTraff import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking -import mu.KotlinLogging import org.citygml4j.core.model.core.AbstractCityObject import org.citygml4j.core.model.transportation.Road import org.citygml4j.core.model.transportation.TrafficSpaceProperty @@ -76,7 +76,7 @@ class Roadspaces2CitygmlTransformer( val report = Roadspaces2CitygmlReport(parameters) // transformation of each road space - logger.info("Parameters: $parameters.") + logger.info { "Parameters: $parameters." } val abstractCityObjects = if (parameters.concurrentProcessing) { transformRoadspacesConcurrently(roadspacesModel).handleIssueList { report.conversion += it } @@ -87,7 +87,7 @@ class Roadspaces2CitygmlTransformer( // create CityGML model val boundingShape = calculateBoundingShape(abstractCityObjects, roadspacesModel.header.coordinateReferenceSystem) - logger.info("Completed transformation with ${report.getTextSummary()}.") + logger.info { "Completed transformation with ${report.getTextSummary()}." } val citygmlModel = CitygmlModel(roadspacesModel.header.name, boundingShape, abstractCityObjects) return citygmlModel to report } diff --git a/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/opendrive/OpendriveEvaluator.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/opendrive/OpendriveEvaluator.kt index e3a79503..5c7c4f7a 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/opendrive/OpendriveEvaluator.kt +++ b/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/opendrive/OpendriveEvaluator.kt @@ -19,6 +19,7 @@ package io.rtron.transformer.evaluator.opendrive import arrow.core.None import arrow.core.Option import arrow.core.some +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.io.issues.containsFatalErrors import io.rtron.model.opendrive.OpendriveModel import io.rtron.model.opendrive.additions.extensions.updateAdditionalIdentifiers @@ -26,7 +27,6 @@ import io.rtron.transformer.evaluator.opendrive.plans.basicdatatype.BasicDataTyp import io.rtron.transformer.evaluator.opendrive.plans.conversionrequirements.ConversionRequirementsEvaluator import io.rtron.transformer.evaluator.opendrive.plans.modelingrules.ModelingRulesEvaluator import io.rtron.transformer.evaluator.opendrive.report.OpendriveEvaluationReport -import mu.KotlinLogging class OpendriveEvaluator( val parameters: OpendriveEvaluatorParameters @@ -41,7 +41,7 @@ class OpendriveEvaluator( // Methods fun evaluate(opendriveModel: OpendriveModel): Pair, OpendriveEvaluationReport> { - logger.info("Parameters: $parameters.") + logger.info { "Parameters: $parameters." } opendriveModel.updateAdditionalIdentifiers() var modifiedOpendriveModel = opendriveModel.copy() diff --git a/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/roadspaces/RoadspacesEvaluator.kt b/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/roadspaces/RoadspacesEvaluator.kt index cdcfc458..3485fac7 100644 --- a/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/roadspaces/RoadspacesEvaluator.kt +++ b/rtron-transformer/src/main/kotlin/io/rtron/transformer/evaluator/roadspaces/RoadspacesEvaluator.kt @@ -16,10 +16,10 @@ package io.rtron.transformer.evaluator.roadspaces +import io.github.oshai.kotlinlogging.KotlinLogging import io.rtron.model.roadspaces.RoadspacesModel import io.rtron.transformer.evaluator.roadspaces.plans.modelingrules.ModelingRulesEvaluator import io.rtron.transformer.evaluator.roadspaces.report.RoadspacesEvaluationReport -import mu.KotlinLogging class RoadspacesEvaluator( val parameters: RoadspacesEvaluatorParameters @@ -32,7 +32,7 @@ class RoadspacesEvaluator( // Methods fun evaluate(roadspacesModel: RoadspacesModel): Pair { - logger.info("Parameters: $parameters.") + logger.info { "Parameters: $parameters." } val report = RoadspacesEvaluationReport(parameters)