chore: Fix more detekt issues (#1772)

* chore: remove detekt SpacingAroundColon issues * chore: remove detekt ParameterListWrapping issues * chore: remove detekt SpacingAroundComma issues * chore: remove detekt Wrapping issues * chore: remove detekt NoConsecutiveBlankLines issues * chore: remove detekt NoUnusedImports issues * chore: remove detekt SpacingAroundOperators issues * chore: remove detekt MultiLineIfElse issues
JetBrains · Jun 27, 2023 · 22b4002 · 22b4002
1 parent 57c66af
commit 22b4002
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ColumnType.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/ColumnType.kt
@@ -911,7 +911,7 @@ open class JsonColumnType<T : Any>(
     val serialize: (T) -> String,
     /** Returns the function that decodes a JSON String to an object of type [T]. */
     val deserialize: (String) -> T
-): ColumnType() {
+) : ColumnType() {
     override fun sqlType(): String = currentDialect.dataTypeProvider.jsonType()
 
     override fun valueFromDB(value: Any): Any {

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt
@@ -70,8 +70,10 @@ open class InsertStatement<Key : Any>(val table: Table, val isIgnore: Boolean =
                     }
                 }
 
-                assert(isIgnore || autoGeneratedKeys.isEmpty() ||
-                           autoGeneratedKeys.size == inserted || currentDialect.supportsTernaryAffectedRowValues) {
+                assert(
+                    isIgnore || autoGeneratedKeys.isEmpty() || autoGeneratedKeys.size == inserted ||
+                        currentDialect.supportsTernaryAffectedRowValues
+                ) {
                     "Number of autoincs (${autoGeneratedKeys.size}) doesn't match number of batch entries ($inserted)"
                 }
             }

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/StatementInterceptor.kt
@@ -15,7 +15,7 @@ import org.jetbrains.exposed.sql.statements.api.PreparedStatementApi
 
 interface StatementInterceptor {
     fun beforeExecution(transaction: Transaction, context: StatementContext) {}
-    fun afterStatementPrepared(transaction : Transaction, preparedStatement: PreparedStatementApi) {}
+    fun afterStatementPrepared(transaction: Transaction, preparedStatement: PreparedStatementApi) {}
     fun afterExecution(transaction: Transaction, contexts: List<StatementContext>, executedStatement: PreparedStatementApi) {}
 
     fun beforeCommit(transaction: Transaction) {}

diff --git a/...e/src/main/kotlin/org/jetbrains/exposed/sql/transactions/ThreadLocalTransactionManager.kt b/...e/src/main/kotlin/org/jetbrains/exposed/sql/transactions/ThreadLocalTransactionManager.kt
@@ -259,7 +259,7 @@ fun <T> inTopLevelTransaction(
                 val delay = when {
                     minRepetitionDelay < maxRepetitionDelay -> {
                         intermediateDelay += retryInterval * repetitions
-                        ThreadLocalRandom.current().nextLong(intermediateDelay , intermediateDelay + retryInterval)
+                        ThreadLocalRandom.current().nextLong(intermediateDelay, intermediateDelay + retryInterval)
                     }
                     minRepetitionDelay == maxRepetitionDelay -> minRepetitionDelay
                     else -> 0

diff --git a/exposed-crypt/src/main/kotlin/org/jetbrains/exposed/crypt/Algorithms.kt b/exposed-crypt/src/main/kotlin/org/jetbrains/exposed/crypt/Algorithms.kt
@@ -30,7 +30,8 @@ object Algorithms {
                 { base64Encoder.encodeToString(encrypt(it.toByteArray())) },
                 { String(decrypt(base64Decoder.decode(it))) },
                 { inputLen ->
-                    base64EncodedLength(AES_256_GCM_BLOCK_LENGTH + inputLen + AES_256_GCM_TAG_LENGTH) }
+                    base64EncodedLength(AES_256_GCM_BLOCK_LENGTH + inputLen + AES_256_GCM_TAG_LENGTH)
+                }
             )
         }
     }
@@ -49,7 +50,8 @@ object Algorithms {
                 { String(decrypt(base64Decoder.decode(it))) },
                 { inputLen ->
                     val paddingSize = (AES_256_CBC_BLOCK_LENGTH - inputLen % AES_256_CBC_BLOCK_LENGTH)
-                    base64EncodedLength(AES_256_CBC_BLOCK_LENGTH + inputLen + paddingSize) }
+                    base64EncodedLength(AES_256_CBC_BLOCK_LENGTH + inputLen + paddingSize)
+                }
             )
         }
     }

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityCache.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityCache.kt
@@ -14,7 +14,7 @@ val Transaction.entityCache: EntityCache by transactionScope { EntityCache(this)
 class EntityCache(private val transaction: Transaction) {
     private var flushingEntities = false
     private var initializingEntities: LinkedIdentityHashSet<Entity<*>> = LinkedIdentityHashSet()
-    internal val pendingInitializationLambdas = IdentityHashMap<Entity<*>, MutableList<(Entity<*>)->Unit>>()
+    internal val pendingInitializationLambdas = IdentityHashMap<Entity<*>, MutableList<(Entity<*>) -> Unit>>()
     val data = LinkedHashMap<IdTable<*>, MutableMap<Any, Entity<*>>>()
     internal val inserts = LinkedHashMap<IdTable<*>, MutableSet<Entity<*>>>()
     private val updates = LinkedHashMap<IdTable<*>, MutableSet<Entity<*>>>()

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt
@@ -419,10 +419,14 @@ abstract class EntityClass<ID : Comparable<ID>, out T : Entity<ID>>(
         else -> findQuery
     }.toList()
 
-    internal fun <SID: Comparable<SID>> warmUpLinkedReferences(
-        references: List<EntityID<SID>>, sourceRefColumn: Column<EntityID<SID>>, targetRefColumn: Column<EntityID<ID>>, linkTable: Table,
-        forUpdate: Boolean? = null, optimizedLoad: Boolean = false
-    ) : List<T> {
+    internal fun <SID : Comparable<SID>> warmUpLinkedReferences(
+        references: List<EntityID<SID>>,
+        sourceRefColumn: Column<EntityID<SID>>,
+        targetRefColumn: Column<EntityID<ID>>,
+        linkTable: Table,
+        forUpdate: Boolean? = null,
+        optimizedLoad: Boolean = false
+    ): List<T> {
         if (references.isEmpty()) return emptyList()
         val distinctRefIds = references.distinct()
         val transaction = TransactionManager.current()
@@ -475,7 +479,7 @@ abstract class EntityClass<ID : Comparable<ID>, out T : Entity<ID>>(
      * Can be useful when references target the same entities. That will prevent from loading them multiple times (per each reference row) and will require
      * less memory/bandwidth for "heavy" entities (with a lot of columns or columns with huge data in it)
      */
-    fun <SID: Comparable<SID>> warmUpLinkedReferences(references: List<EntityID<SID>>, linkTable: Table, forUpdate: Boolean? = null, optimizedLoad: Boolean = false): List<T> {
+    fun <SID : Comparable<SID>> warmUpLinkedReferences(references: List<EntityID<SID>>, linkTable: Table, forUpdate: Boolean? = null, optimizedLoad: Boolean = false): List<T> {
         if (references.isEmpty()) return emptyList()
 
         val sourceRefColumn = linkTable.columns.singleOrNull { it.referee == references.first().table.id } as? Column<EntityID<SID>>
@@ -489,8 +493,6 @@ abstract class EntityClass<ID : Comparable<ID>, out T : Entity<ID>>(
     fun <ID : Comparable<ID>, T : Entity<ID>> isAssignableTo(entityClass: EntityClass<ID, T>) = entityClass.klass.isAssignableFrom(klass)
 }
 
-
-
 abstract class ImmutableEntityClass<ID : Comparable<ID>, out T : Entity<ID>>(
     table: IdTable<ID>,
     entityType: Class<T>? = null,

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityHook.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityHook.kt
@@ -53,7 +53,6 @@ fun Transaction.registerChange(entityClass: EntityClass<*, Entity<*>>, entityId:
     }
 }
 
-
 private var isProcessingEventsLaunched by transactionScope { false }
 fun Transaction.alertSubscribers() {
     if (isProcessingEventsLaunched) return

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityLifecycleInterceptor.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityLifecycleInterceptor.kt
@@ -76,8 +76,9 @@ class EntityLifecycleInterceptor : GlobalStatementInterceptor {
     }
 
     override fun afterExecution(transaction: Transaction, contexts: List<StatementContext>, executedStatement: PreparedStatementApi) {
-        if (!isExecutedWithinEntityLifecycle || contexts.first().statement !is InsertStatement<*>)
+        if (!isExecutedWithinEntityLifecycle || contexts.first().statement !is InsertStatement<*>) {
             transaction.alertSubscribers()
+        }
     }
 
     override fun beforeCommit(transaction: Transaction) {

diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/References.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/References.kt
@@ -228,7 +228,7 @@ private fun <ID : Comparable<ID>> List<Entity<ID>>.preloadRelations(
     }
 }
 
-fun <SRCID : Comparable<SRCID>, SRC : Entity<SRCID>, REF : Entity<*>, L: Iterable<SRC>> L.with(vararg relations: KProperty1<out REF, Any?>): L {
+fun <SRCID : Comparable<SRCID>, SRC : Entity<SRCID>, REF : Entity<*>, L : Iterable<SRC>> L.with(vararg relations: KProperty1<out REF, Any?>): L {
     toList().apply {
         if (any { it.isNewEntity() }) {
             TransactionManager.current().flushCache()

diff --git a/...kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/sql/kotlin/datetime/DefaultsTest.kt b/...kotlin-datetime/src/test/kotlin/org/jetbrains/exposed/sql/kotlin/datetime/DefaultsTest.kt
@@ -25,7 +25,6 @@ import org.jetbrains.exposed.sql.vendors.OracleDialect
 import org.jetbrains.exposed.sql.vendors.SQLServerDialect
 import org.jetbrains.exposed.sql.vendors.h2Mode
 import org.junit.Test
-import org.junit.runners.model.MultipleFailureException
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue