From 551b860464a2cdeff95c98bd18d15e9884fe4f76 Mon Sep 17 00:00:00 2001 From: Fabrice Lecomte Date: Thu, 6 Apr 2023 21:12:41 +0200 Subject: [PATCH] Lint --- src/main/kotlin/fr/postgresjson/connexion/Requester.kt | 9 ++++----- src/main/kotlin/fr/postgresjson/definition/Function.kt | 5 ++--- src/main/kotlin/fr/postgresjson/utils/md5.kt | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/fr/postgresjson/connexion/Requester.kt b/src/main/kotlin/fr/postgresjson/connexion/Requester.kt index e67bc77..85c771b 100644 --- a/src/main/kotlin/fr/postgresjson/connexion/Requester.kt +++ b/src/main/kotlin/fr/postgresjson/connexion/Requester.kt @@ -10,13 +10,13 @@ class Requester( private val queries: MutableMap = mutableMapOf(), private val functions: MutableMap = mutableMapOf() ) { - constructor(connection: Connection): this(connection, mutableMapOf(), mutableMapOf()) + constructor(connection: Connection) : this(connection, mutableMapOf(), mutableMapOf()) constructor( connection: Connection, queriesDirectory: URI? = null, functionsDirectory: URI? = null - ): this( + ) : this( connection = connection, queries = queriesDirectory?.toQuery(connection) ?: mutableMapOf(), functions = functionsDirectory?.toFunction(connection) ?: mutableMapOf(), @@ -63,11 +63,10 @@ class Requester( fun getQuery(path: String): Query = queries[path] ?: throw NoQueryDefined(path) - fun inTransaction(block: Requester.() -> A?): A? = connection.inTransaction { this@Requester.block() } - class NoFunctionDefined(name: String): Exception("No function defined for $name") - class NoQueryDefined(path: String): Exception("No query defined in $path") + class NoFunctionDefined(name: String) : Exception("No function defined for $name") + class NoQueryDefined(path: String) : Exception("No query defined in $path") } diff --git a/src/main/kotlin/fr/postgresjson/definition/Function.kt b/src/main/kotlin/fr/postgresjson/definition/Function.kt index 381c38e..707a6eb 100644 --- a/src/main/kotlin/fr/postgresjson/definition/Function.kt +++ b/src/main/kotlin/fr/postgresjson/definition/Function.kt @@ -7,7 +7,7 @@ import java.nio.file.Path class Function( override val script: String, override val source: Path? = null -): Resource, ParametersInterface { +) : Resource, ParametersInterface { val returns: String override val name: String override val parameters: List @@ -48,7 +48,7 @@ class Function( } } - class FunctionNotFound(cause: Throwable? = null): Resource.ParseException("Function not found in script", cause) + class FunctionNotFound(cause: Throwable? = null) : Resource.ParseException("Function not found in script", cause) val definition: String get() { @@ -76,4 +76,3 @@ class Function( return other.script != this.script } } - diff --git a/src/main/kotlin/fr/postgresjson/utils/md5.kt b/src/main/kotlin/fr/postgresjson/utils/md5.kt index 248f4dd..d7bbba7 100644 --- a/src/main/kotlin/fr/postgresjson/utils/md5.kt +++ b/src/main/kotlin/fr/postgresjson/utils/md5.kt @@ -9,4 +9,4 @@ internal enum class Algorithm(name: String) { internal fun String.hash(algorithm: Algorithm): String { val md = MessageDigest.getInstance(algorithm.name) return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0') -} \ No newline at end of file +}