Add a context object onto Bind to provide access to DataSource for later extensions to the Bind class.

rossdanderson · rossdanderson · commit 51f990cd88a5 · 2025-07-18T13:33:58.000+01:00
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Add the required dependencies to your project:
 
 ```kotlin
 dependencies {
-    implementation("com.caplin.integration:datasourcex-<java-flow|kotlin|reactivestreams>:<version>")
+    implementation("com.caplin.integration.datasourcex:datasourcex-<java-flow|kotlin|reactivestreams>:<version>")
 }
 ```
 
@@ -40,7 +40,7 @@ Add the following dependency to your project:
 
 ```kotlin
 dependencies {
-    implementation("com.caplin.integration:spring-boot-starter-datasource:<version>")
+    implementation("com.caplin.integration.datasourcex:spring-boot-starter-datasource:<version>")
 }
 ```
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
 }
 
 dependencies {
+  implementation(libs.kotlinpoet)
+
   implementation(libs.ktfmt.plugin)
   implementation(libs.dokka.plugin)
   implementation(libs.detekt.plugin)
   implementation(libs.binary.compatibility.validator.plugin)
   implementation(libs.kover.plugin)
   implementation(libs.kotlin.plugin)
   implementation(libs.kotlin.allopen.plugin)
-  implementation(libs.kotlinpoet.plugin)
   implementation(libs.vanniktech.maven.publish.plugin)
 }
diff --git a/examples/spring-kotlin-chat/build.gradle.kts b/examples/spring-kotlin-chat/build.gradle.kts
@@ -12,8 +12,4 @@ dependencies {
   implementation("org.springframework.boot:spring-boot-starter")
 }
 
-dokka {
-  dokkaSourceSets.configureEach {
-    includes.from("README.md")
-  }
-}
+dokka { dokkaSourceSets.configureEach { includes.from("README.md") } }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@ springBoot = "3.5.0"
 kotlin = "1.9.25" # Keep in sync with Spring - https://docs.spring.io/spring-boot/docs/current/reference/html/dependency-versions.html
 kotlinCollectionsImmutable = "0.3.8"
 jsonPatch = "1.13"
+kotlinpoet = "2.2.0"
 
 # Caplin Dependencies
 datasource = "8.0.6-1430-651ec808"
@@ -15,18 +16,18 @@ mockk = "1.13.14"
 # Spring BOM should manage other dependencies versions.
 
 # Plugins
-ktfmt-plugin = "0.21.0"
+ktfmt-plugin = "0.23.0"
 dokka-plugin = "2.0.0"
 binary-compatibility-validator-plugin = "0.17.0"
 kover-plugin = "0.9.1"
-kotlinpoet-plugin = "2.1.0"
 detekt-plugin = "1.23.8"
 vanniktech-maven-publish-plugin = "0.31.0"
 
 
 [libraries]
 kotlin-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinCollectionsImmutable" }
 json-patch = { module = "com.github.java-json-tools:json-patch", version.ref = "jsonPatch" }
+kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 
 # Caplin Dependencies
 datasource = { module = "com.caplin.platform.integration.java:datasource", version.ref = "datasource" }
@@ -43,7 +44,6 @@ ktfmt-plugin = { module = "com.ncorti.ktfmt.gradle:plugin", version.ref = "ktfmt
 dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka-plugin" }
 binary-compatibility-validator-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "binary-compatibility-validator-plugin" }
 kover-plugin = { module = "org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin", version.ref = "kover-plugin" }
-kotlinpoet-plugin = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet-plugin" }
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-allopen-plugin = { module = "org.jetbrains.kotlin.plugin.allopen:org.jetbrains.kotlin.plugin.allopen.gradle.plugin", version.ref = "kotlin" }
 vanniktech-maven-publish-plugin = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "vanniktech-maven-publish-plugin"}
diff --git a/reactive/api/api/datasourcex-reactive-api.api b/reactive/api/api/datasourcex-reactive-api.api
@@ -50,6 +50,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/ActiveContain
 	public final fun setRowRecordType (Lcom/caplin/integration/datasourcex/reactive/api/RecordType;)V
 }
 
+public abstract interface class com/caplin/integration/datasourcex/reactive/api/BindContext {
+	public abstract fun getDataSource ()Lcom/caplin/datasource/DataSource;
+}
+
 public abstract interface annotation class com/caplin/integration/datasourcex/reactive/api/BindMarker : java/lang/annotation/Annotation {
 }
 
diff --git a/reactive/api/build.gradle.kts b/reactive/api/build.gradle.kts
@@ -1,6 +1,4 @@
-plugins {
-  `common-library`
-}
+plugins { `common-library` }
 
 description = "Common public API for Reactive DataSource extensions"
 
@@ -18,12 +16,6 @@ dependencies {
   testImplementation(libs.turbine)
 }
 
-apiValidation {
-  ignoredPackages.add("com.caplin.integration.datasourcex.reactive.internal")
-}
+apiValidation { ignoredPackages.add("com.caplin.integration.datasourcex.reactive.internal") }
 
-dokka {
-  dokkaSourceSets.configureEach {
-    includes.from("README.md")
-  }
-}
+dokka { dokkaSourceSets.configureEach { includes.from("README.md") } }
diff --git a/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/BindContext.kt b/reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/BindContext.kt
@@ -0,0 +1,8 @@
+package com.caplin.integration.datasourcex.reactive.api
+
+import com.caplin.datasource.DataSource
+
+interface BindContext {
+  /** The [DataSource] that is currently being bound to. */
+  val dataSource: DataSource
+}
diff --git a/reactive/core/build.gradle.kts b/reactive/core/build.gradle.kts
@@ -1,6 +1,4 @@
-plugins {
-  `common-library`
-}
+plugins { `common-library` }
 
 description = "Common private implementation for Reactive DataSource extensions"
 
@@ -20,6 +18,4 @@ dependencies {
   testImplementation(libs.turbine)
 }
 
-apiValidation {
-  ignoredPackages.add("com.caplin.integration.datasourcex.reactive.core")
-}
+apiValidation { ignoredPackages.add("com.caplin.integration.datasourcex.reactive.core") }
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
@@ -67,10 +67,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.selects.whileSelect
 
 class Binder
-private constructor(
-    private val dataSource: ScopedDataSource,
-    private val serviceInfo: ServiceInfo?
-) {
+private constructor(val dataSource: ScopedDataSource, private val serviceInfo: ServiceInfo?) {
 
   constructor(dataSource: ScopedDataSource) : this(dataSource, null)
 
diff --git a/reactive/java-flow/api/datasourcex-java-flow.api b/reactive/java-flow/api/datasourcex-java-flow.api
@@ -8,6 +8,7 @@ public final class com/caplin/integration/datasourcex/reactive/java/Bind {
 	public final synthetic fun broadcast (Lkotlin/jvm/functions/Function1;)V
 	public final fun channel (Ljava/util/function/Consumer;)V
 	public final synthetic fun channel (Lkotlin/jvm/functions/Function1;)V
+	public final fun getContext ()Lcom/caplin/integration/datasourcex/reactive/api/BindContext;
 	public final fun to (Ljava/lang/String;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V
 	public final synthetic fun to (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun to$default (Lcom/caplin/integration/datasourcex/reactive/java/Bind;Ljava/lang/String;Ljava/util/function/Consumer;Ljava/util/function/Consumer;ILjava/lang/Object;)V
diff --git a/reactive/java-flow/build.gradle.kts b/reactive/java-flow/build.gradle.kts
@@ -1,6 +1,4 @@
-plugins {
-  `common-reactive-library`
-}
+plugins { `common-reactive-library` }
 
 description = "Java Flow based Reactive DataSource extensions"
 
@@ -20,9 +18,7 @@ dependencies {
   samplesImplementation("io.projectreactor:reactor-core")
 }
 
-tasks.generateApi {
-  publisherType = "java"
-}
+tasks.generateApi { publisherType = "java" }
 
 dokka {
   dokkaSourceSets.configureEach {
diff --git a/reactive/java-flow/src/main/kotlin/com/caplin/integration/datasourcex/reactive/java/Bind.kt b/reactive/java-flow/src/main/kotlin/com/caplin/integration/datasourcex/reactive/java/Bind.kt
@@ -1,6 +1,7 @@
 package com.caplin.integration.datasourcex.reactive.java
 
 import com.caplin.datasource.DataSource
+import com.caplin.integration.datasourcex.reactive.api.BindContext
 import com.caplin.integration.datasourcex.reactive.api.BindMarker
 import com.caplin.integration.datasourcex.reactive.api.ServiceConfig
 import com.caplin.integration.datasourcex.reactive.core.Binder
@@ -18,6 +19,11 @@ import org.reactivestreams.FlowAdapters
 @BindMarker
 class Bind internal constructor(private val binder: Binder) {
 
+  val context: BindContext =
+      object : BindContext {
+        override val dataSource = binder.dataSource
+      }
+
   companion object {
     @Suppress("UNCHECKED_CAST")
     private object Adapter : IFlowAdapter {
diff --git a/reactive/kotlin/api/datasourcex-kotlin.api b/reactive/kotlin/api/datasourcex-kotlin.api
@@ -3,6 +3,7 @@ public final class com/caplin/integration/datasourcex/reactive/kotlin/Bind {
 	public final fun activeContainer (Lkotlin/jvm/functions/Function1;)V
 	public final fun broadcast (Lkotlin/jvm/functions/Function1;)V
 	public final fun channel (Lkotlin/jvm/functions/Function1;)V
+	public final fun getContext ()Lcom/caplin/integration/datasourcex/reactive/api/BindContext;
 	public final fun to (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun to$default (Lcom/caplin/integration/datasourcex/reactive/kotlin/Bind;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 }
diff --git a/reactive/kotlin/build.gradle.kts b/reactive/kotlin/build.gradle.kts
@@ -1,6 +1,4 @@
-plugins {
-  `common-reactive-library`
-}
+plugins { `common-reactive-library` }
 
 description = "Kotlin based Reactive DataSource extensions"
 
@@ -18,9 +16,7 @@ dependencies {
   testImplementation(libs.turbine)
 }
 
-tasks.generateApi {
-  publisherType = "kotlin"
-}
+tasks.generateApi { publisherType = "kotlin" }
 
 dokka {
   dokkaSourceSets.configureEach {
diff --git a/reactive/kotlin/src/main/kotlin/com/caplin/integration/datasourcex/reactive/kotlin/Bind.kt b/reactive/kotlin/src/main/kotlin/com/caplin/integration/datasourcex/reactive/kotlin/Bind.kt
@@ -1,6 +1,7 @@
 package com.caplin.integration.datasourcex.reactive.kotlin
 
 import com.caplin.datasource.DataSource
+import com.caplin.integration.datasourcex.reactive.api.BindContext
 import com.caplin.integration.datasourcex.reactive.api.BindMarker
 import com.caplin.integration.datasourcex.reactive.api.ServiceConfig
 import com.caplin.integration.datasourcex.reactive.core.Binder
@@ -24,6 +25,11 @@ internal fun DataSource.bind(scope: CoroutineScope, bind: Bind.() -> Unit) {
 @BindMarker
 class Bind internal constructor(private val binder: Binder) {
 
+  val context: BindContext =
+      object : BindContext {
+        override val dataSource = binder.dataSource
+      }
+
   private companion object {
     @Suppress("UNCHECKED_CAST")
     private object Adapter : IFlowAdapter {
diff --git a/reactive/reactivestreams/api/datasourcex-reactivestreams.api b/reactive/reactivestreams/api/datasourcex-reactivestreams.api
@@ -8,6 +8,7 @@ public final class com/caplin/integration/datasourcex/reactive/reactivestreams/B
 	public final synthetic fun broadcast (Lkotlin/jvm/functions/Function1;)V
 	public final fun channel (Ljava/util/function/Consumer;)V
 	public final synthetic fun channel (Lkotlin/jvm/functions/Function1;)V
+	public final fun getContext ()Lcom/caplin/integration/datasourcex/reactive/api/BindContext;
 	public final fun to (Ljava/lang/String;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V
 	public final synthetic fun to (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun to$default (Lcom/caplin/integration/datasourcex/reactive/reactivestreams/Bind;Ljava/lang/String;Ljava/util/function/Consumer;Ljava/util/function/Consumer;ILjava/lang/Object;)V
diff --git a/reactive/reactivestreams/build.gradle.kts b/reactive/reactivestreams/build.gradle.kts
@@ -1,6 +1,4 @@
-plugins {
-  `common-reactive-library`
-}
+plugins { `common-reactive-library` }
 
 description = "Reactive Streams based Reactive DataSource extensions"
 
@@ -21,9 +19,7 @@ dependencies {
   samplesImplementation("io.projectreactor:reactor-core")
 }
 
-tasks.generateApi {
-  publisherType = "reactivestreams"
-}
+tasks.generateApi { publisherType = "reactivestreams" }
 
 dokka {
   dokkaSourceSets.configureEach {
diff --git a/reactive/reactivestreams/src/main/kotlin/com/caplin/integration/datasourcex/reactive/reactivestreams/Bind.kt b/reactive/reactivestreams/src/main/kotlin/com/caplin/integration/datasourcex/reactive/reactivestreams/Bind.kt
@@ -1,6 +1,7 @@
 package com.caplin.integration.datasourcex.reactive.reactivestreams
 
 import com.caplin.datasource.DataSource
+import com.caplin.integration.datasourcex.reactive.api.BindContext
 import com.caplin.integration.datasourcex.reactive.api.BindMarker
 import com.caplin.integration.datasourcex.reactive.api.ServiceConfig
 import com.caplin.integration.datasourcex.reactive.core.Binder
@@ -17,6 +18,11 @@ import org.reactivestreams.Publisher
 @BindMarker
 class Bind internal constructor(private val binder: Binder) {
 
+  val context: BindContext =
+      object : BindContext {
+        override val dataSource = binder.dataSource
+      }
+
   companion object {
     @Suppress("UNCHECKED_CAST")
     private object Adapter : IFlowAdapter {
diff --git a/spring/build.gradle.kts b/spring/build.gradle.kts
@@ -28,18 +28,17 @@ dependencies {
   testImplementation(libs.turbine)
 }
 
-val prepareReadme = tasks.register<Copy>("prepareReadme") {
-  from(layout.projectDirectory.file("README.md"))
-  expand("springBootVersion" to libs.versions.springBoot.get())
-  into(layout.buildDirectory.dir("readme"))
-}
+val prepareReadme =
+    tasks.register<Copy>("prepareReadme") {
+      from(layout.projectDirectory.file("README.md"))
+      expand("springBootVersion" to libs.versions.springBoot.get())
+      into(layout.buildDirectory.dir("readme"))
+    }
 
 dokka {
   dokkaSourceSets.configureEach {
     includes.from(prepareReadme.map { it.destinationDir.resolve("README.md") })
   }
 }
 
-apiValidation {
-  ignoredPackages.add("com.caplin.reactive.datasource.spring.internal")
-}
+apiValidation { ignoredPackages.add("com.caplin.reactive.datasource.spring.internal") }
diff --git a/util/build.gradle.kts b/util/build.gradle.kts
@@ -1,29 +1,23 @@
-plugins {
-    `common-library`
-}
+plugins { `common-library` }
 
 description = "Utility classes for DataSource extensions"
 
 dependencies {
-    api(platform(libs.spring.boot.dependencies))
-    api(libs.datasource)
-    api("org.slf4j:slf4j-api")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm")
+  api(platform(libs.spring.boot.dependencies))
+  api(libs.datasource)
+  api("org.slf4j:slf4j-api")
+  api("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+  api("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm")
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation(libs.kotlin.collections.immutable)
+  implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+  implementation(libs.kotlin.collections.immutable)
 
-    testRuntimeOnly("org.slf4j:slf4j-simple")
+  testRuntimeOnly("org.slf4j:slf4j-simple")
 
-    testImplementation("org.springframework:spring-core") // For testing the RegexPathMatcher
-    testImplementation(libs.turbine)
-    testImplementation(libs.kotest.assertions)
-    testImplementation(libs.kotest.runner)
+  testImplementation("org.springframework:spring-core") // For testing the RegexPathMatcher
+  testImplementation(libs.turbine)
+  testImplementation(libs.kotest.assertions)
+  testImplementation(libs.kotest.runner)
 }
 
-dokka {
-  dokkaSourceSets.configureEach {
-    includes.from("README.md")
-  }
-}
+dokka { dokkaSourceSets.configureEach { includes.from("README.md") } }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Add the required dependencies to your project:`
`17`	`17`
`18`	`18`	```kotlin
`19`	`19`	`dependencies {`
`20`		`- implementation("com.caplin.integration:datasourcex-<java-flow\|kotlin\|reactivestreams>:<version>")`
	`20`	`+ implementation("com.caplin.integration.datasourcex:datasourcex-<java-flow\|kotlin\|reactivestreams>:<version>")`
`21`	`21`	`}`
`22`	`22`	```
`23`	`23`
`@@ -40,7 +40,7 @@ Add the following dependency to your project:`
`40`	`40`
`41`	`41`	```kotlin
`42`	`42`	`dependencies {`
`43`		`- implementation("com.caplin.integration:spring-boot-starter-datasource:<version>")`
	`43`	`+ implementation("com.caplin.integration.datasourcex:spring-boot-starter-datasource:<version>")`
`44`	`44`	`}`
`45`	`45`	```
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,4 @@ dependencies {`
`12`	`12`	`implementation("org.springframework.boot:spring-boot-starter")`
`13`	`13`	`}`
`14`	`14`
`15`		`-dokka {`
`16`		`- dokkaSourceSets.configureEach {`
`17`		`- includes.from("README.md")`
`18`		`- }`
`19`		`-}`
	`15`	`+dokka { dokkaSourceSets.configureEach { includes.from("README.md") } }`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ public final class com/caplin/integration/datasourcex/reactive/api/ActiveContain`
`50`	`50`	`public final fun setRowRecordType (Lcom/caplin/integration/datasourcex/reactive/api/RecordType;)V`
`51`	`51`	`}`
`52`	`52`
	`53`	`+public abstract interface class com/caplin/integration/datasourcex/reactive/api/BindContext {`
	`54`	`+ public abstract fun getDataSource ()Lcom/caplin/datasource/DataSource;`
	`55`	`+}`
	`56`	`+`
`53`	`57`	`public abstract interface annotation class com/caplin/integration/datasourcex/reactive/api/BindMarker : java/lang/annotation/Annotation {`
`54`	`58`	`}`
`55`	`59`