Upgrade entire stack to http4k v6

daviddenton · daviddenton · commit bc78fa3a81f2 · 2025-04-08T20:15:56.000+01:00
diff --git a/api-gateway/src/main/kotlin/hyperpyramid/ApiGateway.kt b/api-gateway/src/main/kotlin/hyperpyramid/ApiGateway.kt
@@ -5,13 +5,13 @@ import hyperpyramid.ApiGatewaySettings.SHOP_URL
 import hyperpyramid.app.AppEvents
 import hyperpyramid.app.AppIncomingHttp
 import hyperpyramid.app.AppOutgoingHttp
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.core.HttpHandler
 import org.http4k.core.then
 import org.http4k.events.Events
 import org.http4k.filter.ClientFilters.SetHostFrom
-import org.http4k.routing.Router.Companion.orElse
 import org.http4k.routing.bind
+import org.http4k.routing.orElse
 import org.http4k.routing.routes
 import java.time.Clock
 
diff --git a/api-gateway/src/main/kotlin/hyperpyramid/ApiGatewaySettings.kt b/api-gateway/src/main/kotlin/hyperpyramid/ApiGatewaySettings.kt
@@ -1,6 +1,6 @@
 package hyperpyramid
 
-import org.http4k.cloudnative.env.EnvironmentKey
+import org.http4k.config.EnvironmentKey
 import org.http4k.lens.of
 import org.http4k.lens.uri
 
diff --git a/api-gateway/src/main/kotlin/hyperpyramid/Main.kt b/api-gateway/src/main/kotlin/hyperpyramid/Main.kt
@@ -2,7 +2,7 @@ package hyperpyramid
 
 import hyperpyramid.util.Json
 import org.http4k.client.JavaHttpClient
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.events.AutoMarshallingEvents
 import org.http4k.server.Undertow
 import org.http4k.server.asServer
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.1.20"
     idea
     `java-test-fixtures`
 }
diff --git a/e2e/.generated/UniverseTests - views item, orders, receives confirmation - Sequence.puml b/e2e/.generated/UniverseTests - views item, orders, receives confirmation - Sequence.puml
@@ -9,7 +9,7 @@ database "db"
 participant "image-cache.s3.eu-west-1.amazonaws.com"
 participant "dept-store"
 participant "email.eu-west-1.amazonaws.com"
-participant "event-stream"
+queue "event-stream"
 "Customer" -> "api-gateway": GET list
 activate "api-gateway"
 "api-gateway" -> "shop": GET list
@@ -51,7 +51,7 @@ activate "dept-store"
 deactivate "dept-store"
 "warehouse" -[#DarkGreen]> "shop": <color:DarkGreen> 202 Accepted
 deactivate "warehouse"
-"shop" -> "email.eu-west-1.amazonaws.com": POST 
+"shop" -> "email.eu-west-1.amazonaws.com": POST v2/email/outbound-emails
 activate "email.eu-west-1.amazonaws.com"
 
 "email.eu-west-1.amazonaws.com" -[#DarkGreen]> "shop": <color:DarkGreen> 200 OK
diff --git a/e2e/src/test/kotlin/hyperpyramid/env/LocalUniverseTestEnv.kt b/e2e/src/test/kotlin/hyperpyramid/env/LocalUniverseTestEnv.kt
@@ -9,7 +9,7 @@ import hyperpyramid.WarehouseSettings.STORE_API_PASSWORD
 import hyperpyramid.WarehouseSettings.STORE_API_USER
 import hyperpyramid.WarehouseSettings.STORE_URL
 import hyperpyramid.dto.Email
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.connect.amazon.AWS_ACCESS_KEY_ID
 import org.http4k.connect.amazon.AWS_REGION
 import org.http4k.connect.amazon.AWS_SECRET_ACCESS_KEY
diff --git a/e2e/src/test/kotlin/hyperpyramid/env/UniverseTestEnv.kt b/e2e/src/test/kotlin/hyperpyramid/env/UniverseTestEnv.kt
@@ -9,7 +9,7 @@ import hyperpyramid.WarehouseSettings.STORE_API_PASSWORD
 import hyperpyramid.WarehouseSettings.STORE_API_USER
 import hyperpyramid.WarehouseSettings.STORE_URL
 import hyperpyramid.dto.Email
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.connect.amazon.AWS_ACCESS_KEY_ID
 import org.http4k.connect.amazon.AWS_REGION
 import org.http4k.connect.amazon.AWS_SECRET_ACCESS_KEY
diff --git a/e2e/src/testFixtures/kotlin/hyperpyramid/EcommerceSystem.kt b/e2e/src/testFixtures/kotlin/hyperpyramid/EcommerceSystem.kt
@@ -6,12 +6,12 @@ import hyperpyramid.ApiGatewaySettings.SHOP_URL
 import hyperpyramid.ShopApiSettings.WAREHOUSE_URL
 import hyperpyramid.adapter.InMemoryInventory
 import hyperpyramid.http.NetworkAccess
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.core.HttpHandler
 import org.http4k.core.Request
 import org.http4k.events.Events
-import org.http4k.routing.Router.Companion.orElse
 import org.http4k.routing.bind
+import org.http4k.routing.orElse
 import org.http4k.routing.reverseProxyRouting
 import org.http4k.routing.routes
 import java.time.Clock
diff --git a/e2e/src/testFixtures/kotlin/hyperpyramid/actors/HttpWebsiteCustomer.kt b/e2e/src/testFixtures/kotlin/hyperpyramid/actors/HttpWebsiteCustomer.kt
@@ -27,7 +27,7 @@ class HttpWebsiteCustomer(
     override fun hasEmailFor(orderId: OrderId, email: String): Boolean {
         return sentEmails.keySet()
             .flatMap { sentEmails[it] ?: emptyList() }
-            .filter { it.to.contains(EmailAddress.of(email)) }
-            .any { it.message.html?.value == "Please collect your order using the code: $orderId" }
+            .filter { it.destination.toAddresses!!.contains(EmailAddress.of(email)) }
+            .any { it.message?.body?.text?.data == "Please collect your order using the code: $orderId" }
     }
 }
diff --git a/e2e/src/testFixtures/kotlin/hyperpyramid/setup/CloudSetup.kt b/e2e/src/testFixtures/kotlin/hyperpyramid/setup/CloudSetup.kt
@@ -1,5 +1,5 @@
 package hyperpyramid.setup
 
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 
 typealias CloudInfraSetup = (Environment) -> Environment
diff --git a/e2e/src/testFixtures/kotlin/hyperpyramid/setup/SetupCloudEnvironment.kt b/e2e/src/testFixtures/kotlin/hyperpyramid/setup/SetupCloudEnvironment.kt
@@ -1,7 +1,7 @@
 package hyperpyramid.setup
 
 import hyperpyramid.TheInternet
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 
 /**
  * Apply all setup functions to the cloud environment.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,9 +2,76 @@
 
 [versions]
 
-kotlin = "1.9.23"
+kotlin = "2.1.20"
 
 http4k-connect = "5.10.1.0"
+##          ⬆ = "5.11.0.0"
+##          ⬆ = "5.12.0.0"
+##          ⬆ = "5.12.1.0"
+##          ⬆ = "5.12.2.0"
+##          ⬆ = "5.13.0.0"
+##          ⬆ = "5.14.0.0"
+##          ⬆ = "5.15.0.0"
+##          ⬆ = "5.16.0.0"
+##          ⬆ = "5.16.0.1"
+##          ⬆ = "5.16.0.2"
+##          ⬆ = "5.17.0.0"
+##          ⬆ = "5.17.0.1"
+##          ⬆ = "5.17.0.2"
+##          ⬆ = "5.17.1.0"
+##          ⬆ = "5.17.1.1"
+##          ⬆ = "5.18.0.0"
+##          ⬆ = "5.19.0.0"
+##          ⬆ = "5.19.0.1"
+##          ⬆ = "5.19.0.2"
+##          ⬆ = "5.20.0.0"
+##          ⬆ = "5.21.0.0"
+##          ⬆ = "5.22.0.00"
+##          ⬆ = "5.22.1.0"
+##          ⬆ = "5.23.0.0"
+##          ⬆ = "5.24.0.0"
+##          ⬆ = "5.24.1.0"
+##          ⬆ = "5.25.0.0"
+##          ⬆ = "5.25.1.0"
+##          ⬆ = "5.26.0.0"
+##          ⬆ = "5.26.0.1"
+##          ⬆ = "5.26.0.2"
+##          ⬆ = "5.35.0.0"
+##          ⬆ = "5.35.1.0"
+##          ⬆ = "5.35.2.0"
+##          ⬆ = "5.35.3.0"
+##          ⬆ = "5.35.4.0"
+##          ⬆ = "5.35.5.0"
+##          ⬆ = "5.36.0.0"
+##          ⬆ = "5.37.0.0"
+##          ⬆ = "5.37.1.0"
+##          ⬆ = "5.37.1.1"
+##          ⬆ = "5.38.0.0"
+##          ⬆ = "5.39.0.0"
+##          ⬆ = "5.40.0.0"
+##          ⬆ = "5.41.0.0"
+##          ⬆ = "5.42.0.0"
+##          ⬆ = "5.43.0.0"
+##          ⬆ = "5.44.0.0"
+##          ⬆ = "5.44.1.0"
+##          ⬆ = "5.44.2.0"
+##          ⬆ = "5.44.3.0"
+##          ⬆ = "5.45.0.0"
+##          ⬆ = "5.45.1.0"
+##          ⬆ = "5.45.2.0"
+##          ⬆ = "5.46.0.0"
+##          ⬆ = "5.47.0.0"
+##          ⬆ = "6.0.0.0"
+##          ⬆ = "6.0.1.0"
+##          ⬆ = "6.1.0.0"
+##          ⬆ = "6.1.0.1"
+##          ⬆ = "6.2.0.0"
+##          ⬆ = "6.4.0.0"
+##          ⬆ = "6.4.1.0"
+##          ⬆ = "6.5.0.0"
+##          ⬆ = "6.5.1.0"
+##          ⬆ = "6.5.2.0"
+##          ⬆ = "6.5.3.0"
 
 [libraries]
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/images/src/main/kotlin/hyperpyramid/ImageSettings.kt b/images/src/main/kotlin/hyperpyramid/ImageSettings.kt
@@ -1,6 +1,6 @@
 package hyperpyramid
 
-import org.http4k.cloudnative.env.EnvironmentKey
+import org.http4k.config.EnvironmentKey
 import org.http4k.connect.amazon.s3.model.BucketName
 import org.http4k.lens.of
 import org.http4k.lens.value
diff --git a/images/src/main/kotlin/hyperpyramid/ImagesApi.kt b/images/src/main/kotlin/hyperpyramid/ImagesApi.kt
@@ -6,7 +6,7 @@ import hyperpyramid.app.AppIncomingHttp
 import hyperpyramid.app.AppOutgoingHttp
 import hyperpyramid.endpoint.GetImage
 import hyperpyramid.port.Images
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.connect.amazon.AWS_REGION
 import org.http4k.connect.amazon.s3.Http
 import org.http4k.connect.amazon.s3.S3Bucket
diff --git a/images/src/main/kotlin/hyperpyramid/Main.kt b/images/src/main/kotlin/hyperpyramid/Main.kt
@@ -2,7 +2,7 @@ package hyperpyramid
 
 import hyperpyramid.util.Json
 import org.http4k.client.JavaHttpClient
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.events.AutoMarshallingEvents
 import org.http4k.server.Undertow
 import org.http4k.server.asServer
diff --git a/infra/build.gradle.kts b/infra/build.gradle.kts
@@ -3,14 +3,16 @@ dependencies {
     api(platform(libs.http4k.connect.bom))
     api(platform(libs.forkhandles.bom))
 
-    api(Http4k.cloudnative)
+    api("org.http4k:http4k-config")
+    api("org.http4k:http4k-platform-core")
     api(Http4k.core)
     api(Http4k.format.jackson)
     api(Http4k.server.undertow)
     api(libs.values4k)
 
     testFixturesApi(Testing.junit.jupiter.api)
     testFixturesApi(Testing.junit.jupiter.engine)
+    testFixturesApi("org.junit.platform:junit-platform-launcher")
 
     testFixturesApi("org.http4k:http4k-testing-tracerbullet")
     testFixturesApi(Http4k.testing.strikt)
diff --git a/infra/src/main/kotlin/hyperpyramid/Settings.kt b/infra/src/main/kotlin/hyperpyramid/Settings.kt
@@ -1,6 +1,6 @@
 package hyperpyramid
 
-import org.http4k.cloudnative.env.EnvironmentKey
+import org.http4k.config.EnvironmentKey
 import org.http4k.lens.boolean
 import org.http4k.lens.of
 
diff --git a/shop/src/main/kotlin/hyperpyramid/Main.kt b/shop/src/main/kotlin/hyperpyramid/Main.kt
@@ -2,7 +2,7 @@ package hyperpyramid
 
 import hyperpyramid.util.Json
 import org.http4k.client.JavaHttpClient
-import org.http4k.cloudnative.env.Environment.Companion.ENV
+import org.http4k.config.Environment.Companion.ENV
 import org.http4k.events.AutoMarshallingEvents
 import org.http4k.server.Undertow
 import org.http4k.server.asServer
diff --git a/shop/src/main/kotlin/hyperpyramid/ShopApi.kt b/shop/src/main/kotlin/hyperpyramid/ShopApi.kt
@@ -10,7 +10,7 @@ import hyperpyramid.app.AppOutgoingHttp
 import hyperpyramid.endpoint.ListAllItems
 import hyperpyramid.endpoint.PlaceOrder
 import hyperpyramid.port.Shop
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.core.HttpHandler
 import org.http4k.events.Events
 import org.http4k.routing.routes
diff --git a/shop/src/main/kotlin/hyperpyramid/ShopApiSettings.kt b/shop/src/main/kotlin/hyperpyramid/ShopApiSettings.kt
@@ -1,7 +1,7 @@
 package hyperpyramid
 
 import hyperpyramid.dto.Email
-import org.http4k.cloudnative.env.EnvironmentKey
+import org.http4k.config.EnvironmentKey
 import org.http4k.lens.of
 import org.http4k.lens.uri
 import org.http4k.lens.value
diff --git a/shop/src/main/kotlin/hyperpyramid/adapter/SESNotifications.kt b/shop/src/main/kotlin/hyperpyramid/adapter/SESNotifications.kt
@@ -7,28 +7,33 @@ import hyperpyramid.ShopApiSettings.NOTIFICATION_EMAIL_SENDER
 import hyperpyramid.dto.Email
 import hyperpyramid.dto.OrderId
 import hyperpyramid.port.Notifications
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.connect.amazon.ses.Http
 import org.http4k.connect.amazon.ses.SES
-import org.http4k.connect.amazon.ses.action.SendEmail
 import org.http4k.connect.amazon.ses.model.Body
+import org.http4k.connect.amazon.ses.model.Content
 import org.http4k.connect.amazon.ses.model.Destination
 import org.http4k.connect.amazon.ses.model.EmailAddress
+import org.http4k.connect.amazon.ses.model.EmailContent
 import org.http4k.connect.amazon.ses.model.Message
-import org.http4k.connect.amazon.ses.model.Subject
+import org.http4k.connect.amazon.ses.sendEmail
 import org.http4k.core.HttpHandler
 
 fun SESNotifications(env: Environment, outgoingHttp: HttpHandler) = object : Notifications {
     private val ses = SES.Http(env, outgoingHttp)
 
     override fun collectOrder(user: Email, orderId: OrderId): Result4k<Unit, Exception> =
-        ses(
-            SendEmail(
-                EmailAddress.of(env[NOTIFICATION_EMAIL_SENDER].value),
-                Destination(setOf(EmailAddress.of(user.value))),
-                Message(
-                    Subject.of("Your order $orderId"),
-                    Body("Please collect your order using the code: $orderId")
+        ses.sendEmail(
+            fromEmailAddress = EmailAddress.of(env[NOTIFICATION_EMAIL_SENDER].value),
+            destination = Destination(
+                toAddresses = setOf(EmailAddress.of(user.value))
+            ),
+            content = EmailContent(
+                simple = Message(
+                    subject = Content("Your order $orderId"),
+                    body = Body(
+                        text = Content("Please collect your order using the code: $orderId", Charsets.UTF_8),
+                    )
                 )
             )
         )
diff --git a/shop/src/test/kotlin/hyperpyramid/ShopTestEnv.kt b/shop/src/test/kotlin/hyperpyramid/ShopTestEnv.kt
@@ -3,7 +3,7 @@
 import hyperpyramid.ShopApiSettings.NOTIFICATION_EMAIL_SENDER
 import hyperpyramid.ShopApiSettings.WAREHOUSE_URL
 import hyperpyramid.dto.Email
-import org.http4k.cloudnative.env.Environment.Companion.defaults
+import org.http4k.config.Environment.Companion.defaults
 import org.http4k.connect.amazon.AWS_ACCESS_KEY_ID
 import org.http4k.connect.amazon.AWS_REGION
 import org.http4k.connect.amazon.AWS_SECRET_ACCESS_KEY
diff --git a/versions.properties b/versions.properties
@@ -7,18 +7,18 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
-version.dev.forkhandles..values4k=2.15.1.0
+version.dev.forkhandles..forkhandles-bom=2.22.2.1
 
-version.dev.forkhandles..forkhandles-bom=2.15.1.0
+version.com.zaxxer..HikariCP=6.3.0
 
-version.com.zaxxer..HikariCP=5.1.0
-
-version.com.h2database..h2=2.2.224
+version.com.h2database..h2=2.3.232
 
 version.com.adarshr..gradle-test-logger-plugin=4.0.0
 
-version.http4k=5.14.4.0
+version.dev.forkhandles..values4k=2.22.2.1
+
+version.http4k=6.5.3.0
 
-version.jetbrains.exposed=0.48.0
+version.jetbrains.exposed=0.60.0
 
-version.junit.jupiter=5.10.2
+version.junit.jupiter=5.12.1
diff --git a/warehouse/src/main/kotlin/hyperpyramid/Main.kt b/warehouse/src/main/kotlin/hyperpyramid/Main.kt
@@ -3,7 +3,7 @@ package hyperpyramid
 import hyperpyramid.adapter.DatabaseInventory
 import hyperpyramid.util.Json
 import org.http4k.client.JavaHttpClient
-import org.http4k.cloudnative.env.Environment.Companion.ENV
+import org.http4k.config.Environment.Companion.ENV
 import org.http4k.events.AutoMarshallingEvents
 import org.http4k.server.Undertow
 import org.http4k.server.asServer
diff --git a/warehouse/src/main/kotlin/hyperpyramid/WarehouseApi.kt b/warehouse/src/main/kotlin/hyperpyramid/WarehouseApi.kt
@@ -11,7 +11,7 @@ import hyperpyramid.domain.Warehouse
 import hyperpyramid.endpoint.DispatchItems
 import hyperpyramid.endpoint.ListItems
 import hyperpyramid.port.Inventory
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.core.Credentials
 import org.http4k.core.HttpHandler
 import org.http4k.events.Events
diff --git a/warehouse/src/main/kotlin/hyperpyramid/WarehouseSettings.kt b/warehouse/src/main/kotlin/hyperpyramid/WarehouseSettings.kt
@@ -1,6 +1,6 @@
 package hyperpyramid
 
-import org.http4k.cloudnative.env.EnvironmentKey
+import org.http4k.config.EnvironmentKey
 import org.http4k.lens.of
 import org.http4k.lens.uri
 
diff --git a/warehouse/src/main/kotlin/hyperpyramid/adapter/DatabaseInventory.kt b/warehouse/src/main/kotlin/hyperpyramid/adapter/DatabaseInventory.kt
@@ -5,7 +5,7 @@ import com.zaxxer.hikari.HikariDataSource
 import hyperpyramid.WarehouseSettings.DATABASE_DRIVER
 import hyperpyramid.WarehouseSettings.DATABASE_URL
 import hyperpyramid.port.Inventory
-import org.http4k.cloudnative.env.Environment
+import org.http4k.config.Environment
 import org.http4k.connect.storage.Jdbc
 import org.http4k.connect.storage.Storage
 import org.http4k.connect.storage.StorageTable
diff --git a/warehouse/src/test/kotlin/hyperpyramid/WarehouseTestEnv.kt b/warehouse/src/test/kotlin/hyperpyramid/WarehouseTestEnv.kt
diff --git a/warehouse/src/test/kotlin/hyperpyramid/adapter/DatabaseInventoryTest.kt b/warehouse/src/test/kotlin/hyperpyramid/adapter/DatabaseInventoryTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("jvm") version "1.9.23"`
	`4`	`+ kotlin("jvm") version "2.1.20"`
`5`	`5`	`idea`
`6`	`6`	`java-test-fixtures`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class HttpWebsiteCustomer(`
`27`	`27`	`override fun hasEmailFor(orderId: OrderId, email: String): Boolean {`
`28`	`28`	`return sentEmails.keySet()`
`29`	`29`	`.flatMap { sentEmails[it] ?: emptyList() }`
`30`		`- .filter { it.to.contains(EmailAddress.of(email)) }`
`31`		`- .any { it.message.html?.value == "Please collect your order using the code: $orderId" }`
	`30`	`+ .filter { it.destination.toAddresses!!.contains(EmailAddress.of(email)) }`
	`31`	`+ .any { it.message?.body?.text?.data == "Please collect your order using the code: $orderId" }`
`32`	`32`	`}`
`33`	`33`	`}`