Release 0.41.4

Remove static singleton Moshi instance

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

Author: overfullstack

README.adoc

@@ -18,7 +18,7 @@ endif::[]
 :pmtemplates: src/integrationTest/resources/pm-templates
 :imagesdir: docs/images
 :prewrap!:
-:revoman-version: 0.41.3
+:revoman-version: 0.41.4
 
 '''
 

buildSrc/src/main/kotlin/Config.kt

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

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

@@ -33,23 +33,6 @@ import org.http4k.format.asConfigurable
 import org.http4k.format.withStandardMappings
 
 internal lateinit var moshiReVoman: Moshi
-private val moshiBuilder: Moshi.Builder =
-  Moshi.Builder()
-    .add(JsonString.Factory())
-    .add(AdaptedBy.Factory())
-    .add(TypeAdapter)
-    .add(BigDecimalAdapter)
-    .add(UUIDAdapter)
-    .add(EpochAdapter)
-    .add(Date::class.java, Rfc3339DateJsonAdapter())
-    .addLast(CaseInsensitiveEnumAdapter.FACTORY)
-    .addLast(EventAdapter)
-    .addLast(ThrowableAdapter)
-    .addLast(ListAdapter)
-    .addLast(MapAdapter)
-    .asConfigurable()
-    .withStandardMappings()
-    .done()
 
 @JvmOverloads
 internal fun initMoshi(
@@ -68,6 +51,25 @@ internal fun buildMoshi(
   customAdaptersWithType: Map<Type, List<Either<JsonAdapter<Any>, Factory>>> = emptyMap(),
   typesToIgnore: Set<Class<out Any>> = emptySet()
 ): Moshi.Builder {
+  // * NOTE 08 May 2024 gopala.akshintala: This cannot be static singleton as adapters added mutates
+  // the singleton
+  val moshiBuilder =
+    Moshi.Builder()
+      .add(JsonString.Factory())
+      .add(AdaptedBy.Factory())
+      .add(TypeAdapter)
+      .add(BigDecimalAdapter)
+      .add(UUIDAdapter)
+      .add(EpochAdapter)
+      .add(Date::class.java, Rfc3339DateJsonAdapter())
+      .addLast(CaseInsensitiveEnumAdapter.FACTORY)
+      .addLast(EventAdapter)
+      .addLast(ThrowableAdapter)
+      .addLast(ListAdapter)
+      .addLast(MapAdapter)
+      .asConfigurable()
+      .withStandardMappings()
+      .done()
   customAdaptersWithType.forEach { (type, customAdapters) ->
     customAdapters.forEach { customAdapter ->
       customAdapter.fold({ moshiBuilder.add(type, it) }, { moshiBuilder.add(it) })