Ktlint version up (10.3.0 -> 11.6.1)

naver · Oct 25, 2023 · aa4dda9 · aa4dda9
1 parent 56579a2
commit aa4dda9
Show file tree

Hide file tree

Showing 145 changed files with 501 additions and 486 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -17,6 +17,12 @@ end_of_line = crlf
 [{*.kt, *.kts}]
 # [indentation-tab]
 indent_style = space
+# [allow-trailing-comma]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+# [disable-star-import]
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
 
 # [4-spaces-tab]
 indent_size = 4

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,6 +10,6 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
-    implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:10.3.0")
+    implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:11.6.1")
     implementation("org.jetbrains.kotlinx:kover:0.6.1")
 }
diff --git a/...s-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/BatchDsl.kt b/...s-kotlin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/BatchDsl.kt
@@ -45,7 +45,7 @@ class BatchDsl internal constructor(
         DslContext(
             beanFactory,
             jobRepository,
-        )
+        ),
     )
 
     operator fun <T : Any> invoke(init: BatchDsl.() -> T): T = init()

diff --git a/...ain/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/ConcreteFlowBuilderDsl.kt b/...ain/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/ConcreteFlowBuilderDsl.kt
@@ -34,7 +34,7 @@ import org.springframework.core.task.TaskExecutor
 @BatchDslMarker
 internal class ConcreteFlowBuilderDsl<T : Any> internal constructor(
     private val dslContext: DslContext,
-    private var flowBuilder: FlowBuilder<T>
+    private var flowBuilder: FlowBuilder<T>,
 ) : FlowBuilderDsl<T> {
     private var started = false
 
@@ -83,7 +83,7 @@ internal class ConcreteFlowBuilderDsl<T : Any> internal constructor(
     override fun step(
         name: String,
         stepInit: StepBuilderDsl.() -> Step,
-        stepTransitionInit: StepTransitionBuilderDsl<T>.() -> Unit
+        stepTransitionInit: StepTransitionBuilderDsl<T>.() -> Unit,
     ) {
         val stepBuilder = StepBuilder(name, this.dslContext.jobRepository)
         val step = StepBuilderDsl(this.dslContext, stepBuilder).let(stepInit)
@@ -152,7 +152,7 @@ internal class ConcreteFlowBuilderDsl<T : Any> internal constructor(
     override fun flow(
         name: String,
         flowInit: FlowBuilderDsl<Flow>.() -> Unit,
-        flowTransitionInit: FlowTransitionBuilderDsl<T>.() -> Unit
+        flowTransitionInit: FlowTransitionBuilderDsl<T>.() -> Unit,
     ) {
         val flowBuilder = FlowBuilder<Flow>(name)
         val flow = ConcreteFlowBuilderDsl(this.dslContext, flowBuilder).apply(flowInit)
@@ -181,7 +181,7 @@ internal class ConcreteFlowBuilderDsl<T : Any> internal constructor(
      */
     override fun deciderBean(
         name: String,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit,
     ) {
         val decider = this.dslContext.beanFactory.getBean<JobExecutionDecider>(name)
         decider(decider, deciderTransitionInit)
@@ -192,7 +192,7 @@ internal class ConcreteFlowBuilderDsl<T : Any> internal constructor(
      */
     override fun decider(
         decider: JobExecutionDecider,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit,
     ) {
         val baseUnterminatedFlowBuilder = if (!started) {
             this.started = true

diff --git a/...otlin/com/navercorp/spring/batch/plus/kotlin/configuration/DeciderTransitionBuilderDsl.kt b/...otlin/com/navercorp/spring/batch/plus/kotlin/configuration/DeciderTransitionBuilderDsl.kt
@@ -32,7 +32,7 @@ import org.springframework.batch.core.job.flow.JobExecutionDecider
 class DeciderTransitionBuilderDsl<T : Any> internal constructor(
     private val dslContext: DslContext,
     private val decider: JobExecutionDecider,
-    private val baseUnterminatedFlowBuilder: FlowBuilder.UnterminatedFlowBuilder<T>
+    private val baseUnterminatedFlowBuilder: FlowBuilder.UnterminatedFlowBuilder<T>,
 ) {
     private var flowBuilder: FlowBuilder<T>? = null
 

diff --git a/...in/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowBuilderDsl.kt b/...in/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowBuilderDsl.kt
@@ -59,7 +59,7 @@ interface FlowBuilderDsl<T : Any> {
     fun step(
         name: String,
         stepInit: StepBuilderDsl.() -> Step,
-        stepTransitionInit: StepTransitionBuilderDsl<T>.() -> Unit
+        stepTransitionInit: StepTransitionBuilderDsl<T>.() -> Unit,
     )
 
     /**
@@ -93,7 +93,7 @@ interface FlowBuilderDsl<T : Any> {
     fun flow(
         name: String,
         flowInit: FlowBuilderDsl<Flow>.() -> Unit,
-        flowTransitionInit: FlowTransitionBuilderDsl<T>.() -> Unit
+        flowTransitionInit: FlowTransitionBuilderDsl<T>.() -> Unit,
     )
 
     /**
@@ -106,15 +106,15 @@ interface FlowBuilderDsl<T : Any> {
      */
     fun deciderBean(
         name: String,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit,
     )
 
     /**
      * Add decider with transition.
      */
     fun decider(
         decider: JobExecutionDecider,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<T>.() -> Unit,
     )
 
     /**

diff --git a/...src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowJobBuilderDsl.kt b/...src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowJobBuilderDsl.kt
@@ -30,7 +30,7 @@ import org.springframework.batch.core.job.builder.FlowJobBuilder
 internal class FlowJobBuilderDsl internal constructor(
     @Suppress("unused")
     private val dslContext: DslContext,
-    private val delegate: ConcreteFlowBuilderDsl<FlowJobBuilder>
+    private val delegate: ConcreteFlowBuilderDsl<FlowJobBuilder>,
 ) : FlowBuilderDsl<FlowJobBuilder> by delegate {
 
     internal fun build(): Job = this.delegate.build()

diff --git a/...n/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowTransitionBuilderDsl.kt b/...n/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/FlowTransitionBuilderDsl.kt
@@ -32,7 +32,7 @@ import org.springframework.batch.core.job.flow.Flow
 class FlowTransitionBuilderDsl<T : Any> internal constructor(
     private val dslContext: DslContext,
     private val flow: Flow,
-    private val baseFlowBuilder: FlowBuilder<T>
+    private val baseFlowBuilder: FlowBuilder<T>,
 ) {
     private var flowBuilder: FlowBuilder<T>? = null
 

diff --git a/...lin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/JobBuilderDsl.kt b/...lin/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/JobBuilderDsl.kt
@@ -47,7 +47,7 @@ import org.springframework.core.task.TaskExecutor
 @BatchDslMarker
 class JobBuilderDsl internal constructor(
     private val dslContext: DslContext,
-    private val jobBuilder: JobBuilder
+    private val jobBuilder: JobBuilder,
 ) : FlowBuilderDsl<FlowJobBuilder> {
 
     private var lazyConfigurer = LazyConfigurer<JobBuilderHelper<*>>()
@@ -172,7 +172,7 @@ class JobBuilderDsl internal constructor(
     override fun step(
         name: String,
         stepInit: StepBuilderDsl.() -> Step,
-        stepTransitionInit: StepTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        stepTransitionInit: StepTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         this.lazyFlowConfigurer.add {
             it.step(name, stepInit, stepTransitionInit)
@@ -218,7 +218,7 @@ class JobBuilderDsl internal constructor(
     override fun flow(
         name: String,
         flowInit: FlowBuilderDsl<Flow>.() -> Unit,
-        flowTransitionInit: FlowTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        flowTransitionInit: FlowTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         this.lazyFlowConfigurer.add {
             it.flow(name, flowInit, flowTransitionInit)
@@ -235,7 +235,7 @@ class JobBuilderDsl internal constructor(
 
     override fun deciderBean(
         name: String,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         this.lazyFlowConfigurer.add {
             it.deciderBean(name, deciderTransitionInit)
@@ -245,7 +245,7 @@ class JobBuilderDsl internal constructor(
 
     override fun decider(
         decider: JobExecutionDecider,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         this.lazyFlowConfigurer.add {
             it.decider(decider, deciderTransitionInit)

diff --git a/...c/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SimpleJobBuilderDsl.kt b/...c/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SimpleJobBuilderDsl.kt
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.getBean
 @BatchDslMarker
 internal class SimpleJobBuilderDsl internal constructor(
     private val dslContext: DslContext,
-    private val simpleJobBuilder: SimpleJobBuilder
+    private val simpleJobBuilder: SimpleJobBuilder,
 ) {
 
     fun stepBean(name: String) {

diff --git a/...kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SimpleJobBuilderDslAdapter.kt b/...kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SimpleJobBuilderDslAdapter.kt
@@ -31,7 +31,7 @@ import org.springframework.core.task.TaskExecutor
  */
 @BatchDslMarker
 internal class SimpleJobBuilderDslAdapter internal constructor(
-    private val simpleJobBuilderDsl: SimpleJobBuilderDsl
+    private val simpleJobBuilderDsl: SimpleJobBuilderDsl,
 ) : FlowBuilderDsl<FlowJobBuilder> {
 
     override fun stepBean(name: String) {
@@ -53,7 +53,7 @@ internal class SimpleJobBuilderDslAdapter internal constructor(
     override fun step(
         name: String,
         stepInit: StepBuilderDsl.() -> Step,
-        stepTransitionInit: StepTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        stepTransitionInit: StepTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         throw UnsupportedOperationException("SimpleJob can't process flow.")
     }
@@ -81,7 +81,7 @@ internal class SimpleJobBuilderDslAdapter internal constructor(
     override fun flow(
         name: String,
         flowInit: FlowBuilderDsl<Flow>.() -> Unit,
-        flowTransitionInit: FlowTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        flowTransitionInit: FlowTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         throw UnsupportedOperationException("SimpleJob can't process flow.")
     }
@@ -92,14 +92,14 @@ internal class SimpleJobBuilderDslAdapter internal constructor(
 
     override fun deciderBean(
         name: String,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         throw UnsupportedOperationException("SimpleJob can't process flow.")
     }
 
     override fun decider(
         decider: JobExecutionDecider,
-        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit
+        deciderTransitionInit: DeciderTransitionBuilderDsl<FlowJobBuilder>.() -> Unit,
     ) {
         throw UnsupportedOperationException("SimpleJob can't process flow.")
     }

diff --git a/...n/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SplitBuilderDsl.kt b/...n/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/SplitBuilderDsl.kt
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.getBean
 @BatchDslMarker
 class SplitBuilderDsl<T : Any> internal constructor(
     private val dslContext: DslContext,
-    private val splitBuilder: FlowBuilder.SplitBuilder<T>
+    private val splitBuilder: FlowBuilder.SplitBuilder<T>,
 ) {
     private var flows = mutableListOf<Flow>()
 

diff --git a/...in/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/StepBuilderDsl.kt b/...in/src/main/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/StepBuilderDsl.kt
@@ -51,7 +51,7 @@ import org.springframework.transaction.PlatformTransactionManager
 @BatchDslMarker
 class StepBuilderDsl internal constructor(
     private val dslContext: DslContext,
-    private val stepBuilder: StepBuilder
+    private val stepBuilder: StepBuilder,
 ) {
 
     /**
@@ -123,7 +123,7 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("taskletBean(name, transactionManager)")
+        replaceWith = ReplaceWith("taskletBean(name, transactionManager)"),
     )
     fun taskletBean(name: String): Step {
         return taskletBean(name) {}
@@ -135,7 +135,7 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("taskletBean(name, transactionManager, taskletStepInit)")
+        replaceWith = ReplaceWith("taskletBean(name, transactionManager, taskletStepInit)"),
     )
     fun taskletBean(name: String, taskletStepInit: TaskletStepBuilderDsl.() -> Unit): Step {
         val tasklet = this.dslContext.beanFactory.getBean<Tasklet>(name)
@@ -148,7 +148,7 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("tasklet(tasklet, transactionManager)")
+        replaceWith = ReplaceWith("tasklet(tasklet, transactionManager)"),
     )
     fun tasklet(tasklet: Tasklet): Step {
         return tasklet(tasklet) {}
@@ -160,7 +160,7 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("tasklet(tasklet, transactionManager, taskletStepInit)")
+        replaceWith = ReplaceWith("tasklet(tasklet, transactionManager, taskletStepInit)"),
     )
     fun tasklet(tasklet: Tasklet, taskletStepInit: TaskletStepBuilderDsl.() -> Unit): Step {
         val taskletStepBuilder = this.stepBuilder.tasklet(tasklet)
@@ -174,7 +174,7 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("chunk(chunkSize, transactionManager, simpleStepInit)")
+        replaceWith = ReplaceWith("chunk(chunkSize, transactionManager, simpleStepInit)"),
     )
     fun <I : Any, O : Any> chunk(chunkSize: Int, simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit): Step {
         val simpleStepBuilder = this.stepBuilder.chunk<I, O>(chunkSize)
@@ -188,11 +188,11 @@ class StepBuilderDsl internal constructor(
     @Suppress("DEPRECATION")
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("chunk(completionPolicy, transactionManager, simpleStepInit)")
+        replaceWith = ReplaceWith("chunk(completionPolicy, transactionManager, simpleStepInit)"),
     )
     fun <I : Any, O : Any> chunk(
         completionPolicy: CompletionPolicy,
-        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit
+        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit,
     ): Step {
         val simpleStepBuilder = this.stepBuilder.chunk<I, O>(completionPolicy)
         return SimpleStepBuilderDsl(this.dslContext, simpleStepBuilder).apply(simpleStepInit)
@@ -204,11 +204,11 @@ class StepBuilderDsl internal constructor(
      */
     @Deprecated(
         message = "spring batch 5.0.0 deprecates this",
-        replaceWith = ReplaceWith("chunk(repeatOperations, transactionManager, simpleStepInit)")
+        replaceWith = ReplaceWith("chunk(repeatOperations, transactionManager, simpleStepInit)"),
     )
     fun <I : Any, O : Any> chunk(
         repeatOperations: RepeatOperations,
-        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit
+        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit,
     ): Step {
         val simpleStepBuilder = SimpleStepBuilder<I, O>(this.stepBuilder).chunkOperations(repeatOperations)
         return SimpleStepBuilderDsl(this.dslContext, simpleStepBuilder).apply(simpleStepInit)
@@ -231,7 +231,7 @@ class StepBuilderDsl internal constructor(
     fun taskletBean(
         name: String,
         transactionManager: PlatformTransactionManager,
-        taskletStepInit: TaskletStepBuilderDsl.() -> Unit
+        taskletStepInit: TaskletStepBuilderDsl.() -> Unit,
     ): Step {
         val tasklet = this.dslContext.beanFactory.getBean<Tasklet>(name)
         return tasklet(tasklet, transactionManager, taskletStepInit)
@@ -253,7 +253,7 @@ class StepBuilderDsl internal constructor(
     fun tasklet(
         tasklet: Tasklet,
         transactionManager: PlatformTransactionManager,
-        taskletStepInit: TaskletStepBuilderDsl.() -> Unit
+        taskletStepInit: TaskletStepBuilderDsl.() -> Unit,
     ): Step {
         val taskletStepBuilder = this.stepBuilder.tasklet(tasklet, transactionManager)
         return TaskletStepBuilderDsl(this.dslContext, taskletStepBuilder).apply(taskletStepInit)
@@ -266,7 +266,7 @@ class StepBuilderDsl internal constructor(
     fun <I : Any, O : Any> chunk(
         chunkSize: Int,
         transactionManager: PlatformTransactionManager,
-        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit
+        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit,
     ): Step {
         val simpleStepBuilder = this.stepBuilder.chunk<I, O>(chunkSize, transactionManager)
         return SimpleStepBuilderDsl(this.dslContext, simpleStepBuilder).apply(simpleStepInit)
@@ -279,7 +279,7 @@ class StepBuilderDsl internal constructor(
     fun <I : Any, O : Any> chunk(
         completionPolicy: CompletionPolicy,
         transactionManager: PlatformTransactionManager,
-        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit
+        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit,
     ): Step {
         val simpleStepBuilder = this.stepBuilder.chunk<I, O>(completionPolicy, transactionManager)
         return SimpleStepBuilderDsl(this.dslContext, simpleStepBuilder).apply(simpleStepInit)
@@ -292,7 +292,7 @@ class StepBuilderDsl internal constructor(
     fun <I : Any, O : Any> chunk(
         repeatOperations: RepeatOperations,
         transactionManager: PlatformTransactionManager,
-        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit
+        simpleStepInit: SimpleStepBuilderDsl<I, O>.() -> Unit,
     ): Step {
         val simpleStepBuilder = SimpleStepBuilder<I, O>(this.stepBuilder).apply {
             transactionManager(transactionManager)

diff --git a/...n/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/StepTransitionBuilderDsl.kt b/...n/kotlin/com/navercorp/spring/batch/plus/kotlin/configuration/StepTransitionBuilderDsl.kt
@@ -33,7 +33,7 @@ import org.springframework.batch.core.job.builder.FlowBuilder
 class StepTransitionBuilderDsl<T : Any> internal constructor(
     private val dslContext: DslContext,
     private val step: Step,
-    private val baseFlowBuilder: FlowBuilder<T>
+    private val baseFlowBuilder: FlowBuilder<T>,
 ) {
     private var flowBuilder: FlowBuilder<T>? = null