From cde3f33316b6977e2d4b2edeb877ab022ea2c066 Mon Sep 17 00:00:00 2001 From: oshai Date: Fri, 16 Jun 2023 11:25:58 +0300 Subject: [PATCH] upgrade kotlin-logging and slf4j, logback --- db-async-common/build.gradle.kts | 2 +- .../src/main/java/com/github/jasync/sql/db/Configuration.kt | 2 +- .../com/github/jasync/sql/db/interceptor/Interceptors.kt | 2 +- .../java/com/github/jasync/sql/db/pool/ConnectionFactory.kt | 2 +- .../java/com/github/jasync/sql/db/pool/ConnectionPool.kt | 2 +- .../java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt | 2 +- .../java/com/github/jasync/sql/db/util/AbstractURIParser.kt | 2 +- .../main/java/com/github/jasync/sql/db/util/NettyUtils.kt | 2 +- .../main/java/com/github/jasync/sql/db/util/PrintUtils.kt | 2 +- gradle.properties | 6 +++--- mysql-async/build.gradle.kts | 2 +- .../java/com/github/jasync/sql/db/mysql/MySQLConnection.kt | 2 +- .../github/jasync/sql/db/mysql/binary/BinaryRowDecoder.kt | 2 +- .../jasync/sql/db/mysql/binary/decoder/TimestampDecoder.kt | 2 +- .../jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt | 2 +- .../github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt | 2 +- .../jasync/sql/db/mysql/codec/MySQLOneToOneEncoder.kt | 2 +- .../github/jasync/sql/db/mysql/codec/SendLongDataEncoder.kt | 2 +- .../jasync/sql/db/mysql/decoder/HandshakeV10Decoder.kt | 2 +- .../decoder/PreparedStatementPrepareResponseDecoder.kt | 2 +- .../db/mysql/encoder/auth/Sha256PasswordAuthentication.kt | 2 +- .../jasync/sql/db/mysql/pool/MySQLConnectionFactory.kt | 2 +- .../com/github/jasync/sql/db/mysql/ConcurrentlyRunTest.kt | 2 +- pool-async/build.gradle.kts | 2 +- .../com/github/jasync/sql/db/pool/ActorBasedObjectPool.kt | 2 +- postgis-jasync/build.gradle.kts | 2 +- .../github/jasync/sql/db/postgis/JasyncPostgisRegister.kt | 2 +- postgis-jasync/src/test/java/ContainerHelper.kt | 2 +- postgresql-async/build.gradle.kts | 2 +- .../github/jasync/sql/db/postgresql/PostgreSQLConnection.kt | 2 +- .../github/jasync/sql/db/postgresql/codec/MessageDecoder.kt | 2 +- .../github/jasync/sql/db/postgresql/codec/MessageEncoder.kt | 2 +- .../sql/db/postgresql/codec/PostgreSQLConnectionHandler.kt | 2 +- .../db/postgresql/column/PostgreSQLColumnDecoderRegistry.kt | 2 +- .../db/postgresql/column/PostgreSQLColumnEncoderRegistry.kt | 2 +- .../sql/db/postgresql/encoders/CloseStatementEncoder.kt | 2 +- .../postgresql/encoders/PreparedStatementEncoderHelper.kt | 2 +- .../postgresql/encoders/PreparedStatementOpeningEncoder.kt | 2 +- .../sql/db/postgresql/encoders/QueryMessageEncoder.kt | 2 +- .../sql/db/postgresql/encoders/StartupMessageEncoder.kt | 2 +- .../sql/db/postgresql/pool/PostgreSQLConnectionFactory.kt | 2 +- .../com/github/aysnc/sql/db/integration/ContainerHelper.kt | 2 +- r2dbc-mysql/build.gradle.kts | 2 +- r2dbc-mysql/src/main/java/JasyncStatement.kt | 2 +- r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt | 2 +- .../github/jasync/r2dbc/mysql/integ/JasyncR2dbcIntegTest.kt | 2 +- samples/ktor/build.gradle | 2 +- samples/ktor/src/application.kt | 2 +- 48 files changed, 50 insertions(+), 50 deletions(-) diff --git a/db-async-common/build.gradle.kts b/db-async-common/build.gradle.kts index ae9f07a20..b1887e834 100644 --- a/db-async-common/build.gradle.kts +++ b/db-async-common/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { implementation("io.netty:netty-handler:$NETTY_VERSION") compileOnly("io.netty:netty-transport-native-epoll:$NETTY_VERSION:linux-x86_64") compileOnly("io.netty:netty-transport-native-kqueue:$NETTY_VERSION:osx-x86_64") - implementation("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + implementation("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$KOTLIN_COROUTINES_VERSION") testImplementation("junit:junit:$JUNIT_VERSION") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION") diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/Configuration.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/Configuration.kt index 6317060fc..0ebc9e174 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/Configuration.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/Configuration.kt @@ -3,12 +3,12 @@ package com.github.jasync.sql.db import com.github.jasync.sql.db.interceptor.QueryInterceptor import com.github.jasync.sql.db.util.ExecutorServiceUtils import com.github.jasync.sql.db.util.NettyUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBufAllocator import io.netty.buffer.PooledByteBufAllocator import io.netty.channel.EventLoopGroup import io.netty.channel.nio.NioEventLoopGroup import io.netty.util.CharsetUtil -import mu.KotlinLogging import java.nio.charset.Charset import java.nio.file.Path import java.time.Duration diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/interceptor/Interceptors.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/interceptor/Interceptors.kt index 7e88c7e55..28205080a 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/interceptor/Interceptors.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/interceptor/Interceptors.kt @@ -2,7 +2,7 @@ package com.github.jasync.sql.db.interceptor import com.github.jasync.sql.db.QueryResult import com.github.jasync.sql.db.util.mapTry -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.slf4j.MDC import java.util.concurrent.CompletableFuture import java.util.function.Supplier diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionFactory.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionFactory.kt index ec606b2d0..070b6c85c 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionFactory.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionFactory.kt @@ -8,7 +8,7 @@ import com.github.jasync.sql.db.interceptor.PreparedStatementParams import com.github.jasync.sql.db.util.FP import com.github.jasync.sql.db.util.Try import com.github.jasync.sql.db.util.map -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.CompletableFuture private val logger = KotlinLogging.logger {} diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionPool.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionPool.kt index 6208e0d50..0a1c209cf 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionPool.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionPool.kt @@ -9,7 +9,7 @@ import com.github.jasync.sql.db.interceptor.wrapPreparedStatementWithInterceptor import com.github.jasync.sql.db.interceptor.wrapQueryWithInterceptors import com.github.jasync.sql.db.util.FP import com.github.jasync.sql.db.util.mapAsync -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.CompletableFuture private val logger = KotlinLogging.logger {} diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt index 59835d8bd..d4e784ef0 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt @@ -3,8 +3,8 @@ package com.github.jasync.sql.db.pool import com.github.jasync.sql.db.util.nullableMap import com.github.jasync.sql.db.util.onCompleteAsync import com.github.jasync.sql.db.util.tryFailure +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.channel.EventLoopGroup -import mu.KotlinLogging import java.time.Duration import java.util.concurrent.CompletableFuture import java.util.concurrent.Executor diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/util/AbstractURIParser.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/util/AbstractURIParser.kt index 1e05ede7a..e036122c5 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/util/AbstractURIParser.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/util/AbstractURIParser.kt @@ -3,7 +3,7 @@ package com.github.jasync.sql.db.util import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.SSLConfiguration import com.github.jasync.sql.db.exceptions.UnableToParseURLException -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.net.URI import java.net.URISyntaxException import java.net.URLDecoder diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/util/NettyUtils.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/util/NettyUtils.kt index 15c24bb92..af8662009 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/util/NettyUtils.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/util/NettyUtils.kt @@ -2,6 +2,7 @@ package com.github.jasync.sql.db.util import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.SSLConfiguration +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.channel.Channel import io.netty.channel.EventLoopGroup import io.netty.channel.epoll.Epoll @@ -20,7 +21,6 @@ import io.netty.handler.ssl.SslContextBuilder import io.netty.handler.ssl.util.InsecureTrustManagerFactory import io.netty.util.internal.logging.InternalLoggerFactory import io.netty.util.internal.logging.Slf4JLoggerFactory -import mu.KotlinLogging import java.io.FileInputStream import java.net.InetSocketAddress import java.net.SocketAddress diff --git a/db-async-common/src/main/java/com/github/jasync/sql/db/util/PrintUtils.kt b/db-async-common/src/main/java/com/github/jasync/sql/db/util/PrintUtils.kt index 791659061..e0b86faad 100644 --- a/db-async-common/src/main/java/com/github/jasync/sql/db/util/PrintUtils.kt +++ b/db-async-common/src/main/java/com/github/jasync/sql/db/util/PrintUtils.kt @@ -2,8 +2,8 @@ package com.github.jasync.sql.db.util +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging object PrintUtils { diff --git a/gradle.properties b/gradle.properties index 79f67d9c7..ab4927621 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,11 @@ KOTLIN_VERSION=1.8.21 KTLINT_VERSION=11.3.1 JACOCO_VERSION=0.8.8 KOTLIN_COROUTINES_VERSION=1.7.1 -SL4J_VERSION=1.7.25 +SL4J_VERSION=2.0.7 JODA_VERSION=2.12.5 JODA_CONVERT_VERSION=2.2.3 NETTY_VERSION=4.1.93.Final -KOTLIN_LOGGING_VERSION=2.1.21 +KOTLIN_LOGGING_VERSION=4.0.0-beta-29 SCRAM_CLIENT_VERSION=2.1 R2DBC_SPI_VERSION=1.0.0.RELEASE REACTOR_CORE_VERSION=3.5.7 @@ -14,7 +14,7 @@ REACTOR_KOTLIN_EXTENSION=1.2.2 JUNIT_VERSION=4.13.2 ASSERTJ_VERSION=3.23.1 MOCKK_VERSION=1.9 -LOGBACK_VERSION=1.1.8 +LOGBACK_VERSION=1.3.8 TEST_CONTAINERS_VERSION=1.17.6 MYSQL_CONNECTOR_VERSION=5.1.47 AWAITILITY_VERSION=3.1.5 diff --git a/mysql-async/build.gradle.kts b/mysql-async/build.gradle.kts index e88aa2db8..0c1924828 100644 --- a/mysql-async/build.gradle.kts +++ b/mysql-async/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { api("io.netty:netty-transport:$NETTY_VERSION") api("io.netty:netty-handler:$NETTY_VERSION") testImplementation("io.netty:netty-transport-native-epoll:$NETTY_VERSION:linux-x86_64") - api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + api("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") testImplementation("junit:junit:$JUNIT_VERSION") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION") testImplementation("org.assertj:assertj-core:$ASSERTJ_VERSION") diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt index 527e5c1fb..cae6ca6cd 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt @@ -43,9 +43,9 @@ import com.github.jasync.sql.db.util.onFailureAsync import com.github.jasync.sql.db.util.parseVersion import com.github.jasync.sql.db.util.success import com.github.jasync.sql.db.util.toCompletableFuture +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.channel.ChannelHandlerContext import io.netty.handler.ssl.SslHandler -import mu.KotlinLogging import java.time.Duration import java.util.Optional import java.util.concurrent.CancellationException diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/BinaryRowDecoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/BinaryRowDecoder.kt index feeb5ff2c..63464318d 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/BinaryRowDecoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/BinaryRowDecoder.kt @@ -4,8 +4,8 @@ import com.github.jasync.sql.db.exceptions.BufferNotFullyConsumedException import com.github.jasync.sql.db.mysql.message.server.ColumnDefinitionMessage import com.github.jasync.sql.db.util.BufferDumper import com.github.jasync.sql.db.util.PrintUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/decoder/TimestampDecoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/decoder/TimestampDecoder.kt index 230107dbe..50be9f593 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/decoder/TimestampDecoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/binary/decoder/TimestampDecoder.kt @@ -1,7 +1,7 @@ package com.github.jasync.sql.db.mysql.binary.decoder +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging import java.time.LocalDateTime private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt index 98fd570a3..f6b3c54c0 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt @@ -38,6 +38,7 @@ import com.github.jasync.sql.db.util.length import com.github.jasync.sql.db.util.onFailure import com.github.jasync.sql.db.util.tail import com.github.jasync.sql.db.util.toCompletableFuture +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.bootstrap.Bootstrap import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled @@ -49,7 +50,6 @@ import io.netty.channel.ChannelOption import io.netty.channel.EventLoopGroup import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.codec.CodecException -import mu.KotlinLogging import java.nio.ByteBuffer import java.util.concurrent.CompletableFuture import java.util.concurrent.Executor diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt index bd5c83a38..9e0cc2f09 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt @@ -25,10 +25,10 @@ import com.github.jasync.sql.db.mysql.message.server.ServerMessage import com.github.jasync.sql.db.util.BufferDumper import com.github.jasync.sql.db.util.ByteBufferUtils.read3BytesInt import com.github.jasync.sql.db.util.readBinaryLength +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.ByteToMessageDecoder -import mu.KotlinLogging import java.nio.charset.Charset import java.util.concurrent.atomic.AtomicInteger diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLOneToOneEncoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLOneToOneEncoder.kt index bff1fc7c7..0deb61c5b 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLOneToOneEncoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLOneToOneEncoder.kt @@ -14,10 +14,10 @@ import com.github.jasync.sql.db.mysql.message.client.ClientMessage import com.github.jasync.sql.db.mysql.util.CharsetMapper import com.github.jasync.sql.db.util.BufferDumper import com.github.jasync.sql.db.util.ByteBufferUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.MessageToMessageEncoder -import mu.KotlinLogging import java.nio.charset.Charset class MySQLOneToOneEncoder(charset: Charset, charsetMapper: CharsetMapper) : diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/SendLongDataEncoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/SendLongDataEncoder.kt index 8f043ec71..ac18ced6c 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/SendLongDataEncoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/SendLongDataEncoder.kt @@ -3,10 +3,10 @@ package com.github.jasync.sql.db.mysql.codec import com.github.jasync.sql.db.mysql.message.client.ClientMessage import com.github.jasync.sql.db.mysql.message.client.SendLongDataMessage import com.github.jasync.sql.db.util.ByteBufferUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.Unpooled import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.MessageToMessageEncoder -import mu.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/HandshakeV10Decoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/HandshakeV10Decoder.kt index 78ab8368a..b8d57b09a 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/HandshakeV10Decoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/HandshakeV10Decoder.kt @@ -7,9 +7,9 @@ import com.github.jasync.sql.db.mysql.util.CapabilityFlag.CLIENT_PLUGIN_AUTH import com.github.jasync.sql.db.mysql.util.CapabilityFlag.CLIENT_SECURE_CONNECTION import com.github.jasync.sql.db.util.readCString import com.github.jasync.sql.db.util.readUntilEOF +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.util.CharsetUtil -import mu.KotlinLogging import kotlin.experimental.and private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/PreparedStatementPrepareResponseDecoder.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/PreparedStatementPrepareResponseDecoder.kt index aa929ee70..40d9a6381 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/PreparedStatementPrepareResponseDecoder.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/PreparedStatementPrepareResponseDecoder.kt @@ -3,8 +3,8 @@ package com.github.jasync.sql.db.mysql.decoder import com.github.jasync.sql.db.mysql.message.server.PreparedStatementPrepareResponse import com.github.jasync.sql.db.mysql.message.server.ServerMessage import com.github.jasync.sql.db.util.BufferDumper.dumpAsHex +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/auth/Sha256PasswordAuthentication.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/auth/Sha256PasswordAuthentication.kt index e7219252b..efd6d55a1 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/auth/Sha256PasswordAuthentication.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/auth/Sha256PasswordAuthentication.kt @@ -2,7 +2,7 @@ package com.github.jasync.sql.db.mysql.encoder.auth import com.github.jasync.sql.db.SSLConfiguration import com.github.jasync.sql.db.util.length -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.nio.charset.Charset import java.nio.file.Files import java.nio.file.Path diff --git a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/pool/MySQLConnectionFactory.kt b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/pool/MySQLConnectionFactory.kt index 00fd3f798..851a1df59 100644 --- a/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/pool/MySQLConnectionFactory.kt +++ b/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/pool/MySQLConnectionFactory.kt @@ -3,7 +3,7 @@ package com.github.jasync.sql.db.mysql.pool import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.mysql.MySQLConnection import com.github.jasync.sql.db.pool.ConnectionFactory -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.CompletableFuture private val logger = KotlinLogging.logger {} diff --git a/mysql-async/src/test/java/com/github/jasync/sql/db/mysql/ConcurrentlyRunTest.kt b/mysql-async/src/test/java/com/github/jasync/sql/db/mysql/ConcurrentlyRunTest.kt index 5c59cecb5..432e6d2a3 100644 --- a/mysql-async/src/test/java/com/github/jasync/sql/db/mysql/ConcurrentlyRunTest.kt +++ b/mysql-async/src/test/java/com/github/jasync/sql/db/mysql/ConcurrentlyRunTest.kt @@ -1,7 +1,7 @@ package com.github.jasync.sql.db.mysql import com.github.jasync.sql.db.RowData -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.atomic.AtomicInteger private val logger = KotlinLogging.logger {} diff --git a/pool-async/build.gradle.kts b/pool-async/build.gradle.kts index 35c2d356e..29ad74728 100644 --- a/pool-async/build.gradle.kts +++ b/pool-async/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api("org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION") implementation("org.slf4j:slf4j-api:$SL4J_VERSION") - implementation("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + implementation("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$KOTLIN_COROUTINES_VERSION") testImplementation("junit:junit:$JUNIT_VERSION") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION") diff --git a/pool-async/src/main/java/com/github/jasync/sql/db/pool/ActorBasedObjectPool.kt b/pool-async/src/main/java/com/github/jasync/sql/db/pool/ActorBasedObjectPool.kt index b4265e650..794cd1a5b 100644 --- a/pool-async/src/main/java/com/github/jasync/sql/db/pool/ActorBasedObjectPool.kt +++ b/pool-async/src/main/java/com/github/jasync/sql/db/pool/ActorBasedObjectPool.kt @@ -8,13 +8,13 @@ import com.github.jasync.sql.db.util.failed import com.github.jasync.sql.db.util.map import com.github.jasync.sql.db.util.mapTry import com.github.jasync.sql.db.util.onComplete +import io.github.oshai.kotlinlogging.KotlinLogging import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.channels.SendChannel import kotlinx.coroutines.channels.actor -import mu.KotlinLogging import java.util.LinkedList import java.util.Queue import java.util.WeakHashMap diff --git a/postgis-jasync/build.gradle.kts b/postgis-jasync/build.gradle.kts index 56203209d..79b504f85 100644 --- a/postgis-jasync/build.gradle.kts +++ b/postgis-jasync/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { api("joda-time:joda-time:$JODA_VERSION") api("io.netty:netty-transport:$NETTY_VERSION") api("io.netty:netty-handler:$NETTY_VERSION") - api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + api("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") api("com.ongres.scram:client:$SCRAM_CLIENT_VERSION") api("org.threeten:threeten-extra:$THREETEN_EXTRA") testImplementation("junit:junit:$JUNIT_VERSION") diff --git a/postgis-jasync/src/main/java/com/github/jasync/sql/db/postgis/JasyncPostgisRegister.kt b/postgis-jasync/src/main/java/com/github/jasync/sql/db/postgis/JasyncPostgisRegister.kt index 8414cca51..16732fe14 100644 --- a/postgis-jasync/src/main/java/com/github/jasync/sql/db/postgis/JasyncPostgisRegister.kt +++ b/postgis-jasync/src/main/java/com/github/jasync/sql/db/postgis/JasyncPostgisRegister.kt @@ -4,7 +4,7 @@ import com.github.jasync.sql.db.Connection import com.github.jasync.sql.db.postgresql.column.PostgreSQLColumnDecoderRegistry import com.github.jasync.sql.db.util.FP import com.github.jasync.sql.db.util.map -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.CompletableFuture import java.util.concurrent.atomic.AtomicBoolean diff --git a/postgis-jasync/src/test/java/ContainerHelper.kt b/postgis-jasync/src/test/java/ContainerHelper.kt index 7825d390b..b5cd89a7f 100644 --- a/postgis-jasync/src/test/java/ContainerHelper.kt +++ b/postgis-jasync/src/test/java/ContainerHelper.kt @@ -2,7 +2,7 @@ package com.github.aysnc.sql.db.integration import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.postgresql.PostgreSQLConnection -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.testcontainers.containers.BindMode import org.testcontainers.containers.PostgreSQLContainer import org.testcontainers.utility.DockerImageName diff --git a/postgresql-async/build.gradle.kts b/postgresql-async/build.gradle.kts index 57bbbfbf0..1e2f5dd51 100644 --- a/postgresql-async/build.gradle.kts +++ b/postgresql-async/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { api("joda-time:joda-time:$JODA_VERSION") api("io.netty:netty-transport:$NETTY_VERSION") api("io.netty:netty-handler:$NETTY_VERSION") - api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + api("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") api("com.ongres.scram:client:$SCRAM_CLIENT_VERSION") api("org.threeten:threeten-extra:$THREETEN_EXTRA") testImplementation("junit:junit:$JUNIT_VERSION") diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/PostgreSQLConnection.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/PostgreSQLConnection.kt index 3a743e833..81ba5e569 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/PostgreSQLConnection.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/PostgreSQLConnection.kt @@ -61,7 +61,7 @@ import com.ongres.scram.client.ScramClient import com.ongres.scram.client.ScramSession import com.ongres.scram.common.exception.ScramException import com.ongres.scram.common.stringprep.StringPreparations -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.time.Duration import java.util.Collections import java.util.Optional diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageDecoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageDecoder.kt index c961ef787..0531fa0ac 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageDecoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageDecoder.kt @@ -7,10 +7,10 @@ import com.github.jasync.sql.db.postgresql.messages.backend.ServerMessage import com.github.jasync.sql.db.postgresql.parsers.AuthenticationStartupParser import com.github.jasync.sql.db.postgresql.parsers.MessageParsersRegistry import com.github.jasync.sql.db.util.BufferDumper +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.ByteToMessageDecoder -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageEncoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageEncoder.kt index 93bf0d491..505f1edbb 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageEncoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/MessageEncoder.kt @@ -15,9 +15,9 @@ import com.github.jasync.sql.db.postgresql.messages.frontend.ClientMessage import com.github.jasync.sql.db.postgresql.messages.frontend.SSLRequestMessage import com.github.jasync.sql.db.postgresql.messages.frontend.StartupMessage import com.github.jasync.sql.db.util.BufferDumper +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.MessageToMessageEncoder -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/PostgreSQLConnectionHandler.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/PostgreSQLConnectionHandler.kt index ba9784cf1..bd8f77fed 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/PostgreSQLConnectionHandler.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/codec/PostgreSQLConnectionHandler.kt @@ -27,6 +27,7 @@ import com.github.jasync.sql.db.util.onCompleteAsync import com.github.jasync.sql.db.util.onFailure import com.github.jasync.sql.db.util.success import com.github.jasync.sql.db.util.toCompletableFuture +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.bootstrap.Bootstrap import io.netty.channel.Channel import io.netty.channel.ChannelHandlerContext @@ -36,7 +37,6 @@ import io.netty.channel.EventLoopGroup import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.codec.CodecException import io.netty.handler.ssl.SslHandler -import mu.KotlinLogging import java.util.concurrent.CompletableFuture import java.util.concurrent.Executor diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnDecoderRegistry.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnDecoderRegistry.kt index 85e795e4d..39f05f14d 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnDecoderRegistry.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnDecoderRegistry.kt @@ -15,9 +15,9 @@ import com.github.jasync.sql.db.column.TimeEncoderDecoder import com.github.jasync.sql.db.column.TimeWithTimezoneEncoderDecoder import com.github.jasync.sql.db.column.UUIDEncoderDecoder import com.github.jasync.sql.db.general.ColumnData +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.util.CharsetUtil -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnEncoderRegistry.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnEncoderRegistry.kt index 857d44589..ef715e592 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnEncoderRegistry.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/column/PostgreSQLColumnEncoderRegistry.kt @@ -16,8 +16,8 @@ import com.github.jasync.sql.db.column.TimeEncoderDecoder import com.github.jasync.sql.db.column.TimestampEncoderDecoder import com.github.jasync.sql.db.column.TimestampWithTimezoneEncoderDecoder import com.github.jasync.sql.db.column.UUIDEncoderDecoder +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging import org.threeten.extra.PeriodDuration import java.math.BigDecimal import java.nio.ByteBuffer diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/CloseStatementEncoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/CloseStatementEncoder.kt index f29b11c83..099f3aa51 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/CloseStatementEncoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/CloseStatementEncoder.kt @@ -2,8 +2,8 @@ package com.github.jasync.sql.db.postgresql.encoders import com.github.jasync.sql.db.postgresql.messages.frontend.ClientMessage import com.github.jasync.sql.db.postgresql.messages.frontend.PreparedStatementCloseMessage +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementEncoderHelper.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementEncoderHelper.kt index 7d980ffc6..a2ebff94f 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementEncoderHelper.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementEncoderHelper.kt @@ -4,9 +4,9 @@ import com.github.jasync.sql.db.column.ColumnEncoderRegistry import com.github.jasync.sql.db.postgresql.messages.backend.ServerMessage import com.github.jasync.sql.db.util.ByteBufferUtils import com.github.jasync.sql.db.util.length +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementOpeningEncoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementOpeningEncoder.kt index cde19b805..edae08327 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementOpeningEncoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/PreparedStatementOpeningEncoder.kt @@ -5,9 +5,9 @@ import com.github.jasync.sql.db.postgresql.messages.backend.ServerMessage import com.github.jasync.sql.db.postgresql.messages.frontend.ClientMessage import com.github.jasync.sql.db.postgresql.messages.frontend.PreparedStatementOpeningMessage import com.github.jasync.sql.db.util.ByteBufferUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/QueryMessageEncoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/QueryMessageEncoder.kt index 4e595c931..22b9f8b1a 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/QueryMessageEncoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/QueryMessageEncoder.kt @@ -4,9 +4,9 @@ import com.github.jasync.sql.db.postgresql.messages.backend.ServerMessage import com.github.jasync.sql.db.postgresql.messages.frontend.ClientMessage import com.github.jasync.sql.db.postgresql.messages.frontend.QueryMessage import com.github.jasync.sql.db.util.ByteBufferUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/StartupMessageEncoder.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/StartupMessageEncoder.kt index a324f5d26..9af48af49 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/StartupMessageEncoder.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/encoders/StartupMessageEncoder.kt @@ -2,9 +2,9 @@ package com.github.jasync.sql.db.postgresql.encoders import com.github.jasync.sql.db.postgresql.messages.frontend.StartupMessage import com.github.jasync.sql.db.util.ByteBufferUtils +import io.github.oshai.kotlinlogging.KotlinLogging import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled -import mu.KotlinLogging import java.nio.charset.Charset private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/pool/PostgreSQLConnectionFactory.kt b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/pool/PostgreSQLConnectionFactory.kt index 83c623a02..8d0778a27 100644 --- a/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/pool/PostgreSQLConnectionFactory.kt +++ b/postgresql-async/src/main/java/com/github/jasync/sql/db/postgresql/pool/PostgreSQLConnectionFactory.kt @@ -3,7 +3,7 @@ package com.github.jasync.sql.db.postgresql.pool import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.pool.ConnectionFactory import com.github.jasync.sql.db.postgresql.PostgreSQLConnection -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.CompletableFuture private val logger = KotlinLogging.logger {} diff --git a/postgresql-async/src/test/java/com/github/aysnc/sql/db/integration/ContainerHelper.kt b/postgresql-async/src/test/java/com/github/aysnc/sql/db/integration/ContainerHelper.kt index 1f2b583e2..a34e31c04 100644 --- a/postgresql-async/src/test/java/com/github/aysnc/sql/db/integration/ContainerHelper.kt +++ b/postgresql-async/src/test/java/com/github/aysnc/sql/db/integration/ContainerHelper.kt @@ -2,7 +2,7 @@ package com.github.aysnc.sql.db.integration import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.postgresql.PostgreSQLConnection -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.testcontainers.containers.BindMode import org.testcontainers.containers.PostgreSQLContainer import java.util.concurrent.TimeUnit diff --git a/r2dbc-mysql/build.gradle.kts b/r2dbc-mysql/build.gradle.kts index aa5e9bfcf..2ee44e9e9 100644 --- a/r2dbc-mysql/build.gradle.kts +++ b/r2dbc-mysql/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { api("org.joda:joda-convert:$JODA_CONVERT_VERSION") api("io.netty:netty-transport:$NETTY_VERSION") api("io.netty:netty-handler:$NETTY_VERSION") - api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION") + api("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION") testImplementation("org.springframework.data:spring-data-r2dbc:1.5.6") testImplementation("io.r2dbc:r2dbc-pool:1.0.0.RELEASE") testImplementation("junit:junit:$JUNIT_VERSION") diff --git a/r2dbc-mysql/src/main/java/JasyncStatement.kt b/r2dbc-mysql/src/main/java/JasyncStatement.kt index 9b705e29d..3e4074334 100644 --- a/r2dbc-mysql/src/main/java/JasyncStatement.kt +++ b/r2dbc-mysql/src/main/java/JasyncStatement.kt @@ -5,6 +5,7 @@ import com.github.jasync.sql.db.exceptions.InsufficientParametersException import com.github.jasync.sql.db.mysql.MySQLQueryResult import com.github.jasync.sql.db.mysql.exceptions.MySQLException import com.github.jasync.sql.db.mysql.exceptions.MysqlErrors +import io.github.oshai.kotlinlogging.KotlinLogging import io.r2dbc.spi.Parameter import io.r2dbc.spi.R2dbcBadGrammarException import io.r2dbc.spi.R2dbcDataIntegrityViolationException @@ -15,7 +16,6 @@ import io.r2dbc.spi.R2dbcTimeoutException import io.r2dbc.spi.R2dbcTransientResourceException import io.r2dbc.spi.Result import io.r2dbc.spi.Statement -import mu.KotlinLogging import org.reactivestreams.Publisher import reactor.core.publisher.Mono import reactor.kotlin.core.publisher.onErrorMap diff --git a/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt b/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt index b4b903cc8..38ea337c3 100644 --- a/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt +++ b/r2dbc-mysql/src/main/java/MysqlConnectionFactoryProvider.kt @@ -3,6 +3,7 @@ package com.github.jasync.r2dbc.mysql import com.github.jasync.sql.db.Configuration import com.github.jasync.sql.db.mysql.MySQLConnection.Companion.CLIENT_FOUND_ROWS_PROP_NAME import com.github.jasync.sql.db.mysql.pool.MySQLConnectionFactory +import io.github.oshai.kotlinlogging.KotlinLogging import io.r2dbc.spi.ConnectionFactoryOptions import io.r2dbc.spi.ConnectionFactoryOptions.CONNECT_TIMEOUT import io.r2dbc.spi.ConnectionFactoryOptions.DATABASE @@ -14,7 +15,6 @@ import io.r2dbc.spi.ConnectionFactoryOptions.STATEMENT_TIMEOUT import io.r2dbc.spi.ConnectionFactoryOptions.USER import io.r2dbc.spi.ConnectionFactoryProvider import io.r2dbc.spi.Option -import mu.KotlinLogging import java.nio.file.Paths import java.time.Duration import kotlin.properties.ReadWriteProperty diff --git a/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/integ/JasyncR2dbcIntegTest.kt b/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/integ/JasyncR2dbcIntegTest.kt index 558cefa9f..8a4dc7831 100644 --- a/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/integ/JasyncR2dbcIntegTest.kt +++ b/r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/integ/JasyncR2dbcIntegTest.kt @@ -4,12 +4,12 @@ import com.github.jasync.r2dbc.mysql.JasyncConnectionFactory import com.github.jasync.sql.db.mysql.MySQLConnection import com.github.jasync.sql.db.mysql.pool.MySQLConnectionFactory import com.github.jasync.sql.db.util.FP +import io.github.oshai.kotlinlogging.KotlinLogging import io.mockk.mockk import io.r2dbc.pool.ConnectionPoolConfiguration import io.r2dbc.spi.Parameter import io.r2dbc.spi.Result import io.r2dbc.spi.Type -import mu.KotlinLogging import org.assertj.core.api.Assertions.assertThat import org.awaitility.kotlin.await import org.hamcrest.core.IsEqual diff --git a/samples/ktor/build.gradle b/samples/ktor/build.gradle index 3fbbe8587..2e0148f97 100644 --- a/samples/ktor/build.gradle +++ b/samples/ktor/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation "io.ktor:ktor-server-core:$ktor_version" implementation "io.ktor:ktor-server-host-common:$ktor_version" implementation "io.ktor:ktor-gson:$ktor_version" - implementation "io.github.microutils:kotlin-logging:1.6.10" + implementation "io.github.oshai:kotlin-logging-jvm:1.6.10" implementation 'com.github.jasync-sql:jasync-mysql:0.9.23' testImplementation "io.ktor:ktor-server-tests:$ktor_version" testImplementation "io.ktor:ktor-server-core:$ktor_version" diff --git a/samples/ktor/src/application.kt b/samples/ktor/src/application.kt index 3a89b97ab..fc0b4ba44 100644 --- a/samples/ktor/src/application.kt +++ b/samples/ktor/src/application.kt @@ -15,7 +15,7 @@ import io.ktor.server.engine.embeddedServer import io.ktor.server.netty.Netty import io.ktor.util.pipeline.PipelineContext import kotlinx.coroutines.future.await -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.util.concurrent.TimeUnit