From 3e22d632fceb6a5690a03ae1c3e54888553ad165 Mon Sep 17 00:00:00 2001 From: oshai Date: Mon, 24 Jul 2023 10:04:07 +0300 Subject: [PATCH] upgrade to kotlin-logging 5 --- .../kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt | 2 +- .../kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt | 2 +- .../consumer/groovy/messaging/SynchronousMessageBuilder.kt | 2 +- .../au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt | 2 +- .../main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt | 2 +- .../main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt | 2 +- .../kotlin/au/com/dius/pact/consumer/PluginMockServer.kt | 2 +- .../kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt | 2 +- .../com/dius/pact/core/matchers/FormPostContentMatcher.kt | 2 +- .../kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt | 2 +- .../au/com/dius/pact/core/matchers/JsonContentMatcher.kt | 2 +- .../pact/core/matchers/KafkaJsonSchemaContentMatcher.kt | 2 +- .../au/com/dius/pact/core/matchers/MatcherExecutor.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/matchers/Matching.kt | 2 +- .../au/com/dius/pact/core/matchers/MetadataMatcher.kt | 2 +- .../pact/core/matchers/MultipartMessageContentMatcher.kt | 2 +- .../com/dius/pact/core/matchers/PlainTextContentMatcher.kt | 2 +- .../au/com/dius/pact/core/matchers/PluginContentMatcher.kt | 2 +- .../kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt | 2 +- .../au/com/dius/pact/core/matchers/RequestMatching.kt | 2 +- .../au/com/dius/pact/core/matchers/ResponseMatching.kt | 2 +- .../au/com/dius/pact/core/matchers/XmlContentMatcher.kt | 2 +- .../core/matchers/generators/ArrayContainsJsonGenerator.kt | 2 +- .../dius/pact/core/matchers/generators/ResponseGenerator.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/model/ContentType.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/model/PactMerge.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/model/PactReader.kt | 4 ++-- .../main/kotlin/au/com/dius/pact/core/model/PactWriter.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/model/Request.kt | 2 +- .../com/dius/pact/core/model/RequestResponseInteraction.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/model/Response.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt | 4 ++-- .../com/dius/pact/core/model/generators/DateExpression.kt | 2 +- .../dius/pact/core/model/generators/DateTimeExpression.kt | 2 +- .../au/com/dius/pact/core/model/generators/Generator.kt | 4 ++-- .../au/com/dius/pact/core/model/generators/Generators.kt | 2 +- .../com/dius/pact/core/model/generators/TimeExpression.kt | 2 +- .../pact/core/model/matchingrules/MatchingRuleCategory.kt | 2 +- .../com/dius/pact/core/model/matchingrules/MatchingRules.kt | 2 +- .../dius/pact/core/model/matchingrules/MatchingRulesImpl.kt | 2 +- .../matchingrules/expressions/MatchingRuleDefinition.kt | 2 +- .../kotlin/au/com/dius/pact/core/model/messaging/Message.kt | 2 +- .../au/com/dius/pact/core/model/messaging/MessagePact.kt | 2 +- .../au/com/dius/pact/core/model/v4/MessageContents.kt | 6 ++++-- core/pactbroker/build.gradle | 1 + .../kotlin/au/com/dius/pact/core/pactbroker/HalClient.kt | 2 +- .../au/com/dius/pact/core/pactbroker/PactBrokerClient.kt | 2 +- core/support/build.gradle | 1 + .../kotlin/au/com/dius/pact/core/support/Annotations.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/support/HttpClient.kt | 2 +- .../main/kotlin/au/com/dius/pact/core/support/Metrics.kt | 2 +- .../src/main/kotlin/au/com/dius/pact/core/support/Utils.kt | 2 +- provider/gradle/build.gradle | 1 + .../au/com/dius/pact/provider/gradle/GradleProviderInfo.kt | 2 +- .../dius/pact/provider/gradle/PactBrokerConsumerConfig.kt | 2 +- .../au/com/dius/pact/provider/junit/InteractionRunner.kt | 2 +- .../kotlin/au/com/dius/pact/provider/junit/PactRunner.kt | 2 +- .../au/com/dius/pact/provider/junit/RunStateChanges.kt | 2 +- .../au/com/dius/pact/provider/junit/target/MessageTarget.kt | 2 +- .../dius/pact/provider/junit/MultipleStatesContractTest.kt | 2 +- .../pact/provider/junit5/PactJUnit5VerificationProvider.kt | 2 +- .../dius/pact/provider/junit5/PactVerificationExtension.kt | 2 +- .../provider/junit5/PactVerificationStateChangeExtension.kt | 2 +- .../dius/pact/provider/junit5/MultipleStatesContractTest.kt | 2 +- .../dius/pact/provider/spring/junit5/MockMvcTestTarget.kt | 2 +- .../au/com/dius/pact/provider/spring/MvcProviderVerifier.kt | 2 +- .../provider/spring/spring6/Spring6MockMvcTestTarget.kt | 2 +- .../main/kotlin/au/com/dius/pact/provider/ProviderClient.kt | 2 +- .../main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt | 2 +- .../main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt | 2 +- .../kotlin/au/com/dius/pact/provider/ProviderVerifier.kt | 2 +- .../kotlin/au/com/dius/pact/provider/ResponseComparison.kt | 2 +- .../main/kotlin/au/com/dius/pact/provider/StateChange.kt | 2 +- .../au/com/dius/pact/provider/TestResultAccumulator.kt | 2 +- .../au/com/dius/pact/provider/VerificationReporter.kt | 2 +- .../pact/provider/junitsupport/JUnitProviderTestSupport.kt | 2 +- .../pact/provider/junitsupport/loader/PactBrokerLoader.kt | 2 +- 82 files changed, 88 insertions(+), 83 deletions(-) diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt index 501bd3eda2..ffd6bfbd95 100644 --- a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt +++ b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt @@ -19,7 +19,7 @@ import io.pact.plugins.jvm.core.CatalogueManager import io.pact.plugins.jvm.core.DefaultPluginManager import io.pact.plugins.jvm.core.PactPlugin import io.pact.plugins.jvm.core.PactPluginNotFoundException -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.util.regex.Pattern open class BaseBuilder( diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt index b9bd4e7df1..a1916fb9df 100644 --- a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt +++ b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt @@ -25,7 +25,7 @@ import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher import au.com.dius.pact.core.model.matchingrules.RegexMatcher import au.com.dius.pact.core.support.isNotEmpty import com.mifmif.common.regex.Generex -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.time.DateFormatUtils import org.apache.commons.lang3.time.DateUtils import java.text.ParseException diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt index 11ebc5fc88..55866f29aa 100644 --- a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt +++ b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.deepMerge import au.com.dius.pact.core.support.json.JsonValue import groovy.lang.Closure import io.pact.plugins.jvm.core.ContentMatcher -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging open class SynchronousMessageBuilder( private val description: String, diff --git a/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt b/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt index 7c1d62450e..6daea001af 100644 --- a/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt +++ b/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt @@ -30,7 +30,7 @@ import au.com.dius.pact.core.support.Metrics import au.com.dius.pact.core.support.expressions.DataType import au.com.dius.pact.core.support.expressions.ExpressionParser import au.com.dius.pact.core.support.isNotEmpty -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Nested import org.junit.jupiter.api.extension.AfterAllCallback diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt index f7118c8524..01bad67cd8 100644 --- a/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt +++ b/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt @@ -34,7 +34,7 @@ import io.ktor.util.network.port import io.netty.channel.Channel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.net.SocketAddress import java.util.zip.DeflaterInputStream import java.util.zip.GZIPInputStream diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt index b16b17fd20..4d398226dc 100755 --- a/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt +++ b/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt @@ -29,7 +29,7 @@ import io.ktor.util.network.hostname import io.pact.plugins.jvm.core.CatalogueEntry import io.pact.plugins.jvm.core.CatalogueEntryProviderType import io.pact.plugins.jvm.core.CatalogueEntryType -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.text.StringEscapeUtils import org.apache.hc.client5.http.classic.methods.HttpOptions import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt index 488dd564a7..7e14e5175d 100644 --- a/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt +++ b/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt @@ -14,7 +14,7 @@ import io.pact.plugins.jvm.core.DefaultPluginManager import io.pact.plugins.jvm.core.MockServerDetails import io.pact.plugins.jvm.core.MockServerResults import io.pact.plugins.jvm.core.PluginManager -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging /** * Mock server provided by a plugin diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt index 155dd91bfa..6bec8f7801 100644 --- a/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt +++ b/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt @@ -38,7 +38,7 @@ import io.pact.plugins.jvm.core.DefaultPluginManager import io.pact.plugins.jvm.core.PactPlugin import io.pact.plugins.jvm.core.PactPluginEntryNotFoundException import io.pact.plugins.jvm.core.PactPluginNotFoundException -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.nio.file.Path import java.nio.file.Paths import kotlin.io.path.exists diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt index 2b95171521..6c418d3a5b 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt @@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.padTo import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.core5.http.NameValuePair import org.apache.hc.core5.net.WWWFormCodec diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt index f307a03c11..1d53a54e76 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt @@ -1,6 +1,6 @@ package au.com.dius.pact.core.matchers -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging object HeaderMatcher : KLogging() { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt index 1fd926a2a3..db87b63165 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.JsonValue import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging object JsonContentMatcher : ContentMatcher, KLogging() { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt index c678b77e24..47610b32cd 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt @@ -8,7 +8,7 @@ import au.com.dius.pact.core.support.json.JsonException import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.KafkaSchemaRegistryWireFormatter import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging class KafkaJsonSchemaContentMatcher : ContentMatcher { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt index 4b2f517f74..3109dee1e2 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt @@ -36,7 +36,7 @@ import com.github.zafarkhaja.semver.Version import io.pact.plugins.jvm.core.CatalogueEntry import io.pact.plugins.jvm.core.CatalogueEntryProviderType import io.pact.plugins.jvm.core.CatalogueEntryType -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.time.DateUtils import org.apache.tika.config.TikaConfig import org.apache.tika.io.TikaInputStream diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt index b486318cea..895bb2d53e 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt @@ -20,7 +20,7 @@ import au.com.dius.pact.core.model.matchingrules.MinMaxEqualsIgnoreOrderMatcher import au.com.dius.pact.core.model.matchingrules.ValuesMatcher import au.com.dius.pact.core.model.parsePath import au.com.dius.pact.core.support.Either -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.math.BigInteger import java.util.Comparator diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt index d9ecf0745a..a6dbac00c4 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt @@ -19,7 +19,7 @@ import au.com.dius.pact.core.model.matchingrules.ValuesMatcher import au.com.dius.pact.core.model.parsePath import au.com.dius.pact.core.support.padTo import io.pact.plugins.jvm.core.PluginConfiguration -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.codec.binary.Hex data class MatchingContext @JvmOverloads constructor( diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt index 1cd6f4639a..7665f13262 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt @@ -1,6 +1,6 @@ package au.com.dius.pact.core.matchers -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging object MetadataMatcher : KLogging() { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt index 1327fbb981..a1442671ee 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt @@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.IHttpPart import au.com.dius.pact.core.model.OptionalBody import au.com.dius.pact.core.support.Result import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.util.Enumeration import javax.mail.BodyPart import javax.mail.Header diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt index 9e52e74a20..80263a2b39 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt @@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody import au.com.dius.pact.core.model.matchingrules.RegexMatcher import au.com.dius.pact.core.support.Result import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging class PlainTextContentMatcher : ContentMatcher { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt index cf43c2ce3e..d2ad77253f 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt @@ -4,7 +4,7 @@ import au.com.dius.pact.core.model.ContentType import au.com.dius.pact.core.model.OptionalBody import au.com.dius.pact.core.support.Result import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging /** * Content matcher that delegates to a plugin diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt index 25e7cc55fe..569ac4f847 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt @@ -1,7 +1,7 @@ package au.com.dius.pact.core.matchers import au.com.dius.pact.core.support.padTo -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.atteo.evo.inflector.English object QueryMatcher : KLogging() { diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt index 4cd15f510e..7cdb50a0bf 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.model.V4Pact import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonValue import io.pact.plugins.jvm.core.PluginConfiguration -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging sealed class RequestMatch { private val score: Int diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt index 78b1a91c13..659eccd3fe 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt @@ -2,7 +2,7 @@ package au.com.dius.pact.core.matchers import au.com.dius.pact.core.model.IResponse import io.pact.plugins.jvm.core.PluginConfiguration -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging sealed class ResponseMatch object FullResponseMatch : ResponseMatch() diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt index 46ab91cb2a..5a3d432f24 100755 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt @@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.zipAll import io.pact.plugins.jvm.core.InteractionContents -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.xerces.dom.TextImpl import org.w3c.dom.NamedNodeMap import org.w3c.dom.Node diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt index 85341a0590..46d03ddde7 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt @@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.generators.JsonContentTypeHandler import au.com.dius.pact.core.model.generators.JsonQueryResult import au.com.dius.pact.core.model.matchingrules.MatchingRuleCategory import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging object ArrayContainsJsonGenerator : KLogging(), Generator { override val type: String diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt index 48e5835c62..287c5b074e 100644 --- a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt +++ b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt @@ -9,7 +9,7 @@ import au.com.dius.pact.core.model.v4.MessageContents import au.com.dius.pact.core.support.Json.toJson import au.com.dius.pact.core.support.json.JsonValue import io.pact.plugins.jvm.core.CatalogueManager -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging interface ResponseGenerator { /** diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt index 1548450969..d391b9703c 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt @@ -4,7 +4,7 @@ import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.Utils import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.io.File import java.util.Collections import kotlin.reflect.full.declaredFunctions diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt index fdef9e8682..c635918541 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt @@ -1,7 +1,7 @@ package au.com.dius.pact.core.model import au.com.dius.pact.core.support.isNotEmpty -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.tika.mime.MediaType import org.apache.tika.mime.MediaTypeRegistry import org.apache.tika.mime.MimeTypes diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt index ffcc3fc90d..580f2b75ab 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt @@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.generators.Generators import au.com.dius.pact.core.model.matchingrules.MatchingRules import au.com.dius.pact.core.support.isNotEmpty import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.nio.charset.Charset import java.util.Base64 diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt index 6d63a8c817..c871362e7f 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt @@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.ContentType.Companion.UNKNOWN import au.com.dius.pact.core.model.ContentType.Companion.XMLREGEXP import au.com.dius.pact.core.model.ContentType.Companion.XMLREGEXP2 import au.com.dius.pact.core.support.json.JsonParser -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.codec.binary.Hex import org.apache.tika.config.TikaConfig import org.apache.tika.io.TikaInputStream diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt index a1dc5fd657..b5b97cf043 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt @@ -1,7 +1,7 @@ package au.com.dius.pact.core.model import au.com.dius.pact.core.support.Result -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging data class MergeResult(val ok: Boolean, val message: String, val result: Pact? = null) diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt index 679b14a267..88c6e45c01 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt @@ -20,8 +20,8 @@ import au.com.dius.pact.core.support.json.map import au.com.dius.pact.core.support.jsonArray import au.com.dius.pact.core.support.jsonObject import au.com.dius.pact.core.support.unwrap -import mu.KLogging -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.hc.client5.http.auth.AuthScope import org.apache.hc.client5.http.auth.UsernamePasswordCredentials import org.apache.hc.client5.http.classic.methods.HttpGet diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt index 5fc073db2d..97f644acf7 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt @@ -4,7 +4,7 @@ import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintWriter diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt index 6db784ee5a..b7440c9fd2 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt @@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging /** * Request made by a consumer to a provider diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt index e577957236..d721675223 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt @@ -2,7 +2,7 @@ package au.com.dius.pact.core.model import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonParser -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.net.URLEncoder /** diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt index 5bdd5e7ef8..c7b00d89dc 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt @@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.generators.Generators import au.com.dius.pact.core.model.matchingrules.MatchingRules import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging /** * Response from a provider to a consumer diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt index ab1ab57fa9..82f59df676 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt @@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.beanutils.BeanUtils private fun headersFromJson(json: JsonValue): Map> { diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt index 48612cab15..53f8a06c69 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt @@ -14,8 +14,8 @@ import au.com.dius.pact.core.support.isNotEmpty import au.com.dius.pact.core.support.json.JsonValue import au.com.dius.pact.core.support.json.map import au.com.dius.pact.core.support.jsonObject -import mu.KLogging -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.builder.HashCodeBuilder import java.util.Base64 diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt index f2b837517e..1d05cc7235 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt @@ -7,7 +7,7 @@ import au.com.dius.pact.core.support.generators.expressions.DateExpressionLexer import au.com.dius.pact.core.support.generators.expressions.DateExpressionParser import au.com.dius.pact.core.support.generators.expressions.DateOffsetType import au.com.dius.pact.core.support.generators.expressions.Operation -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.time.DayOfWeek import java.time.Month import java.time.OffsetDateTime diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt index 1c18fb7b40..660da5f8ce 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt @@ -2,7 +2,7 @@ package au.com.dius.pact.core.model.generators import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.mapError -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.lang.Integer.parseInt import java.time.OffsetDateTime diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt index c8c3fefb68..5acdd0d175 100755 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt @@ -12,8 +12,8 @@ import au.com.dius.pact.core.support.getOr import au.com.dius.pact.core.support.isNotEmpty import au.com.dius.pact.core.support.json.JsonValue import com.mifmif.common.regex.Generex -import mu.KLogging -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.RandomStringUtils import org.apache.commons.lang3.RandomUtils import java.math.BigDecimal diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt index f72514871d..50b1b259b6 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.JsonValue import au.com.dius.pact.core.support.json.orNull -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.util.Locale enum class Category { diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt index aac60b3da1..6fae6c0c3b 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt @@ -7,7 +7,7 @@ import au.com.dius.pact.core.support.generators.expressions.TimeBase import au.com.dius.pact.core.support.generators.expressions.TimeExpressionLexer import au.com.dius.pact.core.support.generators.expressions.TimeExpressionParser import au.com.dius.pact.core.support.generators.expressions.TimeOffsetType -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.time.LocalTime import java.time.OffsetDateTime import java.time.ZoneOffset diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt index 00733793aa..7eb9035159 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt @@ -3,7 +3,7 @@ package au.com.dius.pact.core.model.matchingrules import au.com.dius.pact.core.model.PactSpecVersion import au.com.dius.pact.core.model.generators.Generator import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.util.Comparator import java.util.function.Predicate diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt index 814c7fb817..4815473759 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt @@ -12,7 +12,7 @@ import au.com.dius.pact.core.support.Either import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonValue import au.com.dius.pact.core.support.json.map -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.lang.RuntimeException /** diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRulesImpl.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRulesImpl.kt index 50f73b6226..b523fb2934 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRulesImpl.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRulesImpl.kt @@ -3,7 +3,7 @@ package au.com.dius.pact.core.model.matchingrules import au.com.dius.pact.core.model.PactSpecVersion import au.com.dius.pact.core.support.Json import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging class MatchingRulesImpl : MatchingRules { diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/expressions/MatchingRuleDefinition.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/expressions/MatchingRuleDefinition.kt index d66208a2f5..13940da8fd 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/expressions/MatchingRuleDefinition.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/expressions/MatchingRuleDefinition.kt @@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRule import au.com.dius.pact.core.support.Either import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.isNotEmpty -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging data class MatchingReference( val name: String diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/Message.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/Message.kt index 226afc3386..f6af071f43 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/Message.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/Message.kt @@ -16,7 +16,7 @@ import au.com.dius.pact.core.support.json.JsonException import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.JsonValue import au.com.dius.pact.core.support.json.KafkaSchemaRegistryWireFormatter -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.codec.binary.Base64 import org.apache.commons.lang3.StringUtils diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/MessagePact.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/MessagePact.kt index 18e0b876d3..39571ff748 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/MessagePact.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/messaging/MessagePact.kt @@ -18,7 +18,7 @@ import au.com.dius.pact.core.support.Utils.extractFromMap import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.json.JsonValue import au.com.dius.pact.core.support.jsonObject -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.io.File /** diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/v4/MessageContents.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/v4/MessageContents.kt index 590aa320be..bb2fda3f99 100644 --- a/core/model/src/main/kotlin/au/com/dius/pact/core/model/v4/MessageContents.kt +++ b/core/model/src/main/kotlin/au/com/dius/pact/core/model/v4/MessageContents.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl import au.com.dius.pact.core.model.messaging.Message import au.com.dius.pact.core.support.json.JsonValue -import mu.KLogging +import io.github.oshai.kotlinlogging.KotlinLogging /** * Contents of a message interaction @@ -53,7 +53,9 @@ data class MessageContents @JvmOverloads constructor( return generators + matchingRuleGenerators } - companion object : KLogging() { + companion object { + + private val logger = KotlinLogging.logger {} fun fromJson(json: JsonValue): MessageContents { val metadata = if (json.has("metadata")) { val jsonValue = json["metadata"] diff --git a/core/pactbroker/build.gradle b/core/pactbroker/build.gradle index 365ec45ed1..e8fb1d3db4 100644 --- a/core/pactbroker/build.gradle +++ b/core/pactbroker/build.gradle @@ -8,6 +8,7 @@ group = 'au.com.dius.pact.core' dependencies { api project(':core:support') api 'io.github.microutils:kotlin-logging-jvm:2.1.23' + api 'io.github.oshai:kotlin-logging-jvm:5.0.0' api 'org.apache.httpcomponents.client5:httpclient5' implementation 'org.apache.commons:commons-lang3' diff --git a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/HalClient.kt b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/HalClient.kt index 1ffaff2eac..38109e3dae 100644 --- a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/HalClient.kt +++ b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/HalClient.kt @@ -15,7 +15,7 @@ import au.com.dius.pact.core.support.json.get import au.com.dius.pact.core.support.jsonObject import au.com.dius.pact.core.support.unwrap import com.google.common.net.UrlEscapers -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.client5.http.classic.methods.HttpGet import org.apache.hc.client5.http.classic.methods.HttpPost import org.apache.hc.client5.http.classic.methods.HttpPut diff --git a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt index 4768742e60..5a49d5114f 100644 --- a/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt +++ b/core/pactbroker/src/main/kotlin/au/com/dius/pact/core/pactbroker/PactBrokerClient.kt @@ -16,7 +16,7 @@ import au.com.dius.pact.core.support.mapOk import au.com.dius.pact.core.support.mapError import au.com.dius.pact.core.support.toJson import com.google.common.net.UrlEscapers.urlFormParameterEscaper -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.io.File import java.io.IOException import java.net.URLDecoder diff --git a/core/support/build.gradle b/core/support/build.gradle index 879d18b16f..4757854ef8 100644 --- a/core/support/build.gradle +++ b/core/support/build.gradle @@ -7,6 +7,7 @@ group = 'au.com.dius.pact.core' dependencies { api 'io.github.microutils:kotlin-logging-jvm:2.1.23' + api 'io.github.oshai:kotlin-logging-jvm:5.0.0' api 'org.apache.httpcomponents.client5:httpclient5' api 'org.apache.httpcomponents.client5:httpclient5-fluent' diff --git a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Annotations.kt b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Annotations.kt index 6a9a70bb41..e13dcfd098 100644 --- a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Annotations.kt +++ b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Annotations.kt @@ -1,6 +1,6 @@ package au.com.dius.pact.core.support -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import kotlin.reflect.KClass import kotlin.reflect.full.superclasses diff --git a/core/support/src/main/kotlin/au/com/dius/pact/core/support/HttpClient.kt b/core/support/src/main/kotlin/au/com/dius/pact/core/support/HttpClient.kt index 820157d6ca..d819fbe1e0 100644 --- a/core/support/src/main/kotlin/au/com/dius/pact/core/support/HttpClient.kt +++ b/core/support/src/main/kotlin/au/com/dius/pact/core/support/HttpClient.kt @@ -4,7 +4,7 @@ import au.com.dius.pact.core.support.Auth.Companion.DEFAULT_AUTH_HEADER import au.com.dius.pact.core.support.expressions.DataType import au.com.dius.pact.core.support.expressions.ExpressionParser import au.com.dius.pact.core.support.expressions.ValueResolver -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.client5.http.auth.AuthScope import org.apache.hc.client5.http.auth.CredentialsProvider import org.apache.hc.client5.http.auth.UsernamePasswordCredentials diff --git a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Metrics.kt b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Metrics.kt index aa673cdadb..f0bc04fc7a 100644 --- a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Metrics.kt +++ b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Metrics.kt @@ -1,7 +1,7 @@ package au.com.dius.pact.core.support import au.com.dius.pact.core.support.Utils.lookupVersion -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.codec.digest.DigestUtils import java.util.concurrent.TimeUnit import org.apache.hc.client5.http.fluent.Request diff --git a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Utils.kt b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Utils.kt index ef0d28773b..8de8f232bb 100644 --- a/core/support/src/main/kotlin/au/com/dius/pact/core/support/Utils.kt +++ b/core/support/src/main/kotlin/au/com/dius/pact/core/support/Utils.kt @@ -1,6 +1,6 @@ package au.com.dius.pact.core.support -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.RandomUtils import java.io.IOException import java.net.ServerSocket diff --git a/provider/gradle/build.gradle b/provider/gradle/build.gradle index 93e1649af7..edc42b8601 100644 --- a/provider/gradle/build.gradle +++ b/provider/gradle/build.gradle @@ -16,6 +16,7 @@ dependencies { implementation 'commons-io:commons-io:2.11.0' implementation 'org.apache.commons:commons-lang3' implementation 'io.github.microutils:kotlin-logging-jvm:2.1.23' + implementation 'io.github.oshai:kotlin-logging-jvm:5.0.0' testImplementation 'junit:junit' testImplementation 'org.mockito:mockito-core:2.28.2' diff --git a/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/GradleProviderInfo.kt b/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/GradleProviderInfo.kt index 5841898864..ad8e20e163 100644 --- a/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/GradleProviderInfo.kt +++ b/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/GradleProviderInfo.kt @@ -12,7 +12,7 @@ import au.com.dius.pact.provider.gradle.PactPluginBase.Companion.PACT_VERIFY import groovy.lang.Closure import io.pact.plugins.jvm.core.CatalogueEntry import io.pact.plugins.jvm.core.CatalogueManager -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.gradle.api.GradleScriptException import org.gradle.api.Project import org.gradle.api.model.ObjectFactory diff --git a/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/PactBrokerConsumerConfig.kt b/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/PactBrokerConsumerConfig.kt index e266f9e5b6..d91482259e 100644 --- a/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/PactBrokerConsumerConfig.kt +++ b/provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/PactBrokerConsumerConfig.kt @@ -2,7 +2,7 @@ package au.com.dius.pact.provider.gradle import au.com.dius.pact.core.pactbroker.ConsumerVersionSelectors import au.com.dius.pact.provider.junitsupport.loader.SelectorBuilder -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.gradle.api.Action import org.gradle.api.model.ObjectFactory import javax.inject.Inject diff --git a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt index 110d1c067b..dceea63641 100644 --- a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt +++ b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/InteractionRunner.kt @@ -27,7 +27,7 @@ import au.com.dius.pact.provider.junitsupport.State import au.com.dius.pact.provider.junitsupport.TargetRequestFilter import au.com.dius.pact.provider.junitsupport.target.Target import au.com.dius.pact.provider.junitsupport.target.TestTarget -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.After import org.junit.Before import org.junit.Rule diff --git a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/PactRunner.kt b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/PactRunner.kt index 7bffcea5a4..5322fe4c88 100644 --- a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/PactRunner.kt +++ b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/PactRunner.kt @@ -24,7 +24,7 @@ import au.com.dius.pact.provider.junitsupport.loader.PactLoader import au.com.dius.pact.provider.junitsupport.loader.PactSource import au.com.dius.pact.provider.junitsupport.target.Target import au.com.dius.pact.provider.junitsupport.target.TestTarget -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.Ignore import org.junit.runner.notification.RunNotifier import org.junit.runners.ParentRunner diff --git a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/RunStateChanges.kt b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/RunStateChanges.kt index c20311e891..2af949214d 100644 --- a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/RunStateChanges.kt +++ b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/RunStateChanges.kt @@ -4,7 +4,7 @@ import au.com.dius.pact.core.model.ProviderState import au.com.dius.pact.provider.IProviderVerifier import au.com.dius.pact.provider.junitsupport.State import au.com.dius.pact.provider.junitsupport.StateChangeAction -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.runners.model.FrameworkMethod import org.junit.runners.model.Statement import java.util.function.Supplier diff --git a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/target/MessageTarget.kt b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/target/MessageTarget.kt index 7ce62613b3..34cfebe59f 100644 --- a/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/target/MessageTarget.kt +++ b/provider/junit/src/main/kotlin/au/com/dius/pact/provider/junit/target/MessageTarget.kt @@ -15,7 +15,7 @@ import au.com.dius.pact.provider.ProviderVerifier import au.com.dius.pact.provider.VerificationResult import au.com.dius.pact.provider.junit.descriptions.DescriptionGenerator import au.com.dius.pact.provider.junitsupport.Provider -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.net.URLClassLoader import java.util.function.Function import java.util.function.Supplier diff --git a/provider/junit/src/test/kotlin/au/com/dius/pact/provider/junit/MultipleStatesContractTest.kt b/provider/junit/src/test/kotlin/au/com/dius/pact/provider/junit/MultipleStatesContractTest.kt index be2526c3a9..9125034317 100644 --- a/provider/junit/src/test/kotlin/au/com/dius/pact/provider/junit/MultipleStatesContractTest.kt +++ b/provider/junit/src/test/kotlin/au/com/dius/pact/provider/junit/MultipleStatesContractTest.kt @@ -9,7 +9,7 @@ import au.com.dius.pact.provider.junitsupport.StateChangeAction import com.github.restdriver.clientdriver.ClientDriverRule import com.github.restdriver.clientdriver.RestClientDriver.giveEmptyResponse import com.github.restdriver.clientdriver.RestClientDriver.onRequestTo -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.`is` import org.hamcrest.Matchers.equalTo diff --git a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt index 2b1ddd05bc..fb351f386c 100644 --- a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt +++ b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactJUnit5VerificationProvider.kt @@ -21,7 +21,7 @@ import au.com.dius.pact.provider.junitsupport.Provider import au.com.dius.pact.provider.junitsupport.State import au.com.dius.pact.provider.junitsupport.loader.NoPactsFoundException import au.com.dius.pact.provider.junitsupport.loader.PactLoader -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.extension.TestTemplateInvocationContext import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider diff --git a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationExtension.kt b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationExtension.kt index ab38bee52d..b055853f42 100644 --- a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationExtension.kt +++ b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationExtension.kt @@ -20,7 +20,7 @@ import au.com.dius.pact.provider.TestResultAccumulator import au.com.dius.pact.provider.junitsupport.VerificationReports import au.com.dius.pact.provider.reporters.ReporterManager import io.pact.plugins.jvm.core.InteractionVerificationData -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.core5.http.ClassicHttpRequest import org.apache.hc.core5.http.HttpRequest import org.junit.jupiter.api.extension.AfterTestExecutionCallback diff --git a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationStateChangeExtension.kt b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationStateChangeExtension.kt index a5fca59748..0a7e923782 100644 --- a/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationStateChangeExtension.kt +++ b/provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PactVerificationStateChangeExtension.kt @@ -13,7 +13,7 @@ import au.com.dius.pact.provider.junitsupport.IgnoreMissingStateChange import au.com.dius.pact.provider.junitsupport.MissingStateChangeMethod import au.com.dius.pact.provider.junitsupport.State import au.com.dius.pact.provider.junitsupport.StateChangeAction -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.junit.jupiter.api.extension.AfterTestExecutionCallback import org.junit.jupiter.api.extension.BeforeTestExecutionCallback import org.junit.jupiter.api.extension.ExtensionContext diff --git a/provider/junit5/src/test/kotlin/au/com/dius/pact/provider/junit5/MultipleStatesContractTest.kt b/provider/junit5/src/test/kotlin/au/com/dius/pact/provider/junit5/MultipleStatesContractTest.kt index dcb3c3b1fe..7532a8b532 100644 --- a/provider/junit5/src/test/kotlin/au/com/dius/pact/provider/junit5/MultipleStatesContractTest.kt +++ b/provider/junit5/src/test/kotlin/au/com/dius/pact/provider/junit5/MultipleStatesContractTest.kt @@ -10,7 +10,7 @@ import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.WireMock.aResponse import com.github.tomakehurst.wiremock.client.WireMock.get import com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.hamcrest.CoreMatchers.`is` import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat diff --git a/provider/junit5spring/src/main/kotlin/au/com/dius/pact/provider/spring/junit5/MockMvcTestTarget.kt b/provider/junit5spring/src/main/kotlin/au/com/dius/pact/provider/spring/junit5/MockMvcTestTarget.kt index 1eb3718fea..5f07d3fb8a 100644 --- a/provider/junit5spring/src/main/kotlin/au/com/dius/pact/provider/spring/junit5/MockMvcTestTarget.kt +++ b/provider/junit5spring/src/main/kotlin/au/com/dius/pact/provider/spring/junit5/MockMvcTestTarget.kt @@ -12,7 +12,7 @@ import au.com.dius.pact.provider.IProviderVerifier import au.com.dius.pact.provider.ProviderInfo import au.com.dius.pact.provider.ProviderResponse import au.com.dius.pact.provider.junit5.TestTarget -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.StringUtils import org.hamcrest.core.IsAnything import org.springframework.http.HttpHeaders diff --git a/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt b/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt index ddb8f3caec..189860cbe8 100644 --- a/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt +++ b/provider/spring/src/main/kotlin/au/com/dius/pact/provider/spring/MvcProviderVerifier.kt @@ -13,7 +13,7 @@ import au.com.dius.pact.provider.VerificationResult import groovy.lang.Binding import groovy.lang.Closure import groovy.lang.GroovyShell -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.StringUtils import org.hamcrest.Matchers.anything import org.springframework.http.HttpHeaders diff --git a/provider/spring6/src/main/kotlin/au/com/dius/pact/provider/spring/spring6/Spring6MockMvcTestTarget.kt b/provider/spring6/src/main/kotlin/au/com/dius/pact/provider/spring/spring6/Spring6MockMvcTestTarget.kt index 054f6871a0..ac32ef4d3b 100644 --- a/provider/spring6/src/main/kotlin/au/com/dius/pact/provider/spring/spring6/Spring6MockMvcTestTarget.kt +++ b/provider/spring6/src/main/kotlin/au/com/dius/pact/provider/spring/spring6/Spring6MockMvcTestTarget.kt @@ -13,7 +13,7 @@ import au.com.dius.pact.provider.ProviderInfo import au.com.dius.pact.provider.ProviderResponse import au.com.dius.pact.provider.junit5.TestTarget import jakarta.servlet.http.Cookie -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.StringUtils import org.hamcrest.core.IsAnything import org.springframework.http.HttpHeaders diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt index 022aad5f15..b12759091c 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt @@ -17,7 +17,7 @@ import groovy.lang.Binding import groovy.lang.Closure import groovy.lang.GroovyShell import io.pact.plugins.jvm.core.CatalogueEntry -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.client5.http.classic.methods.HttpDelete import org.apache.hc.client5.http.classic.methods.HttpGet import org.apache.hc.client5.http.classic.methods.HttpHead diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt index a35cd2edb9..91d1a44f86 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt @@ -11,7 +11,7 @@ import au.com.dius.pact.core.support.Utils import au.com.dius.pact.core.support.mapOk import io.pact.plugins.jvm.core.CatalogueEntry import io.pact.plugins.jvm.core.CatalogueManager -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.builder.HashCodeBuilder import org.apache.commons.lang3.builder.ToStringBuilder import java.io.File diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt index 79c60f03c1..d111249cb2 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt @@ -8,7 +8,7 @@ import au.com.dius.pact.core.support.Json import au.com.dius.pact.provider.junitsupport.loader.PactLoader import au.com.dius.pact.provider.junitsupport.loader.PactSource import io.pact.plugins.jvm.core.PluginConfiguration -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.io.FilenameUtils import java.io.File import kotlin.reflect.KClass diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt index 852e785bd1..e4a8ea86fb 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt @@ -53,7 +53,7 @@ import io.pact.plugins.jvm.core.DefaultPluginManager import io.pact.plugins.jvm.core.InteractionVerificationDetails import io.pact.plugins.jvm.core.PluginConfiguration import io.pact.plugins.jvm.core.PluginManager -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.io.File import java.lang.reflect.Method import java.net.URL diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt index 23fdefb075..caf21e0166 100755 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt @@ -30,7 +30,7 @@ import au.com.dius.pact.core.support.expressions.ValueResolver import au.com.dius.pact.core.support.isNotEmpty import au.com.dius.pact.core.support.jsonObject import io.pact.plugins.jvm.core.PluginConfiguration -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import java.lang.Integer.max data class BodyComparisonResult( diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt index 50b1c65c31..aa0cda31db 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt @@ -7,7 +7,7 @@ import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.json.JsonParser import au.com.dius.pact.core.support.mapEither import groovy.lang.Closure -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.core5.http.ContentType import org.apache.hc.core5.http.HttpEntity import org.apache.hc.core5.http.io.entity.EntityUtils diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/TestResultAccumulator.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/TestResultAccumulator.kt index 4200a4bff5..7ac47aa626 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/TestResultAccumulator.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/TestResultAccumulator.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.expressions.SystemPropertyResolver import au.com.dius.pact.core.support.expressions.ValueResolver import au.com.dius.pact.core.support.isNotEmpty import au.com.dius.pact.provider.ProviderVerifier.Companion.PACT_VERIFIER_PUBLISH_RESULTS -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.builder.HashCodeBuilder /** diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationReporter.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationReporter.kt index 49fca01d4a..bf2aaf2603 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationReporter.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/VerificationReporter.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.Result import au.com.dius.pact.core.support.expressions.SystemPropertyResolver import au.com.dius.pact.core.support.expressions.ValueResolver import au.com.dius.pact.core.support.mapError -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging /** * Interface to the reporter that published the verification results diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/JUnitProviderTestSupport.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/JUnitProviderTestSupport.kt index 4c404ccf72..51809d3089 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/JUnitProviderTestSupport.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/JUnitProviderTestSupport.kt @@ -10,7 +10,7 @@ import au.com.dius.pact.provider.junitsupport.filter.InteractionFilter import au.com.dius.pact.provider.junitsupport.loader.OverrideablePactLoader import au.com.dius.pact.provider.junitsupport.loader.PactFilter import au.com.dius.pact.provider.junitsupport.loader.PactLoader -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.commons.lang3.StringUtils import org.apache.commons.lang3.exception.ExceptionUtils import kotlin.reflect.full.createInstance diff --git a/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoader.kt b/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoader.kt index a5c57833cd..16d02ab4bc 100644 --- a/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoader.kt +++ b/provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoader.kt @@ -19,7 +19,7 @@ import au.com.dius.pact.core.support.expressions.ExpressionParser import au.com.dius.pact.core.support.expressions.SystemPropertyResolver import au.com.dius.pact.core.support.expressions.ValueResolver import au.com.dius.pact.core.support.isNotEmpty -import mu.KLogging +import io.github.oshai.kotlinlogging.KLogging import org.apache.hc.core5.net.URIBuilder import java.io.IOException import java.lang.reflect.Method