Minor changes

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

Author: overfullstack

src/main/kotlin/com/salesforce/revoman/internal/json/MoshiReVoman.kt

@@ -11,6 +11,7 @@ package com.salesforce.revoman.internal.json
 
 import com.salesforce.revoman.internal.json.adapters.BigDecimalAdapter
 import com.salesforce.revoman.internal.json.adapters.EpochAdapter
+import com.salesforce.revoman.internal.json.adapters.TypeAdapter
 import com.salesforce.revoman.internal.json.adapters.UUIDAdapter
 import com.salesforce.revoman.internal.json.factories.CaseInsensitiveEnumAdapter
 import com.salesforce.revoman.internal.json.factories.IgnoreUnknownFactory
@@ -54,6 +55,7 @@ internal fun buildMoshi(
     Moshi.Builder()
       .add(JsonString.Factory())
       .add(AdaptedBy.Factory())
+      .add(TypeAdapter)
       .add(BigDecimalAdapter)
       .add(UUIDAdapter)
       .add(EpochAdapter)

src/main/kotlin/com/salesforce/revoman/internal/json/adapters/TypeAdapter.kt

@@ -0,0 +1,19 @@
+/**
+ * ************************************************************************************************
+ * Copyright (c) 2023, Salesforce, Inc. All rights reserved. SPDX-License-Identifier: Apache License
+ * Version 2.0 For full license text, see the LICENSE file in the repo root or
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * ************************************************************************************************
+ */
+package com.salesforce.revoman.internal.json.adapters
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.lang.reflect.Type
+import java.util.*
+
+object TypeAdapter {
+  @ToJson fun toJson(type: Type): String = type.toString()
+
+  @FromJson fun fromJson(typeStr: String): Type? = null
+}

src/main/kotlin/com/salesforce/revoman/internal/json/factories/CaseInsensitiveEnumAdapter.kt

@@ -52,7 +52,7 @@ internal class CaseInsensitiveEnumAdapter<T : Enum<T>>(private val enumType: Cla
           moshi: Moshi
         ): JsonAdapter<*>? {
           val rawType: Class<*> = Types.getRawType(type)
-          if (!rawType.isEnum()) {
+          if (!rawType.isEnum) {
             return null
           }
           return CaseInsensitiveEnumAdapter(rawType as Class<out Enum<*>>)

src/main/kotlin/com/salesforce/revoman/internal/json/factories/IgnoreUnknownFactory.kt

@@ -8,15 +8,15 @@
 package com.salesforce.revoman.internal.json.factories
 
 import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonAdapter.Factory
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import java.lang.reflect.Type
 
-internal class IgnoreUnknownFactory(private val typesToIgnore: Set<Class<out Any>>) :
-  JsonAdapter.Factory {
-  override fun create(type: Type, annotations: Set<Annotation?>, moshi: Moshi): JsonAdapter<*> {
+internal class IgnoreUnknownFactory(private val typesToIgnore: Set<Class<out Any>>) : Factory {
+  override fun create(type: Type, annotations: Set<Annotation?>, moshi: Moshi): JsonAdapter<*>? {
     val rawType: Class<*> = Types.getRawType(type)
     return if (typesToIgnore.contains(rawType)) {
       object : JsonAdapter<Type>() {
@@ -26,8 +26,6 @@ internal class IgnoreUnknownFactory(private val typesToIgnore: Set<Class<out Any
           // do nothing
         }
       }
-    } else {
-      moshi.nextAdapter<Any>(this, type, annotations)
-    }
+    } else null
   }
 }

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

@@ -22,7 +22,7 @@ data class TxnInfo<HttpMsgT : HttpMessage>(
   @JvmField val httpMsg: HttpMsgT,
   @JvmField val isJson: Boolean = true
 ) {
-  fun <T> getTypedTxnObj(): T? = txnObjType?.let { (it as Class<T>).cast(txnObj) }
+  fun <T> getTypedTxnObj(): T? = (txnObjType as? Class<T>)?.cast(txnObj)
 
   @JvmOverloads
   fun <T : Any> getTypedTxnObj(

src/test/kotlin/com/salesforce/revoman/internal/ExeUtilsTest.kt

@@ -28,7 +28,7 @@ class ExeUtilsTest {
         Moshi.Builder()
           .build()
           .adapter<Template>()
-          .fromJson(bufferFileInResources("pmCollection/steps-with-folders.json"))!!
+          .fromJson(bufferFileInResources("pm-templates/steps-with-folders.json"))!!
           .item
       )
       .map { it }