Release 0.7.5

Fix getTypedObj for String

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

Author: overfullstack

buildSrc/src/main/kotlin/Config.kt

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.7.4.1"
+const val VERSION = "0.7.5"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

src/main/kotlin/com/salesforce/revoman/output/postman/PostmanEnvironment.kt

@@ -125,6 +125,7 @@ constructor(
     return when {
       value == null -> null
       targetType.rawType.isPrimitive && targetType.rawType.isInstance(value) -> value
+      targetType == String::class.java -> value
       else -> {
         moshiReVoman.addAdapters(customAdapters, customAdaptersWithType, typesToIgnore)
         when (value) {
@@ -145,9 +146,10 @@ constructor(
     typesToIgnore: Set<Type> = emptySet(),
   ): PojoT? {
     val value = mutableEnv[key]
-    return when (value) {
-      null -> null
-      is PojoT -> value
+    return when {
+      value == null -> null
+      value is PojoT -> value
+      PojoT::class == String::class -> value as PojoT
       else -> {
         moshiReVoman.addAdapters(customAdapters, customAdaptersWithType, typesToIgnore)
         when (value) {

src/main/kotlin/com/salesforce/revoman/output/report/TxnInfo.kt

@@ -27,24 +27,26 @@ constructor(
   val moshiReVoman: MoshiReVoman,
 ) {
   @JvmOverloads
-  fun <T : Any> getTypedTxnObj(
-    txnObjType: Type = this.txnObjType ?: Any::class.java,
+  fun <PojoT : Any> getTypedTxnObj(
+    targetType: Type = this.txnObjType ?: Any::class.java,
     customAdapters: List<Any> = emptyList(),
     customAdaptersWithType: Map<Type, Either<JsonAdapter<out Any>, JsonAdapter.Factory>> =
       emptyMap(),
     typesToIgnore: Set<Type> = emptySet(),
-  ): T? =
+  ): PojoT? =
     when {
       // ! TODO 15/10/23 gopala.akshintala: xml2Json
+      txnObj == null -> null
+      targetType.rawType.isInstance(txnObj) -> txnObj
+      targetType == String::class.java -> txnObj
       !isJson ->
         throw IllegalCallerException("Non JSON (like XML) marshalling to POJO is not yet supported")
-      txnObjType == this.txnObjType -> txnObj
       else -> {
         moshiReVoman.addAdapters(customAdapters, customAdaptersWithType, typesToIgnore)
-        moshiReVoman.fromJson(httpMsg.bodyString(), txnObjType)
+        moshiReVoman.fromJson(httpMsg.bodyString(), targetType)
       }
     }
-      as T?
+      as PojoT?
 
   @JvmOverloads
   inline fun <reified PojoT : Any> getTxnObj(
@@ -54,10 +56,11 @@ constructor(
     typesToIgnore: Set<Type> = emptySet(),
   ): PojoT? =
     when {
-      // ! TODO 15/10/23 gopala.akshintala: xml2Json
+      txnObj == null -> null
+      txnObj is PojoT -> txnObj
+      PojoT::class == String::class -> txnObj
       !isJson ->
         throw IllegalCallerException("Non JSON (like XML) marshalling to POJO is not yet supported")
-      txnObjType != null && PojoT::class.java == txnObjType.rawType -> txnObj
       else -> {
         moshiReVoman.addAdapters(customAdapters, customAdaptersWithType, typesToIgnore)
         moshiReVoman.fromJson(httpMsg.bodyString())

src/test/java/com/salesforce/revoman/output/postman/PostmanEnvironmentTest.java

@@ -71,6 +71,8 @@ void getTypedObj() {
 							}
 							""",
 						"key7",
+						"some string",
+						"key8",
 						null);
 		final var pm = new PostmanEnvironment<>(env.toJavaMap());
 		assertThat(pm.<Integer>getTypedObj("key1", Integer.class)).isEqualTo(env.get("key1").get());
@@ -91,6 +93,7 @@ void getTypedObj() {
 						pm.<Map<String, Object>>getTypedObj(
 								"key6", Types.newParameterizedType(Map.class, String.class, Object.class)))
 				.isInstanceOf(Map.class);
-		assertThat(pm.<Object>getTypedObj("key7", Object.class)).isNull();
+		assertThat(pm.<String>getTypedObj("key7", String.class)).isEqualTo(env.get("key7"));
+		assertThat(pm.<Object>getTypedObj("key8", Object.class)).isNull();
 	}
 }

src/test/kotlin/com/salesforce/revoman/output/report/PostmanEnvironmentKtTest.kt

@@ -64,7 +64,8 @@ class PostmanEnvironmentKtTest {
             "Category": "Original"
           }
           """,
-        "key7" to null,
+        "key7" to "some string",
+        "key8" to null,
       )
     val pmEnv = PostmanEnvironment(env)
     pmEnv.getObj<Int>("key1")!! shouldBeEqual env["key1"] as Int
@@ -73,6 +74,7 @@ class PostmanEnvironmentKtTest {
     pmEnv.getObj<Map<String, Int>>("key4")!! shouldContainExactly env["key4"] as Map<String, Int>
     pmEnv.getObj<List<String>>("key5")!! shouldContainExactly env["key5"] as List<String>
     pmEnv.getObj<Map<String, Any?>>("key6")!!.shouldNotBeEmpty()
-    pmEnv.getObj<Any>("key7") shouldBe null
+    pmEnv.getObj<String>("key7") shouldBe env["key7"]
+    pmEnv.getObj<Any>("key8") shouldBe null
   }
 }