Skip to content

Fix missing use-site variance on container/broadcast Publisher params #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rossdanderson merged 1 commit into from
Aug 27, 2026
Merged

Fix missing use-site variance on container/broadcast Publisher params #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions buildSrc/src/main/kotlin/ActiveContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
import com.squareup.kotlinpoet.PropertySpec
import com.squareup.kotlinpoet.STRING
import com.squareup.kotlinpoet.TypeName
import com.squareup.kotlinpoet.WildcardTypeName
import com.squareup.kotlinpoet.asClassName

object ActiveContainer : FunctionProvider {
Expand Down Expand Up @@ -37,18 +38,22 @@ object ActiveContainer : FunctionProvider {
.defaultValue("ConfigBlock {}")
.build()

val projectedContainerEventTypeName =
if (publisherType.requiresProjection) WildcardTypeName.producerOf(containerEventTypeName)
else containerEventTypeName

val publisherParameter =
ParameterSpec.builder(
"publisher",
publisherType.className.parameterizedBy(containerEventTypeName),
publisherType.className.parameterizedBy(projectedContainerEventTypeName),
)
.build()

val publisherPatternSupplierParameter =
ParameterSpec.builder(
"supplier",
requestSupplierClassName.parameterizedBy(
publisherType.className.parameterizedBy(containerEventTypeName),
publisherType.className.parameterizedBy(projectedContainerEventTypeName),
),
)
.build()
Expand Down Expand Up @@ -97,7 +102,7 @@ object ActiveContainer : FunctionProvider {
ParameterSpec.builder(
"supplier",
pathVariablesSupplierClassName.parameterizedBy(
publisherType.className.parameterizedBy(containerEventTypeName),
publisherType.className.parameterizedBy(projectedContainerEventTypeName),
),
)
.build()
Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/kotlin/Broadcast.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@ object Broadcast : FunctionProvider {
.defaultValue("ConfigBlock {}")
.build()

val projectedBroadcastEvent =
if (publisherType.requiresProjection) WildcardTypeName.producerOf(broadcastEvent)
else broadcastEvent

val broadcastEventPublisherParameter =
ParameterSpec.builder(
"publisher",
publisherType.className.parameterizedBy(broadcastEvent),
publisherType.className.parameterizedBy(projectedBroadcastEvent),
)
.build()

Expand Down
Loading