8000 upgrade kotlin-logging by oshai · Pull Request #402 · jasync-sql/jasync-sql · GitHub
[go: up one dir, main page]

Skip to content

upgrade kotlin-logging #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db-async-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ 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
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
Expand Down
2 changes: 1 addition & 1 deletion mysql-async/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) :
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {}
Expand Down
2 changes: 1 addition & 1 deletion pool-async/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion postgis-jasync/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion postgis-jasync/src/test/java/ContainerHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion postgresql-async/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Loading
0