upgrade http4k, API changes

CHANGELOG.md

@@ -3,6 +3,9 @@
 This list is not intended to be all-encompassing - it will document major and breaking API 
 changes with their rationale when appropriate. Given version `A.B.C.D`, breaking changes are to be expected in version number increments where changes in the `A` or `B` sections:
 
+### v2.8.0.0
+- **http4k-connect-*** : Upgrade to http4k 4.X.X.X.
+
 ### v2.7.1.0
 - **http4k-connect-amazon-systemsmanager** : Refined model.
 - **http4k-connect-amazon-*** : Fixed handling of ARNs.

amazon/core/src/main/kotlin/org/http4k/connect/amazon/AwsReverseProxy.kt

@@ -1,19 +1,12 @@
 package org.http4k.connect.amazon
 
 import org.http4k.core.HttpHandler
-import org.http4k.routing.bind
-import org.http4k.routing.header
-import org.http4k.routing.routes
+import org.http4k.routing.reverseProxy
 
 /**
  * Simple ReverseProxy for AWS services. Allows for simple traffic splitting based
  * on the Host header.
  */
 fun AwsReverseProxy(vararg awsServices: Pair<AwsServiceCompanion, HttpHandler>) =
-    routes(
-        *awsServices.map { it.first.awsService.value to it.second }.toTypedArray()
-            .map { service ->
-                header("host") { it.contains(service.first) } bind service.second
-            }.toTypedArray()
-    )
+    reverseProxy(*awsServices.map { it.first.awsService.value to it.second }.toTypedArray())
 

amazon/core/src/main/kotlin/org/http4k/format/AwsJsonAdapterFactory.kt

@@ -2,13 +2,11 @@ package org.http4k.format
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
-import org.http4k.connect.ConnectJsonAdapterFactory
-import org.http4k.connect.adapter
 import org.http4k.connect.amazon.model.KotshiTagJsonAdapter
 
 abstract class AwsJsonAdapterFactory(
     vararg typesToAdapters: Pair<String, (Moshi) -> JsonAdapter<*>>
-) : ConnectJsonAdapterFactory(
+) : SimpleMoshiAdapterFactory(
     *(typesToAdapters.toList() + adapter { KotshiTagJsonAdapter() })
         .toTypedArray()
 )

amazon/kms/client/src/main/kotlin/org/http4k/connect/amazon/kms/KMSMoshi.kt

@@ -1,7 +1,6 @@
 package org.http4k.connect.amazon.kms
 
 import com.squareup.moshi.Moshi
-import org.http4k.connect.adapter
 import org.http4k.connect.amazon.kms.action.KotshiCreateKeyJsonAdapter
 import org.http4k.connect.amazon.kms.action.KotshiDecryptJsonAdapter
 import org.http4k.connect.amazon.kms.action.KotshiDecryptedJsonAdapter
@@ -24,6 +23,7 @@ import org.http4k.connect.amazon.kms.action.KotshiVerifyResultJsonAdapter
 import org.http4k.connect.amazon.model.KotshiKeyMetadataJsonAdapter
 import org.http4k.format.AwsJsonAdapterFactory
 import org.http4k.format.ConfigurableMoshi
+import org.http4k.format.adapter
 import org.http4k.format.asConfigurable
 import org.http4k.format.withAwsCoreMappings
 import org.http4k.format.withStandardMappings

amazon/secretsmanager/client/src/main/kotlin/org/http4k/connect/amazon/secretsmanager/SecretsManagerMoshi.kt

@@ -1,7 +1,6 @@
 package org.http4k.connect.amazon.secretsmanager
 
 import com.squareup.moshi.Moshi
-import org.http4k.connect.adapter
 import org.http4k.connect.amazon.model.SecretId
 import org.http4k.connect.amazon.model.VersionId
 import org.http4k.connect.amazon.model.VersionStage
@@ -23,6 +22,7 @@ import org.http4k.connect.amazon.secretsmanager.action.KotshiUpdatedSecretValueJ
 import org.http4k.format.AutoMappingConfiguration
 import org.http4k.format.AwsJsonAdapterFactory
 import org.http4k.format.ConfigurableMoshi
+import org.http4k.format.adapter
 import org.http4k.format.asConfigurable
 import org.http4k.format.text
 import org.http4k.format.withAwsCoreMappings

amazon/systemsmanager/client/src/main/kotlin/org/http4k/connect/amazon/systemsmanager/SystemsManagerMoshi.kt

@@ -1,7 +1,6 @@
 package org.http4k.connect.amazon.systemsmanager
 
 import com.squareup.moshi.Moshi
-import org.http4k.connect.adapter
 import org.http4k.connect.amazon.model.SSMParameterName
 import org.http4k.connect.amazon.systemsmanager.action.KotshiDeleteParameterJsonAdapter
 import org.http4k.connect.amazon.systemsmanager.action.KotshiGetParameterJsonAdapter
@@ -12,6 +11,7 @@ import org.http4k.connect.amazon.systemsmanager.action.KotshiPutParameterResultJ
 import org.http4k.format.AutoMappingConfiguration
 import org.http4k.format.AwsJsonAdapterFactory
 import org.http4k.format.ConfigurableMoshi
+import org.http4k.format.adapter
 import org.http4k.format.asConfigurable
 import org.http4k.format.text
 import org.http4k.format.withAwsCoreMappings

gradle.properties

@@ -1,4 +1,4 @@
-http4k_version=3.285.2
+http4k_version=4.0.0.0
 junit_version=5.7.0
 kotlin_version=1.4.21
 forkhandles_version=1.6.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists