- Upgrade Deps

- insecureApacheHttpClient()

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

.idea/kotlinc.xml

@@ -375,8 +375,8 @@ image:pq-exe-logging.gif[Monitor Execution]
 === Type Safety with flexible JSON <- -> POJO marshalling/serialization and unmarshalling/deserialization
 
 * ReṼoman internally uses a modern JSON library called https://github.com/square/moshi[**Moshi**]
-* There may be a POJO that inherits or contains legacy types that are hard or impossible to serialize. ReṼoman lets you serialize such types through `globalSkipTypes`, where you can filter out these legacy types from Marshalling/Unmarshalling, only focussing on fields that matter.
-* The payload may not map to POJO, and you may need a custom types adapter for Marshalling/Unmarshalling. Moshi has it covered for you with its advanced adapter mechanism and ReṼoman accepts Moshi adapters via
+* There may be a POJO that inherits or contains legacy types that are hard or impossible to serialize. ReṼoman lets you serialize only types that matter, through `globalSkipTypes`, where you can filter out these legacy types from Marshalling/Unmarshalling
+* The JSON structure may not align with the POJO, and you may need a _Custom Type Adapter_ for Marshalling/Unmarshalling. Moshi has it covered for you with its advanced adapter mechanism and ReṼoman accepts Moshi adapters via:
 ** `requestConfig` — For types present as part of request payload for qualified Steps
 ** `responseConfig` — For types present as part of response payload for qualified Steps
 ** `globalCustomTypeAdapters` — For types present as part of request payload anywhere
@@ -387,7 +387,7 @@ for an advanced adapter use-case
 
 ==== JSON POJO Utils
 
-link:{sourcedir}/com/salesforce/revoman/input/json/JsonPojoUtils.kt[JSON POJO Utils] can be used to directly convert JSON to POJO and vice versa.
+The bundled link:{sourcedir}/com/salesforce/revoman/input/json/JsonPojoUtils.kt[JSON POJO Utils] can be used to directly convert JSON to POJO and vice versa.
 
 [TIP]
 ====
@@ -409,7 +409,7 @@ The configuration offers methods through which the execution strategy can be con
 [#_pre_step_and_post_step_hooks]
 === Pre-Step and Post-Step Hooks
 
-A hook lets you fiddle with the execution by plugging in your custom code before or after a Step execution.
+A hook lets you fiddle with the execution by plugging in your custom JVM code before or after a Step execution.
 
 [#_step_picks]
 You can pass a `PreTxnStepPick/PostTxnStepPick` which is a `Predicate` used
@@ -483,7 +483,7 @@ npm install moment
 .Use inside pre-req and post-res scripts
 [source,javascript,indent=0,options="nowrap"]
 ----
-var moment = require("moment") 
+var moment = require("moment")
 var _ = require('lodash')
 
 pm.environment.set("$currentDate", moment().format(("YYYY-MM-DD")))

README.adoc

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -13,8 +13,15 @@ import com.salesforce.revoman.output.ExeType.HTTP_REQUEST
 import com.salesforce.revoman.output.report.Step
 import com.salesforce.revoman.output.report.TxnInfo
 import com.salesforce.revoman.output.report.failure.RequestFailure.HttpRequestFailure
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory.INSTANCE
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory
+import org.apache.hc.core5.http.config.RegistryBuilder
+import org.apache.hc.core5.ssl.SSLContextBuilder
 import org.http4k.client.ApacheClient
-import org.http4k.client.PreCannedApacheHttpClients.insecureApacheHttpClient
 import org.http4k.core.Filter
 import org.http4k.core.HttpHandler
 import org.http4k.core.NoOp
@@ -42,7 +49,22 @@ internal fun fireHttpRequest(
 private fun prepareHttpClient(bearerToken: String?, insecureHttp: Boolean): HttpHandler =
   DebuggingFilters.PrintRequestAndResponse()
     .then(if (bearerToken.isNullOrEmpty()) Filter.NoOp else ClientFilters.BearerAuth(bearerToken))
-    .then(
-      if (insecureHttp) ApacheClient(client = insecureApacheHttpClient())
-      else ApacheClient()
-    )
+    .then(if (insecureHttp) ApacheClient(client = insecureApacheHttpClient()) else ApacheClient())
+
+/** Only for Testing. DO NOT USE IN PROD */
+fun insecureApacheHttpClient(): CloseableHttpClient =
+  SSLContextBuilder()
+    .loadTrustMaterial(null) { _, _ -> true }
+    .build()
+    .run {
+      HttpClientBuilder.create()
+        .setConnectionManager(
+          PoolingHttpClientConnectionManager(
+            RegistryBuilder.create<ConnectionSocketFactory>()
+              .register("http", INSTANCE)
+              .register("https", SSLConnectionSocketFactory(this) { _, _ -> true })
+              .build()
+          )
+        )
+        .build()
+    }

src/main/kotlin/com/salesforce/revoman/internal/exe/HttpRequest.kt

@@ -9,7 +9,6 @@ package com.salesforce.revoman.internal.postman.template
 
 import com.salesforce.revoman.internal.postman.PostmanSDK
 import com.squareup.moshi.JsonClass
-import org.http4k.core.ContentType
 import org.http4k.core.ContentType.Companion.APPLICATION_JSON
 import org.http4k.core.ContentType.Companion.Text
 import org.http4k.core.Method