Refactor Subject and related APIs to use List<String> for path parameters, SortedMap<String, String> for query parameters, update factories, and improve path handling consistency.

rossdanderson · rossdanderson · commit 1959997b2e53 · 2026-07-14T13:34:24.000+01:00
diff --git a/buildSrc/src/main/kotlin/Channel.kt b/buildSrc/src/main/kotlin/Channel.kt
@@ -102,7 +102,7 @@ object Channel : FunctionProvider {
             .addParameter(channelRequestSupplierParameter)
             .addCode(
                 """
-                            %N.%N(%N, %N,%L) { request -> %N.asFlow(with(%N) { %T(request.path, request.pathVariables, request.queryParameters, %N.asPublisher(request.receive)).invoke() }) }
+                            %N.%N(%N, %N,%L) { request -> %N.asFlow(with(%N) { %T(request.pathParameters, request.pathVariables, request.queryParameters, %N.asPublisher(request.receive)).invoke() }) }
                         """
                     .trimIndent(),
                 binderProperty,
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -48,6 +48,7 @@ val pathSupplierClassName = ClassName(apiPackageName, "PathSupplier")
 val requestClassName = ClassName(apiPackageName, "Request")
 val requestSupplierClassName = ClassName(apiPackageName, "RequestSupplier")
 val subjectClassName = ClassName("com.caplin.integration.datasourcex.util", "Subject")
+val pathMemberName = MemberName(subjectClassName.nestedClass("Companion"), "path")
 val channelRequestClassName = ClassName(apiPackageName, "ChannelRequest")
 val channelRequestSupplierClassName = ClassName(apiPackageName, "ChannelRequestSupplier")
 val channelSupplierClassName = ClassName(apiPackageName, "ChannelSupplier")
diff --git a/buildSrc/src/main/kotlin/GenerateApi.kt b/buildSrc/src/main/kotlin/GenerateApi.kt
@@ -164,6 +164,7 @@ abstract class GenerateApi : DefaultTask() {
           val packageName = "$rootPackageName.${publisherType.packageName}"
           val fileBuilder =
               FileSpec.builder(packageName, bindTypeName)
+                  .apply { if (publishTypeName != "Broadcast") addImport(pathMemberName) }
                   .addAnnotation(
                       AnnotationSpec.builder(Suppress::class)
                           .useSiteTarget(AnnotationSpec.UseSiteTarget.FILE)
diff --git a/reactive/api/api/datasourcex-reactive-api.api b/reactive/api/api/datasourcex-reactive-api.api
@@ -104,11 +104,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/ChannelConfig
 }
 
 public final class com/caplin/integration/datasourcex/reactive/api/ChannelRequest : com/caplin/integration/datasourcex/util/Subject {
-	public fun <init> (Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/lang/Object;)V
-	public fun getPath ()Ljava/lang/String;
+	public fun <init> (Ljava/util/List;Ljava/util/LinkedHashMap;Ljava/util/SortedMap;Ljava/lang/Object;)V
 	public fun getPathParameters ()Ljava/util/List;
 	public final fun getPathVariables ()Ljava/util/LinkedHashMap;
-	public fun getQueryParameters ()Ljava/util/Map;
+	public fun getQueryParameters ()Ljava/util/SortedMap;
 	public final fun getReceive ()Ljava/lang/Object;
 }
 
@@ -209,11 +208,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/RecordType :
 }
 
 public final class com/caplin/integration/datasourcex/reactive/api/Request : com/caplin/integration/datasourcex/util/Subject {
-	public fun <init> (Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/util/Map;)V
-	public fun getPath ()Ljava/lang/String;
+	public fun <init> (Ljava/util/List;Ljava/util/LinkedHashMap;Ljava/util/SortedMap;)V
 	public fun getPathParameters ()Ljava/util/List;
 	public final fun getPathVariables ()Ljava/util/LinkedHashMap;
-	public fun getQueryParameters ()Ljava/util/Map;
+	public fun getQueryParameters ()Ljava/util/SortedMap;
 }
 
 public abstract interface class com/caplin/integration/datasourcex/reactive/api/RequestSupplier {
diff --git a/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/ChannelRequest.kt b/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/ChannelRequest.kt
@@ -1,23 +1,21 @@
 package com.caplin.integration.datasourcex.reactive.api
 
 import com.caplin.integration.datasourcex.util.Subject
+import java.util.SortedMap
 
 /**
  * A decomposed subject request passed to a supplier for a channel bind.
  *
- * @property path The full requested subject.
+ * @property pathParameters The subject's path parts, in order.
  * @property pathVariables The path variables extracted from the subject, keyed by name, in pattern
- *   order (which backs [pathParameters]).
+ *   order.
  * @property queryParameters The query parameters parsed from the subject's optional trailing
  *   `?a=b&c=d`, or empty when there is no query.
  * @property receive The flow of messages received from the client on this channel.
  */
 class ChannelRequest<R>(
-    override val path: String,
+    override val pathParameters: List<String>,
     val pathVariables: LinkedHashMap<String, String>,
-    override val queryParameters: Map<String, String>,
+    override val queryParameters: SortedMap<String, String>,
     val receive: R,
-) : Subject {
-  override val pathParameters: List<String>
-    get() = pathVariables.values.toList()
-}
+) : Subject
diff --git a/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/Request.kt b/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/Request.kt
@@ -1,21 +1,19 @@
 package com.caplin.integration.datasourcex.reactive.api
 
 import com.caplin.integration.datasourcex.util.Subject
+import java.util.SortedMap
 
 /**
  * A decomposed subject request passed to a supplier for an active or container bind.
  *
- * @property path The full requested subject.
+ * @property pathParameters The subject's path parts, in order.
  * @property pathVariables The path variables extracted from the subject, keyed by name, in pattern
- *   order (which backs [pathParameters]).
+ *   order.
  * @property queryParameters The query parameters parsed from the subject's optional trailing
  *   `?a=b&c=d`, or empty when there is no query.
  */
 class Request(
-    override val path: String,
+    override val pathParameters: List<String>,
     val pathVariables: LinkedHashMap<String, String>,
-    override val queryParameters: Map<String, String>,
-) : Subject {
-  override val pathParameters: List<String>
-    get() = pathVariables.values.toList()
-}
+    override val queryParameters: SortedMap<String, String>,
+) : Subject
diff --git a/reactive/core/src/main/kotlin/com/caplin/integration/datasourcex/reactive/core/Binder.kt b/reactive/core/src/main/kotlin/com/caplin/integration/datasourcex/reactive/core/Binder.kt
@@ -41,6 +41,7 @@ import com.caplin.integration.datasourcex.reactive.api.ServiceConfig
 import com.caplin.integration.datasourcex.util.AntPatternNamespace
 import com.caplin.integration.datasourcex.util.AntPatternNamespace.Companion.addIncludeNamespace
 import com.caplin.integration.datasourcex.util.Subject
+import com.caplin.integration.datasourcex.util.Subject.Companion.path
 import com.caplin.integration.datasourcex.util.getLogger
 import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -100,7 +101,11 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
 
   /** Decomposes [subject] into a [Request] using this namespace's extraction rules. */
   private fun AntPatternNamespace.request(subject: String): Request =
-      Request(subject, extractPathVariables(subject), extractQueryParameters(subject))
+      Request(
+          extractPathParameters(subject),
+          extractPathVariables(subject),
+          extractQueryParameters(subject),
+      )
 
   private data class ServiceInfo(
       val service: Service,
@@ -133,6 +138,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val config = with(configure) { ActiveConfig.Mapping().apply { invoke() } }
     val namespace = namespace.withUsernameDecoding(config.objectMappings)
+    logBind("active mapping", namespace, config.objectMappings)
     serviceInfo?.registerNamespace(namespace, config.objectMappings)
 
     dataSource.createActivePublisher(
@@ -193,6 +199,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val config = with(configure) { ActiveConfig.Json().apply { invoke() } }
     val namespace = namespace.withUsernameDecoding(config.objectMappings)
+    logBind("active JSON", namespace, config.objectMappings)
     serviceInfo?.registerNamespace(namespace, config.objectMappings)
 
     with(JsonContext()) {
@@ -209,6 +216,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val config = with(configure) { ActiveConfig.Record().apply { invoke() } }
     val namespace = namespace.withUsernameDecoding(config.objectMappings)
+    logBind("active record", namespace, config.objectMappings)
     serviceInfo?.registerNamespace(namespace, config.objectMappings)
 
     with(RecordContext(config.images, config.recordType)) {
@@ -261,6 +269,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val config = with(configure) { ChannelConfig.Record().apply { invoke() } }
     val namespace = namespace.withUsernameDecoding(config.objectMappings)
+    logBind("record channel", namespace, config.objectMappings)
     serviceInfo?.registerNamespace(namespace, config.objectMappings)
 
     val type = config.channelType
@@ -321,7 +330,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
                 val sendToClientJob =
                     supplier(
                             ChannelRequest(
-                                channel.subject,
+                                namespace.extractPathParameters(channel.subject),
                                 namespace.extractPathVariables(channel.subject),
                                 namespace.extractQueryParameters(channel.subject),
                                 fromClientChannel.consumeAsFlow(),
@@ -358,6 +367,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val config = with(configure) { ChannelConfig.Json().apply { invoke() } }
     val namespace = namespace.withUsernameDecoding(config.objectMappings)
+    logBind("JSON channel", namespace, config.objectMappings)
     serviceInfo?.registerNamespace(namespace, config.objectMappings)
 
     val type = config.channelType
@@ -406,7 +416,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
                 val sendToClientJob =
                     supplier(
                             ChannelRequest(
-                                channel.subject,
+                                namespace.extractPathParameters(channel.subject),
                                 namespace.extractPathVariables(channel.subject),
                                 namespace.extractQueryParameters(channel.subject),
                                 fromClientChannel.consumeAsFlow(),
@@ -441,6 +451,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
       flow: Flow<BroadcastEvent<Subject>>,
   ) {
     val config = with(configure) { BroadcastConfig.Mapping().apply { invoke() } }
+    logBind("broadcast mapping", namespace)
     serviceInfo?.registerNamespace(namespace, emptyMap())
 
     dataSource.launch {
@@ -496,6 +507,7 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
       flow: Flow<BroadcastEvent<Map<String, String>>>,
   ) {
     val config = with(configure) { BroadcastConfig.Record().apply { invoke() } }
+    logBind("broadcast record", namespace)
     serviceInfo?.registerNamespace(namespace, emptyMap())
 
     with(RecordContext(true, config.recordType)) {
@@ -556,7 +568,8 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
   ) {
     val rowPattern =
         AntPatternNamespace("${containerSubjectPattern.pattern}${config.rowPathSuffix}/{itemId}")
-    logger.info { "Using item pattern $rowPattern for container pattern $containerSubjectPattern" }
+    logBind("active container", containerSubjectPattern, config.objectMappings)
+    logBind("container row", rowPattern)
 
     serviceInfo?.registerNamespace(containerSubjectPattern, config.objectMappings)
     serviceInfo?.registerNamespace(rowPattern, emptyMap())
@@ -751,6 +764,28 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
     publishSubjectErrorEvent(messageFactory.createSubjectErrorEvent(subject, SubjectError.NotFound))
   }
 
+  private fun logBind(
+      what: String,
+      namespace: AntPatternNamespace,
+      objectMappings: Map<String, String>? = null,
+  ) {
+    logger.info {
+      buildString {
+        append(
+            "Binding $what to namespace '${namespace.pattern}' " +
+                "(posix '${namespace.posixExtendedPattern}')",
+        )
+        serviceInfo?.let { info ->
+          append(" on service '${info.serviceConfig.name}'")
+          objectMappings
+              ?.takeIf(Map<String, String>::isNotEmpty)
+              ?.let(namespace::getObjectMap)
+              ?.let { append(", object map '${it.fromPattern}' -> '${it.toPattern}'") }
+        }
+      }
+    }
+  }
+
   private fun ServiceInfo.registerNamespace(
       antPatternNamespace: AntPatternNamespace,
       mappings: Map<String, String>?,
@@ -774,5 +809,13 @@ private constructor(val dataSource: ScopedDataSource, private val serviceInfo: S
     service.setType(CONTRIB)
 
     dataSource.createService(service)
+    logger.info {
+      "Created service '${serviceConfig.name}' " +
+          "(remoteLabelPattern=${serviceConfig.remoteLabelPattern}, " +
+          "discardTimeout=${serviceConfig.discardTimeout}, " +
+          "throttleTime=${serviceConfig.throttleTime}, " +
+          "requiredState=${serviceConfig.requiredState}, " +
+          "ifLabelPatterns=${serviceConfig.ifLabelPatterns}, type=$CONTRIB)"
+    }
   }
 }
diff --git a/reactive/kotlin/src/test/kotlin/com/caplin/integration/datasourcex/reactive/kotlin/BindTest.kt b/reactive/kotlin/src/test/kotlin/com/caplin/integration/datasourcex/reactive/kotlin/BindTest.kt
@@ -19,6 +19,7 @@ import com.caplin.integration.datasourcex.reactive.api.InsertAt.HEAD
 import com.caplin.integration.datasourcex.reactive.api.Request
 import com.caplin.integration.datasourcex.reactive.api.RequestSupplier
 import com.caplin.integration.datasourcex.util.AntPatternNamespace
+import com.caplin.integration.datasourcex.util.Subject.Companion.path
 import com.caplin.integration.datasourcex.util.flow.ValueOrCompletion
 import com.caplin.integration.datasourcex.util.flow.ValueOrCompletion.Completion
 import com.caplin.integration.datasourcex.util.flow.ValueOrCompletion.Value
@@ -684,7 +685,7 @@ class BindTest :
         captured!!.also { request ->
           request.path shouldBeEqual "/QUERY/EUR%2FUSD?location=ONSHORE&tenor=SPOT"
           request.pathVariables shouldBeEqual mapOf("productPair" to "EUR/USD")
-          request.pathParameters shouldBeEqual listOf("EUR/USD")
+          request.pathParameters shouldBeEqual listOf("QUERY", "EUR/USD")
           request.queryParameters shouldBeEqual mapOf("location" to "ONSHORE", "tenor" to "SPOT")
         }
       }
@@ -729,8 +730,8 @@ class BindTest :
           // the ordinary path variable still is.
           captured!!.pathVariables shouldBeEqual
               mapOf("username" to "john%2Fdoe", "productPair" to "EUR/USD")
-          // pathParameters mirrors pathVariables' values in pattern order.
-          captured!!.pathParameters shouldBeEqual listOf("john%2Fdoe", "EUR/USD")
+          // pathParameters holds every path segment, URL-decoded, regardless of the pattern.
+          captured!!.pathParameters shouldBeEqual listOf("PRIVATE", "john/doe", "EUR/USD")
         }
       }
 
diff --git a/spring/src/main/kotlin/com/caplin/integration/datasourcex/spring/internal/DataSourceServerBootstrap.kt b/spring/src/main/kotlin/com/caplin/integration/datasourcex/spring/internal/DataSourceServerBootstrap.kt
@@ -11,6 +11,7 @@ import com.caplin.integration.datasourcex.spring.annotations.IngressDestinationV
 import com.caplin.integration.datasourcex.spring.internal.DataSourceRequestTypeMessageCondition.RequestType
 import com.caplin.integration.datasourcex.util.AntPatternNamespace
 import com.caplin.integration.datasourcex.util.AntPatternNamespace.Companion.addIncludeNamespace
+import com.caplin.integration.datasourcex.util.Subject.Companion.path
 import com.caplin.integration.datasourcex.util.getLogger
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicReference
diff --git a/util/api/datasourcex-util.api b/util/api/datasourcex-util.api
@@ -8,8 +8,9 @@ public final class com/caplin/integration/datasourcex/util/AntPatternNamespace :
 	public static final fun addIncludeNamespace (Lcom/caplin/datasource/Service;Lcom/caplin/integration/datasourcex/util/AntPatternNamespace;)V
 	public final fun copy (Ljava/util/Set;)Lcom/caplin/integration/datasourcex/util/AntPatternNamespace;
 	public static synthetic fun copy$default (Lcom/caplin/integration/datasourcex/util/AntPatternNamespace;Ljava/util/Set;ILjava/lang/Object;)Lcom/caplin/integration/datasourcex/util/AntPatternNamespace;
+	public final fun extractPathParameters (Ljava/lang/String;)Ljava/util/List;
 	public final fun extractPathVariables (Ljava/lang/String;)Ljava/util/LinkedHashMap;
-	public final fun extractQueryParameters (Ljava/lang/String;)Ljava/util/Map;
+	public final fun extractQueryParameters (Ljava/lang/String;)Ljava/util/SortedMap;
 	public final fun getObjectMap (Ljava/util/Map;)Lcom/caplin/integration/datasourcex/util/AntPatternNamespace$ObjectMap;
 	public final fun getPathVariables ()Ljava/util/Set;
 	public final fun getPattern ()Ljava/lang/String;
@@ -156,15 +157,17 @@ public final class com/caplin/integration/datasourcex/util/SimpleDataSourceFacto
 
 public abstract interface class com/caplin/integration/datasourcex/util/Subject {
 	public static final field Companion Lcom/caplin/integration/datasourcex/util/Subject$Companion;
-	public abstract fun getPath ()Ljava/lang/String;
+	public static fun getPath (Lcom/caplin/integration/datasourcex/util/Subject;)Ljava/lang/String;
 	public abstract fun getPathParameters ()Ljava/util/List;
-	public abstract fun getQueryParameters ()Ljava/util/Map;
+	public abstract fun getQueryParameters ()Ljava/util/SortedMap;
 	public static fun invoke (Ljava/util/List;)Lcom/caplin/integration/datasourcex/util/Subject;
 	public static fun invoke (Ljava/util/List;Ljava/util/Map;)Lcom/caplin/integration/datasourcex/util/Subject;
 	public static fun invoke ([Ljava/lang/String;)Lcom/caplin/integration/datasourcex/util/Subject;
 }
 
 public final class com/caplin/integration/datasourcex/util/Subject$Companion {
+	public final fun buildPath (Ljava/util/List;Ljava/util/SortedMap;)Ljava/lang/String;
+	public final fun getPath (Lcom/caplin/integration/datasourcex/util/Subject;)Ljava/lang/String;
 	public final fun invoke (Ljava/util/List;)Lcom/caplin/integration/datasourcex/util/Subject;
 	public final fun invoke (Ljava/util/List;Ljava/util/Map;)Lcom/caplin/integration/datasourcex/util/Subject;
 	public final fun invoke ([Ljava/lang/String;)Lcom/caplin/integration/datasourcex/util/Subject;
diff --git a/util/src/main/kotlin/com/caplin/integration/datasourcex/util/AntPatternNamespace.kt b/util/src/main/kotlin/com/caplin/integration/datasourcex/util/AntPatternNamespace.kt
@@ -5,6 +5,7 @@ import com.caplin.datasource.namespace.Namespace
 import java.net.URLDecoder
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
+import java.util.SortedMap
 
 /**
  * An implementation of [Namespace] that matches subjects based on Ant style path patterns.
@@ -39,10 +40,15 @@ constructor(pattern: String, val rawPathVariables: Set<String> = emptySet()) : N
      * Names and values are URL-decoded. A parameter with no `=` (e.g. `flag`) or an empty value
      * (e.g. `empty=`) maps to an empty string. When a key repeats, the last value wins.
      */
-    private fun parseQueryString(query: String): Map<String, String> =
-        query.split("&").filter(String::isNotEmpty).associate { parameter ->
-          urlDecode(parameter.substringBefore('=')) to urlDecode(parameter.substringAfter('=', ""))
-        }
+    private fun parseQueryString(query: String): SortedMap<String, String> =
+        query
+            .split("&")
+            .filter(String::isNotEmpty)
+            .associate { parameter ->
+              urlDecode(parameter.substringBefore('=')) to
+                  urlDecode(parameter.substringAfter('=', ""))
+            }
+            .toSortedMap()
 
     private fun urlDecode(value: String): String = URLDecoder.decode(value, CHARSET)
 
@@ -126,14 +132,24 @@ constructor(pattern: String, val rawPathVariables: Set<String> = emptySet()) : N
         .toMap(LinkedHashMap())
   }
 
+  /**
+   * Splits the path portion of a subject into its URL-decoded segments, in order. Any trailing
+   * `?query` is ignored.
+   *
+   * @param subject The subject to extract path parameters from.
+   * @return The subject's path parts, decoded.
+   */
+  fun extractPathParameters(subject: String): List<String> =
+      subject.pathPortion.split('/').filter(String::isNotEmpty).map(::urlDecode)
+
   /**
    * Extracts the query parameters from the optional trailing `?a=b&c=d` portion of a subject.
    *
    * @param subject The subject to extract query parameters from.
    * @return A map of query parameter names to values, or an empty map when the subject has no
    *   query.
    */
-  fun extractQueryParameters(subject: String): Map<String, String> =
+  fun extractQueryParameters(subject: String): SortedMap<String, String> =
       parseQueryString(subject.substringAfter('?', ""))
 
   /** Returns a copy of this namespace with [rawPathVariables] replaced. */
diff --git a/util/src/main/kotlin/com/caplin/integration/datasourcex/util/Subject.kt b/util/src/main/kotlin/com/caplin/integration/datasourcex/util/Subject.kt
diff --git a/util/src/test/kotlin/com/caplin/integration/datasourcex/util/SubjectTest.kt b/util/src/test/kotlin/com/caplin/integration/datasourcex/util/SubjectTest.kt

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/ChannelConfig`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public final class com/caplin/integration/datasourcex/reactive/api/ChannelRequest : com/caplin/integration/datasourcex/util/Subject {`
`107`		`- public fun <init> (Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/util/Map;Ljava/lang/Object;)V`
`108`		`- public fun getPath ()Ljava/lang/String;`
	`107`	`+ public fun <init> (Ljava/util/List;Ljava/util/LinkedHashMap;Ljava/util/SortedMap;Ljava/lang/Object;)V`
`109`	`108`	`public fun getPathParameters ()Ljava/util/List;`
`110`	`109`	`public final fun getPathVariables ()Ljava/util/LinkedHashMap;`
`111`		`- public fun getQueryParameters ()Ljava/util/Map;`
	`110`	`+ public fun getQueryParameters ()Ljava/util/SortedMap;`
`112`	`111`	`public final fun getReceive ()Ljava/lang/Object;`
`113`	`112`	`}`
`114`	`113`
`@@ -209,11 +208,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/RecordType :`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`public final class com/caplin/integration/datasourcex/reactive/api/Request : com/caplin/integration/datasourcex/util/Subject {`
`212`		`- public fun <init> (Ljava/lang/String;Ljava/util/LinkedHashMap;Ljava/util/Map;)V`
`213`		`- public fun getPath ()Ljava/lang/String;`
	`211`	`+ public fun <init> (Ljava/util/List;Ljava/util/LinkedHashMap;Ljava/util/SortedMap;)V`
`214`	`212`	`public fun getPathParameters ()Ljava/util/List;`
`215`	`213`	`public final fun getPathVariables ()Ljava/util/LinkedHashMap;`
`216`		`- public fun getQueryParameters ()Ljava/util/Map;`
	`214`	`+ public fun getQueryParameters ()Ljava/util/SortedMap;`
`217`	`215`	`}`
`218`	`216`
`219`	`217`	`public abstract interface class com/caplin/integration/datasourcex/reactive/api/RequestSupplier {`