Merge remote-tracking branch 'origin/main' into springboot-4

Author: rossdanderson

util/api/datasourcex-util.api

@@ -181,7 +181,7 @@ public final class com/caplin/integration/datasourcex/util/flow/FlatMapFirstKt {
 }
 
 public abstract interface class com/caplin/integration/datasourcex/util/flow/FlowMap : com/caplin/integration/datasourcex/util/flow/MapFlow, java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
-	public abstract fun asMap ()Lkotlinx/collections/immutable/PersistentMap;
+	public abstract fun asMap ()Ljava/util/Map;
 }
 
 public final class com/caplin/integration/datasourcex/util/flow/FlowMapKt {

util/src/main/kotlin/com/caplin/integration/datasourcex/util/flow/FlowMap.kt

@@ -80,7 +80,7 @@ interface MutableFlowMap<K : Any, V : Any> : FlowMap<K, V> {
 interface FlowMap<K : Any, V : Any> : MapFlow<K, V>, Map<K, V> {
 
   /** A copy of the map at this point in time */
-  fun asMap(): PersistentMap<K, V>
+  fun asMap(): Map<K, V>
 }
 
 /** An event emitted by [MapFlow.asFlowWithState]. */

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson2/FlowMapStreamEventDeserializer.kt

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode
 
 internal class FlowMapStreamEventDeserializer :
     StdDeserializer<FlowMapStreamEvent<*, *>>(FlowMapStreamEvent::class.java) {
+  @Suppress("UNCHECKED_CAST")
   override fun deserialize(p: JsonParser, ctxt: DeserializationContext): FlowMapStreamEvent<*, *> {
     val node = p.codec.readTree<ObjectNode>(p)
     val type =

util/src/main/kotlin/com/caplin/integration/datasourcex/util/serialization/jackson3/FlowMapStreamEventDeserializer.kt

@@ -9,6 +9,7 @@ import tools.jackson.databind.deser.std.StdDeserializer
 
 internal class FlowMapStreamEventDeserializer :
     StdDeserializer<FlowMapStreamEvent<*, *>>(FlowMapStreamEvent::class.java) {
+  @Suppress("UNCHECKED_CAST")
   override fun deserialize(p: JsonParser, ctxt: DeserializationContext): FlowMapStreamEvent<*, *> {
     val node = ctxt.readTree(p)
     val type =