Update Komapper to v0.26.0 (#78)

nakamura-to · web-flow · commit 10279cdc9dc9 · 2022-01-10T02:11:55.000+09:00
* Introduce new features

* Use Ktlint Gradle instead of Spotless plugin for Gradle

* Add the spring native example

* Build with JDK 11

* Update Komapper to v0.26.0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 11
 
       - name: Assemble and Check
         uses: gradle/gradle-build-action@v2
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,33 +1,46 @@
 plugins {
     java
     kotlin("jvm")
-    id("com.diffplug.spotless") version "6.1.2"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
-val ktlintVersion: String by project
-
 val springBootProjects = subprojects.filter {
     it.name.startsWith("spring-boot") || it.name == "jpetstore"
 }
 
 allprojects {
     apply(plugin = "base")
-    apply(plugin = "com.diffplug.spotless")
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+
+    ktlint {
+        filter {
+            exclude("build/**")
+            if (project.name == "codegen") {
+                exclude("src/**")
+            }
+        }
+    }
 
     repositories {
-        mavenCentral()
         mavenLocal()
+        mavenCentral()
+        maven { url = uri("https://repo.spring.io/release") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        maven { url = uri("https://repo.spring.io/snapshot") }
     }
 
-    spotless {
-        kotlinGradle {
-            ktlint(ktlintVersion)
+    tasks {
+        val pairs = listOf(
+            "ktlintKotlinScriptCheck" to "ktlintKotlinScriptFormat",
+            "ktlintMainSourceSetCheck" to "ktlintMainSourceSetFormat",
+            "ktlintTestSourceSetCheck" to "ktlintTestSourceSetFormat",
+        )
+        for ((checkTask, formatTask) in pairs) {
+            findByName(checkTask)?.mustRunAfter(formatTask)
         }
-    }
 
-    tasks {
         build {
-            dependsOn(spotlessApply)
+            dependsOn("ktlintFormat")
         }
     }
 }
@@ -44,12 +57,9 @@ subprojects {
         }
     }
 
-    if (project.name != "codegen") {
-        spotless {
-            kotlin {
-                targetExclude("build/**")
-                ktlint(ktlintVersion)
-            }
+    kotlin {
+        jvmToolchain {
+            (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
         }
     }
 
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
@@ -13,15 +13,18 @@ buildscript {
 
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
     id("org.komapper.gradle")
 }
 
 val komapperVersion: String by project
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
diff --git a/comparison-with-exposed/build.gradle.kts b/comparison-with-exposed/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
 }
 
@@ -15,9 +16,11 @@ dependencies {
     ksp("org.komapper:komapper-processor:$komapperVersion")
 }
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
diff --git a/console-jdbc/build.gradle.kts b/console-jdbc/build.gradle.kts
@@ -1,13 +1,16 @@
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
 }
 
 val komapperVersion: String by project
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
diff --git a/console-r2dbc/build.gradle.kts b/console-r2dbc/build.gradle.kts
@@ -1,13 +1,16 @@
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
 }
 
 val komapperVersion: String by project
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -5,6 +5,5 @@ group=org.komapper
 version=0.0.1
 
 kotlinVersion=1.5.31
-komapperVersion=0.25.0
+komapperVersion=0.26.0
 kspVersion=1.5.31-1.0.1
-ktlintVersion=0.43.0
diff --git a/jpetstore/build.gradle.kts b/jpetstore/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    idea
     id("org.springframework.boot") version "2.6.2"
     id("com.google.devtools.ksp")
     kotlin("plugin.spring")
@@ -8,12 +9,11 @@ apply(plugin = "io.spring.dependency-management")
 
 val komapperVersion: String by project
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDirs("build/generated/ksp/main/kotlin")
-    }
-    jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
@@ -29,6 +29,7 @@ repositories {
 
 dependencies {
     implementation("org.komapper:komapper-spring-boot-starter-jdbc:$komapperVersion")
+    implementation("org.komapper:komapper-sqlcommenter:$komapperVersion")
     implementation("org.komapper:komapper-dialect-h2-jdbc:$komapperVersion")
     ksp("org.komapper:komapper-processor:$komapperVersion")
 
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/model/OrderAggregate.kt b/jpetstore/src/main/kotlin/org/komapper/example/model/OrderAggregate.kt
@@ -8,6 +8,6 @@ import org.komapper.example.entity.Product
 class OrderAggregate(
     val order: Order,
     val orderStatus: OrderStatus,
-    val lineItemList: List<LineItem>,
+    val lineItemSet: Set<LineItem>,
     val lineItem_product: Map<LineItem, Product?>,
 )
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/model/ProductAggregate.kt b/jpetstore/src/main/kotlin/org/komapper/example/model/ProductAggregate.kt
@@ -5,5 +5,5 @@ import org.komapper.example.entity.Product
 
 class ProductAggregate(
     val product: Product,
-    val itemList: List<Item>,
+    val itemSet: Set<Item>,
 )
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/repository/AccountRepository.kt b/jpetstore/src/main/kotlin/org/komapper/example/repository/AccountRepository.kt
@@ -37,9 +37,9 @@ class AccountRepository(private val db: JdbcDatabase) {
             .includeAll()
         val store = db.runQuery(query)
         return AccountAggregate(
-            account = store.list(a).single(),
-            profile = store.list(p).single(),
-            signOn = store.list(s).single(),
+            account = store[a].single(),
+            profile = store[p].single(),
+            signOn = store[s].single(),
         )
     }
 
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/repository/ItemRepository.kt b/jpetstore/src/main/kotlin/org/komapper/example/repository/ItemRepository.kt
@@ -24,11 +24,11 @@ class ItemRepository(private val db: JdbcDatabase) {
             .where { item.itemId eq itemId }
             .includeAll()
         val store = db.runQuery(query)
-        return store.list(item).firstOrNull()?.let {
+        return store[item].firstOrNull()?.let {
             ItemAggregate(
                 item = it,
-                inventory = store.list(inv).single(),
-                product = store.list(p).single()
+                inventory = store[inv].single(),
+                product = store[p].single()
             )
         }
     }
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/repository/OrderRepository.kt b/jpetstore/src/main/kotlin/org/komapper/example/repository/OrderRepository.kt
@@ -37,11 +37,11 @@ class OrderRepository(private val db: JdbcDatabase) {
             .where { o.orderId eq orderId }
             .includeAll()
         val store = db.runQuery(query)
-        return store.list(o).firstOrNull()?.let {
+        return store[o].firstOrNull()?.let {
             OrderAggregate(
                 order = it,
-                orderStatus = store.list(os).first(),
-                lineItemList = store.list(li),
+                orderStatus = store[os].first(),
+                lineItemSet = store[li],
                 lineItem_product = store.oneToOne(li, p)
             )
         }
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/repository/ProductRepository.kt b/jpetstore/src/main/kotlin/org/komapper/example/repository/ProductRepository.kt
@@ -39,10 +39,10 @@ class ProductRepository(private val db: JdbcDatabase) {
             .where { p.productId eq productId }
             .includeAll()
         val store = db.runQuery(query)
-        return store.list(p).firstOrNull()?.let {
+        return store[p].firstOrNull()?.let {
             ProductAggregate(
                 product = it,
-                itemList = store.list(item),
+                itemSet = store[item],
             )
         }
     }
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/web/controller/HistoryController.kt b/jpetstore/src/main/kotlin/org/komapper/example/web/controller/HistoryController.kt
@@ -33,7 +33,7 @@ class HistoryController(private val orderService: OrderService) {
             ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "orderId=$orderId not found")
         model.addAttribute("order", orderAggregate.order)
         model.addAttribute("orderStatus", orderAggregate.orderStatus)
-        model.addAttribute("lineItemList", orderAggregate.lineItemList)
+        model.addAttribute("lineItemList", orderAggregate.lineItemSet)
         model.addAttribute("lineItem_product", orderAggregate.lineItem_product)
         return "history/detail"
     }
diff --git a/jpetstore/src/main/kotlin/org/komapper/example/web/controller/ProductController.kt b/jpetstore/src/main/kotlin/org/komapper/example/web/controller/ProductController.kt
@@ -19,7 +19,7 @@ class ProductController(private val productService: ProductService) {
         val productAggregate = productService.getProductAggregate(productId)
             ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "productId=$productId not found")
         model.addAttribute("product", productAggregate.product)
-        model.addAttribute("itemList", productAggregate.itemList)
+        model.addAttribute("itemList", productAggregate.itemSet)
         return "product/list"
     }
 }
diff --git a/kweet/build.gradle.kts b/kweet/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
 }
 
@@ -35,15 +36,17 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
-sourceSets {
-    main {
-        resources.srcDir("resources")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
 kotlin {
     sourceSets.main {
-        kotlin.srcDirs("src", "build/generated/ksp/main/kotlin")
+        kotlin.srcDirs("src")
     }
     sourceSets.test {
         kotlin.srcDirs("test")
@@ -53,6 +56,12 @@ kotlin {
     }
 }
 
+sourceSets {
+    main {
+        resources.srcDir("resources")
+    }
+}
+
 ksp {
     arg("komapper.namingStrategy", "lower_snake_case")
 }
diff --git a/kweet/src/dao/DAOFacadeKomapper.kt b/kweet/src/dao/DAOFacadeKomapper.kt
@@ -32,7 +32,7 @@ class DAOFacadeKomapper(
     }
 
     override suspend fun countReplies(id: Int): Int {
-        val query = QueryDsl.from(k).where { k.replyTo eq id }.selectNotNull(count(k.id)).first()
+        val query = QueryDsl.from(k).where { k.replyTo eq id }.selectNotNull(count(k.id))
         return db.runQuery(query).toInt()
     }
 
diff --git a/repository-pattern-jdbc/build.gradle.kts b/repository-pattern-jdbc/build.gradle.kts
@@ -1,13 +1,16 @@
 plugins {
     application
+    idea
     id("com.google.devtools.ksp")
 }
 
 val komapperVersion: String by project
 
-kotlin {
-    sourceSets.main {
-        kotlin.srcDir("build/generated/ksp/main/kotlin")
+idea {
+    module {
+        sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")
+        testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")
+        generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,10 +1,19 @@
 pluginManagement {
+    repositories {
+        mavenLocal()
+        maven { url = uri("https://repo.spring.io/release") }
+        maven { url = uri("https://repo.spring.io/milestone") }
+        maven { url = uri("https://repo.spring.io/snapshot") }
+        gradlePluginPortal()
+        mavenCentral()
+    }
     val kotlinVersion: String by settings
     val komapperVersion: String by settings
     val kspVersion: String by settings
     plugins {
         id("org.jetbrains.kotlin.jvm") version kotlinVersion
         id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
+        id("org.jetbrains.kotlin.plugin.serialization") version kotlinVersion
         id("org.komapper.gradle") version komapperVersion
         id("com.google.devtools.ksp") version kspVersion
     }
@@ -20,3 +29,4 @@ include("comparison-with-exposed")
 include("repository-pattern-jdbc")
 include("jpetstore")
 include("kweet")
+include("spring-native-jdbc")
diff --git a/spring-boot-jdbc/build.gradle.kts b/spring-boot-jdbc/build.gradle.kts
diff --git a/spring-boot-r2dbc/build.gradle.kts b/spring-boot-r2dbc/build.gradle.kts
diff --git a/spring-native-jdbc/build.gradle.kts b/spring-native-jdbc/build.gradle.kts
diff --git a/spring-native-jdbc/src/main/kotlin/org/komapper/example/Application.kt b/spring-native-jdbc/src/main/kotlin/org/komapper/example/Application.kt
diff --git a/spring-native-jdbc/src/main/kotlin/org/komapper/example/Message.kt b/spring-native-jdbc/src/main/kotlin/org/komapper/example/Message.kt
diff --git a/spring-native-jdbc/src/main/resources/application.properties b/spring-native-jdbc/src/main/resources/application.properties
diff --git a/spring-native-jdbc/src/main/resources/data.sql b/spring-native-jdbc/src/main/resources/data.sql
diff --git a/spring-native-jdbc/src/main/resources/schema.sql b/spring-native-jdbc/src/main/resources/schema.sql
diff --git a/spring-native-jdbc/src/test/kotlin/org/komapper/example/ApplicationTest.kt b/spring-native-jdbc/src/test/kotlin/org/komapper/example/ApplicationTest.kt

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,18 @@ buildscript {`
`13`	`13`
`14`	`14`	`plugins {`
`15`	`15`	`application`
	`16`	`+ idea`
`16`	`17`	`id("com.google.devtools.ksp")`
`17`	`18`	`id("org.komapper.gradle")`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`val komapperVersion: String by project`
`21`	`22`
`22`		`-kotlin {`
`23`		`- sourceSets.main {`
`24`		`- kotlin.srcDir("build/generated/ksp/main/kotlin")`
	`23`	`+idea {`
	`24`	`+ module {`
	`25`	`+ sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")`
	`26`	`+ testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")`
	`27`	`+ generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`application`
	`3`	`+ idea`
`3`	`4`	`id("com.google.devtools.ksp")`
`4`	`5`	`}`
`5`	`6`
`@@ -15,9 +16,11 @@ dependencies {`
`15`	`16`	`ksp("org.komapper:komapper-processor:$komapperVersion")`
`16`	`17`	`}`
`17`	`18`
`18`		`-kotlin {`
`19`		`- sourceSets.main {`
`20`		`- kotlin.srcDir("build/generated/ksp/main/kotlin")`
	`19`	`+idea {`
	`20`	`+ module {`
	`21`	`+ sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")`
	`22`	`+ testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")`
	`23`	`+ generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")`
`21`	`24`	`}`
`22`	`25`	`}`
`23`	`26`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,16 @@`
`1`	`1`	`plugins {`
`2`	`2`	`application`
	`3`	`+ idea`
`3`	`4`	`id("com.google.devtools.ksp")`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`val komapperVersion: String by project`
`7`	`8`
`8`		`-kotlin {`
`9`		`- sourceSets.main {`
`10`		`- kotlin.srcDir("build/generated/ksp/main/kotlin")`
	`9`	`+idea {`
	`10`	`+ module {`
	`11`	`+ sourceDirs = sourceDirs + file("build/generated/ksp/main/kotlin")`
	`12`	`+ testSourceDirs = testSourceDirs + file("build/generated/ksp/test/kotlin")`
	`13`	`+ generatedSourceDirs = generatedSourceDirs + file("build/generated/ksp/main/kotlin") + file("build/generated/ksp/test/kotlin")`
`11`	`14`	`}`
`12`	`15`	`}`
`13`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ import org.komapper.example.entity.Product`
`8`	`8`	`class OrderAggregate(`
`9`	`9`	`val order: Order,`
`10`	`10`	`val orderStatus: OrderStatus,`
`11`		`- val lineItemList: List<LineItem>,`
	`11`	`+ val lineItemSet: Set<LineItem>,`
`12`	`12`	`val lineItem_product: Map<LineItem, Product?>,`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ import org.komapper.example.entity.Product`
`5`	`5`
`6`	`6`	`class ProductAggregate(`
`7`	`7`	`val product: Product,`
`8`		`- val itemList: List<Item>,`
	`8`	`+ val itemSet: Set<Item>,`
`9`	`9`	`)`