Add a scenario to pass custom adapter via getTypedTxnObj

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

Author: overfullstack

README.adoc

@@ -364,6 +364,8 @@ POKEMON_COMMON_CONFIG.overrideHooks(kotlin.collections.CollectionsKt.plus(POKEMO
 Kick.configure().from(configInstance1).from(configInstance2)...off();
 ----
 
+CAUTION: Iterable attributes (like `List`, `Map` etc) accept an `Iterable`. If you are particular about the order, make sure to pass an Ordered instance of `Iterable` (like `ArrayList`)
+
 [#_debugging_dx]
 == Troubleshooting DX
 
@@ -580,7 +582,7 @@ Instead, you have a Java utility to generate/create it.
 You can invoke the utility in a pre-hook of a step and set the value in `rundown.mutableEnv`,
 so the later steps can pick up value for `+{{xyzId}}+` variable from the environment.
 
-CAUTION: When a Step qualifies for more than one hook, hooks are executed in the same sequence they are configured, either using `hooks()` or `overrideHooks()`. Both these methods accept an `iterable`. Make sure to pass an Ordered Iterable (like `ArrayList<>`), if you are particular about Order in which hooks should execute for a Step.
+CAUTION: When a Step qualifies for more than one hook, hooks are executed in the same sequence they are configured, either using `hooks()` or `overrideHooks()`. Both these methods accept an `iterable`. Make sure to pass an Ordered Iterable (like `ArrayList`), if you are particular about Order in which hooks should execute for a Step.
 
 [#_response_validations]
 ==== Response Validations

src/integrationTest/java/com/salesforce/revoman/integration/core/adapters/IDAdapter.java

@@ -22,6 +22,6 @@ ID fromJson(String id) {
 
 	@ToJson
 	String toJson(ID id) {
-		return id.getId();
+		return id.id();
 	}
 }

src/integrationTest/java/com/salesforce/revoman/integration/core/pq/connect/response/ID.java

@@ -7,14 +7,4 @@
 
 package com.salesforce.revoman.integration.core.pq.connect.response;
 
-public class ID {
-	private final String id;
-
-	public ID(String id) {
-		this.id = id;
-	}
-
-	public String getId() {
-		return id;
-	}
-}
+public record ID(String id) {}

src/integrationTest/java/com/salesforce/revoman/integration/pokemon/PokemonTest.java

@@ -24,11 +24,14 @@
 import com.salesforce.revoman.input.config.HookConfig.StepHook.PostStepHook;
 import com.salesforce.revoman.input.config.HookConfig.StepHook.PreStepHook;
 import com.salesforce.revoman.input.config.Kick;
+import com.salesforce.revoman.integration.core.adapters.IDAdapter;
+import com.salesforce.revoman.integration.core.pq.connect.response.ID;
 import com.salesforce.revoman.output.Rundown;
 import com.salesforce.revoman.output.report.Step;
 import com.salesforce.revoman.output.report.StepReport;
 import com.salesforce.revoman.output.report.TxnInfo;
 import com.salesforce.revoman.output.report.failure.HookFailure.PostStepHookFailure;
+import com.squareup.moshi.Json;
 import java.util.List;
 import java.util.Map;
 import org.http4k.core.Request;
@@ -113,6 +116,14 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 										"Picked `postHookAfterURIPath` after stepName: {} with raw URI: {}",
 										stepReport.step.displayName,
 										stepReport.step.rawPMStep.getRequest().url);
+								final var id =
+										stepReport
+												.responseInfo
+												.map(
+														ri ->
+																ri.<Color>getTypedTxnObj(Color.class, List.of(new IDAdapter())).id)
+												.getOrNull();
+								assertThat(id.id()).isEqualTo(rundown.mutableEnv.get("id"));
 							}
 						});
 		final var pokeRundown =
@@ -124,7 +135,7 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 								.hooks(
 										pre(beforeStepName("all-pokemon"), preHook),
 										post(afterStepName("all-pokemon"), postHook),
-										post(afterStepContainingURIPathOfAny("nature"), postHookAfterURIPath),
+										post(afterStepContainingURIPathOfAny("pokemon-color"), postHookAfterURIPath),
 										pre(beforeStepContainingHeader("preLog"), preLogHook),
 										post(afterStepContainingHeader("postLog"), postLogHook))
 								.dynamicEnvironment(dynamicEnvironment)
@@ -155,4 +166,16 @@ public void accept(@NotNull StepReport stepReport, @NotNull Rundown rundown) {
 	public record AllPokemon(int count, String next, String previous, List<Result> results) {
 		public record Result(String name, String url) {}
 	}
+
+	public record Color(
+			ID id,
+			String name,
+			List<Name> names,
+			@Json(name = "pokemon_species") List<PokemonSpecies> pokemonSpecies) {
+		public record Name(Language language, String name) {
+			public record Language(String name, String url) {}
+		}
+
+		public record PokemonSpecies(String name, String url) {}
+	}
 }

src/main/kotlin/com/salesforce/revoman/input/config/KickDef.kt

@@ -70,7 +70,7 @@ internal interface KickDef {
   fun customTypeAdaptersFromRequestConfig(): Map<Type, Either<JsonAdapter<out Any>, Factory>> =
     requestConfig()
       .filter { it.customTypeAdapter != null }
-      .associate { it.objType to it.customTypeAdapter!! }
+      .associate { it.requestType to it.customTypeAdapter!! }
 
   fun responseConfig(): Set<ResponseConfig>
 
@@ -82,7 +82,7 @@ internal interface KickDef {
   fun customTypeAdaptersFromResponseConfig(): Map<Type, Either<JsonAdapter<out Any>, Factory>> =
     responseConfig()
       .filter { it.customTypeAdapter != null }
-      .associate { it.objType to it.customTypeAdapter!! }
+      .associate { it.responseType to it.customTypeAdapter!! }
 
   fun globalCustomTypeAdapters(): List<Any>
 

src/main/kotlin/com/salesforce/revoman/input/config/RequestConfig.kt

@@ -17,7 +17,7 @@ import java.lang.reflect.Type
 data class RequestConfig
 internal constructor(
   val preTxnStepPick: PreTxnStepPick,
-  val objType: Type,
+  val requestType: Type,
   val customTypeAdapter: Either<JsonAdapter<out Any>, JsonAdapter.Factory>? = null,
 ) {
   companion object {

src/main/kotlin/com/salesforce/revoman/input/config/ResponseConfig.kt

@@ -18,7 +18,7 @@ data class ResponseConfig
 internal constructor(
   val postTxnStepPick: PostTxnStepPick,
   val ifSuccess: Boolean?,
-  val objType: Type,
+  val responseType: Type,
   val customTypeAdapter: Either<JsonAdapter<out Any>, JsonAdapter.Factory>? = null,
 ) {
   companion object {

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

@@ -41,7 +41,7 @@ internal fun unmarshallRequest(
         )
       }
       ?.also { logger.info { "$currentStep RequestConfig found : ${pprint(it)}" } }
-      ?.objType ?: Any::class.java
+      ?.requestType ?: Any::class.java
   return when {
     isJson(httpRequest) ->
       runCatching(currentStep, UNMARSHALL_REQUEST) {

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

@@ -40,7 +40,7 @@ internal fun unmarshallResponse(
       val responseType: Type =
         responseConfig
           ?.also { logger.info { "$currentStep ResponseConfig found : ${pprint(it)}" } }
-          ?.objType ?: Any::class.java
+          ?.responseType ?: Any::class.java
       val requestInfo = pm.currentStepReport.requestInfo!!.get()
       runCatching(currentStep, UNMARSHALL_RESPONSE) {
           moshiReVoman.fromJson<Any>(httpResponse.bodyString(), responseType)