Fix ktlint (#178)

- bump up ktlint plugin version which supports kotlin 2.2.0
- disable some rules and follow two rules (enum wrapping, max line)

Author: chanhyeong

.editorconfig

@@ -2,8 +2,17 @@
 root = true
 
 [*.{kt, kts}]
-disabled_rules = import-ordering, indent
-# disable indent rule until https://github.com/pinterest/ktlint/issues/764 is fixed.
+disabled_rules = import-ordering
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_wrapping = disabled
+ktlint_standard_no-blank-line-in-list = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_class-signature = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_chain-method-continuation = disabled
+ktlint_standard_binary-expression-wrapping = disabled
+ktlint_standard_argument-list-wrapping = disabled
 
 [*]
 # [encoding-utf8]

guide-projects/plus-sql-java-kotlin-guide/src/main/java/com/navercorp/spring/data/jdbc/plus/sql/guide/board/sql/BoardSql.kt

@@ -26,7 +26,6 @@ import com.navercorp.spring.data.jdbc.plus.sql.support.SqlGeneratorSupport
  * @author Myeonghyeon Lee
  */
 class BoardSql : SqlGeneratorSupport() {
-
     fun selectGraphById(): String = """
         SELECT ${sql.aggregateColumns(Board::class.java)}
 

guide-projects/plus-sql-kotlin-guide/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("spring.jdbc.plus.spring-bom-conventions")
-    id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
+    id("org.jlleitschuh.gradle.ktlint") version "13.0.0"
     kotlin("jvm")
     kotlin("plugin.spring") version "1.9.20"
 }
@@ -12,6 +12,10 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.javaParameters = true
 }
 
+ktlint {
+    outputToConsole.set(true)
+}
+
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation(project(":spring-boot-starter-data-jdbc-plus-sql"))

guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/Application.kt

@@ -26,7 +26,6 @@ import org.springframework.boot.runApplication
  */
 @SpringBootApplication
 class Application {
-
     fun main(args: Array<String>) {
         runApplication<Application>(*args)
     }

guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/board/sql/BoardSql.kt

@@ -26,7 +26,6 @@ import com.navercorp.spring.data.jdbc.plus.sql.support.SqlGeneratorSupport
  * @author Myeonghyeon Lee
  */
 class BoardSql : SqlGeneratorSupport() {
-
     fun selectGraphById(): String = """
         SELECT ${sql.aggregateColumns(Board::class.java)}
 

guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/order/Order.kt

@@ -33,5 +33,6 @@ data class Order(
 )
 
 enum class OrderStatus {
-    PLACE, COMPLETED
+    PLACE,
+    COMPLETED
 }

guide-projects/plus-sql-kotlin-guide/src/main/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/order/OrderCriteria.kt

@@ -28,5 +28,6 @@ data class OrderCriteria(
 )
 
 enum class OrderSort {
-    ID, PRICE
+    ID,
+    PRICE
 }

guide-projects/plus-sql-kotlin-guide/src/test/kotlin/com/navercorp/spring/data/jdbc/plus/sql/guide/board/BoardRepositoryTest.kt

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.transaction.annotation.Transactional
-import java.util.Comparator
 import java.util.stream.Collectors
 
 /**
@@ -76,9 +75,12 @@ class BoardRepositoryTest {
                         )
                     ),
                     configMap = mapOf(
-                        "board1 post1 config-key" to Config(configKey = "board1 post1 config-key", configValue = "board1 post1 config-value"),
-                        "board1 post1 config-key2" to Config(configKey = "board1 post1 config-key2", configValue = "board1 post1 config-value2"),
-                        "board1 post1 config-key3" to Config(configKey = "board1 post1 config-key3", configValue = "board1 post1 config-value3")
+                        "board1 post1 config-key" to
+                            Config(configKey = "board1 post1 config-key", configValue = "board1 post1 config-value"),
+                        "board1 post1 config-key2" to
+                            Config(configKey = "board1 post1 config-key2", configValue = "board1 post1 config-value2"),
+                        "board1 post1 config-key3" to
+                            Config(configKey = "board1 post1 config-key3", configValue = "board1 post1 config-value3")
                     ),
                     audit = Audit(
                         name = "naver1",
@@ -435,7 +437,7 @@ class BoardRepositoryTest {
         }
         val actualLabels: List<Label> =
             actual.labels.stream().sorted(Comparator.comparingLong { obj: Label -> obj.id!! }).collect(Collectors.toList())
-        val boardLabels: List<Label> = actual.labels.stream().sorted(Comparator.comparingLong { obj: Label -> obj.id!! }).collect(Collectors.toList())
+        val boardLabels: List<Label> = actual.labels.sortedBy { it.id }
         assertLabelsEquals(actualLabels, boardLabels)
         val actualPosts: List<Post> = actual.posts
         val boardPosts: List<Post> = target.posts
@@ -482,8 +484,8 @@ class BoardRepositoryTest {
                 assertThat(actualPost.audit!!.secret!!.secret).isEqualTo(targetPost.audit!!.secret!!.secret)
             }
         }
-        val actualTags: List<Tag> = actualPost.tags.stream().sorted(Comparator.comparingLong { obj: Tag -> obj.id!! }).collect(Collectors.toList())
-        val postTags: List<Tag> = targetPost.tags.stream().sorted(Comparator.comparingLong { obj: Tag -> obj.id!! }).collect(Collectors.toList())
+        val actualTags: List<Tag> = actualPost.tags.sortedBy { it.id }
+        val postTags: List<Tag> = targetPost.tags.sortedBy { it.id }
         assertThat(actualTags.size).isEqualTo(postTags.size)
         for (i in actualTags.indices) {
             assertThat(actualTags[i].id).isEqualTo(postTags[i].id)