fix(deps): update fory to v1.6.1

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ jmh = "1.37"
 jmh-plugin = "0.7.3"
 kotlinpoet = "2.3.0"
 ktfmt = "0.61"
-fory = "1.1.0"
+fory = "1.6.1"
 
 # Caplin Dependencies
 datasource = "8.0.12-1871-367ddb14"

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/DataSourceModule.kt

@@ -15,6 +15,10 @@ fun Fory.registerDataSourceSerializers(preserveExceptionTypes: Boolean = false):
     check(config.trackingRef()) {
       "Tracking references must be enabled for exception types preservation"
     }
+    check(!config.isScopedMetaShareEnabled) {
+      "Scoped meta share is incompatible with exception types preservation; use " +
+          "CompatibleMode.SCHEMA_CONSISTENT (or disable meta share) on the Fory instance"
+    }
     registerSerializerFactory(ThrowableSerializerFactory)
   }
 

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/PersistentHashMapSerializer.kt

@@ -13,8 +13,11 @@ internal class PersistentHashMapSerializer(
     type: Class<PersistentMap<*, *>>,
 ) : MapSerializer<PersistentMap<*, *>>(typeResolver, type, true) {
 
-  override fun newMap(readContext: ReadContext): MutableMap<*, *> {
-    val numElements = readMapSize(readContext.buffer)
+  override fun newMap(
+      readContext: ReadContext,
+      entryReadAlwaysAdvances: Boolean,
+  ): MutableMap<*, *> {
+    val numElements = readMapSize(readContext, readContext.buffer, entryReadAlwaysAdvances)
     setNumElements(numElements)
     val map = HashMap<Any?, Any?>(numElements)
     readContext.reference(map)

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/PersistentHashSetSerializer.kt

@@ -13,8 +13,11 @@ internal class PersistentHashSetSerializer(
     type: Class<PersistentSet<*>>,
 ) : CollectionSerializer<PersistentSet<*>>(typeResolver, type, true) {
 
-  override fun newCollection(readContext: ReadContext): MutableCollection<*> {
-    val numElements = readCollectionSize(readContext.buffer)
+  override fun newCollection(
+      readContext: ReadContext,
+      elementReadAlwaysAdvances: Boolean,
+  ): MutableCollection<*> {
+    val numElements = readCollectionSize(readContext, readContext.buffer, elementReadAlwaysAdvances)
     setNumElements(numElements)
     val set = HashSet<Any?>(numElements)
     readContext.reference(set)

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/PersistentOrderedMapSerializer.kt

@@ -13,8 +13,11 @@ internal class PersistentOrderedMapSerializer(
     type: Class<PersistentMap<*, *>>,
 ) : MapSerializer<PersistentMap<*, *>>(typeResolver, type, true) {
 
-  override fun newMap(readContext: ReadContext): MutableMap<*, *> {
-    val numElements = readMapSize(readContext.buffer)
+  override fun newMap(
+      readContext: ReadContext,
+      entryReadAlwaysAdvances: Boolean,
+  ): MutableMap<*, *> {
+    val numElements = readMapSize(readContext, readContext.buffer, entryReadAlwaysAdvances)
     setNumElements(numElements)
     val map = LinkedHashMap<Any?, Any?>(numElements)
     readContext.reference(map)

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/PersistentOrderedSetSerializer.kt

@@ -13,8 +13,11 @@ internal class PersistentOrderedSetSerializer(
     type: Class<PersistentSet<*>>,
 ) : CollectionSerializer<PersistentSet<*>>(typeResolver, type, true) {
 
-  override fun newCollection(readContext: ReadContext): MutableCollection<*> {
-    val numElements = readCollectionSize(readContext.buffer)
+  override fun newCollection(
+      readContext: ReadContext,
+      elementReadAlwaysAdvances: Boolean,
+  ): MutableCollection<*> {
+    val numElements = readCollectionSize(readContext, readContext.buffer, elementReadAlwaysAdvances)
     setNumElements(numElements)
     val set = LinkedHashSet<Any?>(numElements)
     readContext.reference(set)

util/src/test/kotlin/com/caplin/integration/datasourcex/util/serialization/fory/ValueOrCompletionSerializationTest.kt

@@ -5,6 +5,7 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import org.apache.fory.Fory
+import org.apache.fory.config.CompatibleMode
 import org.apache.fory.config.Language
 
 class CustomException(val customMessage: String) : Exception(customMessage)
@@ -31,6 +32,7 @@ class ValueOrCompletionSerializationTest :
               Fory.builder()
                   .withLanguage(Language.JAVA)
                   .requireClassRegistration(false)
+                  .withCompatibleMode(CompatibleMode.SCHEMA_CONSISTENT)
                   .withRefTracking(true)
                   .build()
                   .registerDataSourceSerializers(preserveExceptionTypes = true)