diff --git a/build.gradle.kts b/build.gradle.kts index e8fb39cd..4183b152 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,7 @@ allprojects { } } - version = "0.0.6" + version = "0.0.7" group = "io.github.ustudiocompany" configurations.all { diff --git a/library/jdbc/core/api/jdbc-core-library.api b/library/jdbc/core/api/jdbc-core-library.api index 24915297..bbf7d536 100644 --- a/library/jdbc/core/api/jdbc-core-library.api +++ b/library/jdbc/core/api/jdbc-core-library.api @@ -72,7 +72,6 @@ public final class io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql public synthetic fun (Ljava/lang/String;Ljava/util/Map;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getParameters ()Ljava/util/Map; public final fun getValue ()Ljava/lang/String; - public fun toString ()Ljava/lang/String; } public final class io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql$Companion { diff --git a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql.kt b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql.kt index df569e88..caf901fb 100644 --- a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql.kt +++ b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/sql/ParametrizedSql.kt @@ -4,12 +4,6 @@ public class ParametrizedSql private constructor( public val value: String, public val parameters: Map ) { - - override fun toString(): String { - return "Sql: '${value.trim()}' \n " + - "Parameters: ${parameters.entries.joinToString(", ") { "${it.key}: ${it.value}" }}" - } - public companion object { private const val PARAMETER_NAME_PLACEHOLDER = "?" private const val PREFIX_PARAMETER_NAME = ':' diff --git a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionInstance.kt b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionInstance.kt index 04d059ff..c12690ce 100644 --- a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionInstance.kt +++ b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionInstance.kt @@ -15,8 +15,9 @@ import io.github.ustudiocompany.uframework.jdbc.statement.JDBCNamedPreparedState import io.github.ustudiocompany.uframework.jdbc.statement.JDBCPreparedStatement import io.github.ustudiocompany.uframework.jdbc.statement.JDBCPreparedStatementInstance import io.github.ustudiocompany.uframework.jdbc.statement.JDBCStatement -import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.debug import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.error +import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.trace +import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.warn import java.sql.Connection import java.sql.PreparedStatement import org.slf4j.LoggerFactory @@ -31,41 +32,41 @@ internal class TransactionInstance( get() = this override fun commit(): Maybe { - logger.debug("Commit transaction started.") + logger.trace { "Commit transaction started." } return Maybe.catch( block = { unwrappedConnection.commit() }, catch = { exception -> JDBCError(description = "Error while committing transaction.", exception = exception) } - ).onNone { logger.debug("Commit transaction finished.") } + ).onNone { logger.trace { "Commit transaction finished." } } } override fun rollback(): Maybe { - logger.debug("Rollback transaction started.") + logger.warn { "Rollback transaction started." } return Maybe.catch( block = { unwrappedConnection.rollback() }, catch = { exception -> JDBCError(description = "Error while rolling back transaction.", exception = exception) } - ).onNone { logger.debug("Rollback transaction finished.") } + ).onNone { logger.trace { "Rollback transaction finished." } } } override fun close() { - logger.debug("Closing transaction connection.") + logger.trace { "Closing transaction connection." } try { if (!unwrappedConnection.isClosed) unwrappedConnection.close() } catch (expected: Exception) { logger.error(expected) { "Error occurred while closing connection." } } - logger.debug("Transaction connection closed.") + logger.trace { "Transaction connection closed." } } override fun preparedStatement( sql: String, timeout: JDBCStatement.Timeout ): JDBCResult { - logger.debug { "Executing Query: \n $sql" } + logger.trace { "Executing Query: $sql" } return prepareStatement(sql, timeout) .map { statement -> JDBCPreparedStatementInstance(statement = statement) } } @@ -74,7 +75,7 @@ internal class TransactionInstance( sql: ParametrizedSql, timeout: JDBCStatement.Timeout ): JDBCResult { - logger.debug { "Executing ParametrizedSql: \n $sql" } + logger.trace { "Executing ParametrizedSql: ${sql.value.trim()}" } return prepareStatement(sql.value, timeout) .map { statement -> JDBCNamedPreparedStatementInstance(parameters = sql.parameters, statement = statement) diff --git a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionManager.kt b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionManager.kt index 17372abc..0026cf71 100644 --- a/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionManager.kt +++ b/library/jdbc/core/src/main/kotlin/io/github/ustudiocompany/uframework/jdbc/transaction/TransactionManager.kt @@ -10,7 +10,7 @@ import io.github.ustudiocompany.uframework.jdbc.JDBCResult import io.github.ustudiocompany.uframework.jdbc.connection.JDBCConnection import io.github.ustudiocompany.uframework.jdbc.error.JDBCError import io.github.ustudiocompany.uframework.jdbc.use -import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.debug +import io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextension.trace import org.slf4j.Logger import org.slf4j.LoggerFactory @@ -119,7 +119,7 @@ public inline fun TransactionManager.us startTransaction(isolation) .mapFailure { fail -> exceptionBuilder(fail) } .use { tx -> - logger.debug { "Transaction started." } + logger.trace { "Transaction started." } val result = try { block(tx.connection) } catch (expected: Exception) { @@ -136,6 +136,6 @@ public inline fun TransactionManager.us else tx.rollback() - logger.debug { "Transaction ended." } + logger.trace { "Transaction ended." } result } diff --git a/library/telemetry/logging/slf4jextension/api/logging-slf4j-extension-library.api b/library/telemetry/logging/slf4jextension/api/logging-slf4j-extension-library.api index 39ab2aa0..e768f2a5 100644 --- a/library/telemetry/logging/slf4jextension/api/logging-slf4j-extension-library.api +++ b/library/telemetry/logging/slf4jextension/api/logging-slf4j-extension-library.api @@ -3,6 +3,7 @@ public final class io/github/ustudiocompany/uframework/telemetry/logging/logger/ public static final fun error (Lorg/slf4j/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V public static synthetic fun error$default (Lorg/slf4j/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V public static final fun info (Lorg/slf4j/Logger;Lkotlin/jvm/functions/Function0;)V + public static final fun trace (Lorg/slf4j/Logger;Lkotlin/jvm/functions/Function0;)V public static final fun warn (Lorg/slf4j/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V public static synthetic fun warn$default (Lorg/slf4j/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V } diff --git a/library/telemetry/logging/slf4jextension/src/main/kotlin/io/github/ustudiocompany/uframework/telemetry/logging/logger/slf4jextension/Slf4jExtension.kt b/library/telemetry/logging/slf4jextension/src/main/kotlin/io/github/ustudiocompany/uframework/telemetry/logging/logger/slf4jextension/Slf4jExtension.kt index 5683d809..c4c59c5f 100644 --- a/library/telemetry/logging/slf4jextension/src/main/kotlin/io/github/ustudiocompany/uframework/telemetry/logging/logger/slf4jextension/Slf4jExtension.kt +++ b/library/telemetry/logging/slf4jextension/src/main/kotlin/io/github/ustudiocompany/uframework/telemetry/logging/logger/slf4jextension/Slf4jExtension.kt @@ -2,6 +2,10 @@ package io.github.ustudiocompany.uframework.telemetry.logging.logger.slf4jextens import org.slf4j.Logger +public inline fun Logger.trace(msg: () -> String) { + if (isTraceEnabled) trace(msg()) +} + public inline fun Logger.debug(msg: () -> String) { if (isDebugEnabled) debug(msg()) }