Upgrade http4k, gradle, java. Tweaks to PGclient implementation (#8845)

daviddenton · web-flow · commit 53352ca373fd · 2024-04-09T09:45:58.000-07:00
* Update versions of gradle, http4k etc

* Update versions of gradle in dockerfile

* Downgrade pgclient

* Upgrade pgclient

* update postgres database for pgclient

* tweak

* tweak to postgres client
diff --git a/frameworks/Kotlin/http4k/build.gradle.kts b/frameworks/Kotlin/http4k/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.js.translate.context.Namer.kotlin
 
 plugins {
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "1.9.23"
     application
 }
 
@@ -35,14 +35,14 @@ allprojects {
     }
 
     java {
-        sourceCompatibility = VERSION_20
-        targetCompatibility = VERSION_20
+        sourceCompatibility = VERSION_21
+        targetCompatibility = VERSION_21
     }
 
     tasks {
         withType<KotlinCompile> {
             kotlinOptions {
-                jvmTarget = "20"
+                jvmTarget = "21"
                 allWarningsAsErrors = true
             }
         }
diff --git a/frameworks/Kotlin/http4k/core-jdbc/build.gradle.kts b/frameworks/Kotlin/http4k/core-jdbc/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
     api(project(":core"))
-    api("com.zaxxer:HikariCP:5.0.1")
-    api("org.postgresql:postgresql:42.5.0")
+    api("com.zaxxer:HikariCP:5.1.0")
+    api("org.postgresql:postgresql:42.7.3")
 }
diff --git a/frameworks/Kotlin/http4k/core-pgclient/src/main/kotlin/PostgresDatabase.kt b/frameworks/Kotlin/http4k/core-pgclient/src/main/kotlin/PostgresDatabase.kt
@@ -1,6 +1,4 @@
 import io.vertx.core.Future
-import io.vertx.core.Vertx
-import io.vertx.core.VertxOptions
 import io.vertx.pgclient.PgConnectOptions
 import io.vertx.pgclient.PgPool.client
 import io.vertx.sqlclient.PoolOptions
@@ -11,13 +9,7 @@ import java.util.Random
 
 
 class PostgresDatabase : Database {
-    private val queryPool: SqlClient
-    private val updatePool: SqlClient
-
-    private val random = Random()
-
-    init {
-        val vertx = Vertx.vertx(VertxOptions().setPreferNativeTransport(true))
+    private val dbPool = run {
         val connectOptions = PgConnectOptions().apply {
             port = 5432
             cachePreparedStatements = true
@@ -26,52 +18,53 @@ class PostgresDatabase : Database {
             user = "benchmarkdbuser"
             password = "benchmarkdbpass"
         }
-        val clientOptions = PoolOptions().setMaxSize(64)
-        queryPool = client(vertx, connectOptions, clientOptions)
-        updatePool = client(vertx, connectOptions, clientOptions)
+        client(connectOptions, PoolOptions().apply { maxSize = 64 })
     }
 
-    override fun findWorld() =
-        queryPool.findWorld(random.world()).toCompletionStage().toCompletableFuture().get()
+    private val random = Random()
+
+    override fun findWorld() = dbPool.findWorld(random.world())
 
-    override fun loadAll() = queryPool.preparedQuery("SELECT id, randomnumber FROM world ")
+    override fun loadAll() = dbPool.preparedQuery("SELECT id, randomnumber FROM world")
         .execute()
         .map { it.map(::toWorld) }
-        .toCompletionStage().toCompletableFuture().get()
+        .awaitComplete()
 
-    override fun findWorlds(count: Int) =
-        Future
-            .all(
-                (1..count).map { queryPool.findWorld(random.world()) }
-            ).toCompletionStage().toCompletableFuture().get().list<World>()
+    override fun findWorlds(count: Int) = (1..count)
+        .map { dbPool.findWorld(random.world()) }
 
-    override fun updateWorlds(count: Int) = (1..count).map {
-            queryPool.findWorld(random.world())
-                .flatMap { world ->
-                    updatePool.preparedQuery("UPDATE world SET randomnumber = $1 WHERE id = $2")
-                        .execute(Tuple.of(random.world(), world.first))
-                        .map { world }
+    override fun updateWorlds(count: Int) = (1..count)
+        .map { World(random.world(), random.world()) }
+        .onEach {
+            dbPool
+                .preparedQuery("SELECT id, randomnumber FROM world WHERE id = $1")
+                .execute(Tuple.of(it.first))
+                .map { rowSet ->
+                    val row = rowSet.iterator().next()
+                    row.getInteger(1)
+                    dbPool
+                        .preparedQuery("UPDATE world SET randomnumber = $1 WHERE id = $2")
+                        .execute(Tuple.of(it.second, it.first))
                 }
-                .toCompletionStage()
-                .toCompletableFuture()
-                .get()
+                .awaitComplete()
         }
 
-    override fun fortunes() = queryPool.preparedQuery("SELECT id, message FROM fortune")
+    override fun fortunes() = dbPool.preparedQuery("SELECT id, message FROM fortune")
         .execute()
-        .map { it.map(::toFortune) }
+        .map { it.map { Fortune(it.getInteger(0), it.getString(1)) } }
         .map { (it + Fortune(0, "Additional fortune added at request time.")) }
         .map { it.sortedBy { it.message } }
-        .toCompletionStage().toCompletableFuture().get()
+        .awaitComplete()
 
     companion object {
         private fun SqlClient.findWorld(id: Int) =
             preparedQuery("SELECT id, randomnumber FROM world WHERE id = $1")
                 .execute(Tuple.of(id))
-                .map { toWorld(it.single()) }
+                .map { it.map(::toWorld).first() }
+                .awaitComplete()
     }
 }
 
 private fun toWorld(r: Row) = r.getInteger("id") to r.getInteger("randomnumber")
 
-private fun toFortune(it: Row) = Fortune(it.getInteger(0), it.getString(1))
+private fun <T> Future<T>.awaitComplete(): T = toCompletionStage().toCompletableFuture().get()
diff --git a/frameworks/Kotlin/http4k/core/build.gradle.kts b/frameworks/Kotlin/http4k/core/build.gradle.kts
@@ -4,13 +4,13 @@ plugins {
 }
 
 dependencies {
-    api(platform("org.http4k:http4k-bom:5.12.0.0"))
-    api("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
-    api("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
+    api(platform("org.http4k:http4k-bom:5.14.4.0"))
+    api("org.jetbrains.kotlin:kotlin-stdlib:1.9.23")
+    api("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
     api("org.http4k:http4k-core")
     api("org.http4k:http4k-format-argo")
     api("org.http4k:http4k-template-rocker")
-    api("org.apache.commons:commons-lang3:3.12.0")
+    api("org.apache.commons:commons-lang3:3.14.0")
     api("org.cache2k:cache2k-core:2.6.1.Final")
 
     compileOnly("com.fizzed:rocker-compiler:1.4.0")
diff --git a/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties b/frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-apache-graalvm.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21 as gradle
+FROM gradle:8.7.0-jdk21 as gradle
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-apache.dockerfile b/frameworks/Kotlin/http4k/http4k-apache.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-apache4.dockerfile b/frameworks/Kotlin/http4k/http4k-apache4.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-graalvm.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21 as gradle
+FROM gradle:8.7.0-jdk21 as gradle
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-graalvm.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21 as gradle
+FROM gradle:8.7.0-jdk21 as gradle
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-jdbc.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-helidon-pgclient.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jetty.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-jdbc.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jetty11loom-pgclient.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-jdbc.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile b/frameworks/Kotlin/http4k/http4k-jettyloom-pgclient.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile b/frameworks/Kotlin/http4k/http4k-ktorcio.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile b/frameworks/Kotlin/http4k/http4k-ktornetty.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-netty.dockerfile b/frameworks/Kotlin/http4k/http4k-netty.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile b/frameworks/Kotlin/http4k/http4k-ratpack.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile b/frameworks/Kotlin/http4k/http4k-sunhttploom.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k-undertow.dockerfile b/frameworks/Kotlin/http4k/http4k-undertow.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts
diff --git a/frameworks/Kotlin/http4k/http4k.dockerfile b/frameworks/Kotlin/http4k/http4k.dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.4.0-jdk21
+FROM gradle:8.7.0-jdk21
 USER root
 WORKDIR /http4k
 COPY build.gradle.kts build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`4`	`4`	`import org.jetbrains.kotlin.js.translate.context.Namer.kotlin`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- kotlin("jvm") version "1.9.22"`
	`7`	`+ kotlin("jvm") version "1.9.23"`
`8`	`8`	`application`
`9`	`9`	`}`
`10`	`10`
`@@ -35,14 +35,14 @@ allprojects {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`java {`
`38`		`- sourceCompatibility = VERSION_20`
`39`		`- targetCompatibility = VERSION_20`
	`38`	`+ sourceCompatibility = VERSION_21`
	`39`	`+ targetCompatibility = VERSION_21`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`tasks {`
`43`	`43`	`withType<KotlinCompile> {`
`44`	`44`	`kotlinOptions {`
`45`		`- jvmTarget = "20"`
	`45`	`+ jvmTarget = "21"`
`46`	`46`	`allWarningsAsErrors = true`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`api(project(":core"))`
`3`		`- api("com.zaxxer:HikariCP:5.0.1")`
`4`		`- api("org.postgresql:postgresql:42.5.0")`
	`3`	`+ api("com.zaxxer:HikariCP:5.1.0")`
	`4`	`+ api("org.postgresql:postgresql:42.7.3")`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gradle:8.4.0-jdk21 as gradle`
	`1`	`+FROM gradle:8.7.0-jdk21 as gradle`
`2`	`2`	`USER root`
`3`	`3`	`WORKDIR /http4k`
`4`	`4`	`COPY build.gradle.kts build.gradle.kts`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gradle:8.4.0-jdk21`
	`1`	`+FROM gradle:8.7.0-jdk21`
`2`	`2`	`USER root`
`3`	`3`	`WORKDIR /http4k`
`4`	`4`	`COPY build.gradle.kts build.gradle.kts`