diff --git a/gradle.properties b/gradle.properties index 448d6531..05069713 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ github.repository.name=extra-ktor-plugins kotlin.native.cacheKind.linuxX64=none kotlin.native.ignoreDisabledTargets=true gradle.publish.enable.module-metadata=true -version=2.1.0 +version=2.1.1 gpr.user=flaxoos org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g kotlin.mpp.applyDefaultHierarchyTemplate=false \ No newline at end of file diff --git a/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/KafkaPluginConfig.kt b/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/KafkaPluginConfig.kt index f2ade177..2e5b62ad 100644 --- a/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/KafkaPluginConfig.kt +++ b/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/KafkaPluginConfig.kt @@ -97,7 +97,7 @@ class KafkaConfig : AbstractKafkaConfig() { adminPropertiesBuilder ?.build() ?.propertiesContext(this@KafkaConfig) - ?.withSslProperties(adminSslPropertiesBuilder) + ?.withSslProperties(adminSslPropertiesBuilderPair) ?.withDefaultAdminConfig() ?.delegatingToCommon() ?.kafkaProperties @@ -131,14 +131,14 @@ class KafkaConfig : AbstractKafkaConfig() { // SSL Configurations internal var commonSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null - internal var adminSslPropertiesBuilder: SslPropertiesBuilder? = null + internal var adminSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null internal var producerSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null internal var consumerSslPropertiesBuilderPair: SslPropertiesBuilderPair? = null internal var schemaRegistryClientSslPropertiesBuilder: SslPropertiesBuilder? = null // SASL Configurations internal var commonSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null - internal var adminSaslPropertiesBuilder: SaslPropertiesBuilderPair? = null + internal var adminSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null internal var producerSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null internal var consumerSaslPropertiesBuilderPair: SaslPropertiesBuilderPair? = null internal var schemaRegistryClientSaslPropertiesBuilder: SaslPropertiesBuilder? = null diff --git a/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/SslConfig.kt b/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/SslConfig.kt index 40807aec..7787e970 100644 --- a/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/SslConfig.kt +++ b/ktor-server-kafka/src/jvmMain/kotlin/io/github/flaxoos/ktor/server/plugins/kafka/SslConfig.kt @@ -76,8 +76,8 @@ fun KafkaConfig.commonSsl(configuration: SslPropertiesBuilderPair.() -> Unit) { * Sets a specific SSL configuration for the admin client. */ @KafkaDsl -fun KafkaConfig.adminSsl(configuration: SslPropertiesBuilder.() -> Unit) { - adminSslPropertiesBuilder = SslPropertiesBuilder().apply(configuration) +fun KafkaConfig.adminSsl(configuration: SslPropertiesBuilderPair.() -> Unit) { + adminSslPropertiesBuilderPair = SslPropertiesBuilderPair().apply(configuration) } /** @@ -117,7 +117,7 @@ fun KafkaConfig.commonSasl(configuration: SaslPropertiesBuilderPair.() -> Unit) */ @KafkaDsl fun KafkaConfig.adminSasl(configuration: SaslPropertiesBuilderPair.() -> Unit) { - adminSaslPropertiesBuilder = SaslPropertiesBuilderPair().apply(configuration) + adminSaslPropertiesBuilderPair = SaslPropertiesBuilderPair().apply(configuration) } /**