From bdc4601a34858f7df83b6e4219b1f0cebd760aac Mon Sep 17 00:00:00 2001 From: Seongbae Chang Date: Tue, 11 Feb 2025 00:13:15 +0900 Subject: [PATCH 1/2] Convert into bytes --- .../openwhisk/connector/kafka/KafkaMessagingProvider.scala | 2 +- .../openwhisk/connector/kafka/KafkaProducerConnector.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala index dd388952708..5f315557499 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala @@ -59,7 +59,7 @@ object KafkaMessagingProvider extends MessagingProvider { val topicConfig = KafkaConfiguration.configMapToKafkaConfig( loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaTopics + "." + topicConfigKey)) ++ (maxMessageBytes.map { max => - Map(s"max.message.bytes" -> max.size.toString) + Map(s"max.message.bytes" -> max.toBytes.toString) } getOrElse Map.empty) val commonConfig = configMapToKafkaConfig(loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaCommon)) diff --git a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaProducerConnector.scala b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaProducerConnector.scala index 3c4a410d0fb..3cb8d52979e 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaProducerConnector.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaProducerConnector.scala @@ -108,7 +108,7 @@ class KafkaProducerConnector( configMapToKafkaConfig(loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaCommon)) ++ configMapToKafkaConfig(loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaProducer)) ++ (maxRequestSize map { max => - Map("max.request.size" -> max.size.toString) + Map("max.request.size" -> max.toBytes.toString) } getOrElse Map.empty) verifyConfig(config, ProducerConfig.configNames().asScala.toSet) From 16b14c384da5d565fae535e3ef07e4249365d16c Mon Sep 17 00:00:00 2001 From: Seongbae Chang Date: Tue, 11 Feb 2025 00:14:00 +0900 Subject: [PATCH 2/2] Remove unnecessary string interpolator --- .../openwhisk/connector/kafka/KafkaMessagingProvider.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala index 5f315557499..22bc1cc05de 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/connector/kafka/KafkaMessagingProvider.scala @@ -59,7 +59,7 @@ object KafkaMessagingProvider extends MessagingProvider { val topicConfig = KafkaConfiguration.configMapToKafkaConfig( loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaTopics + "." + topicConfigKey)) ++ (maxMessageBytes.map { max => - Map(s"max.message.bytes" -> max.toBytes.toString) + Map("max.message.bytes" -> max.toBytes.toString) } getOrElse Map.empty) val commonConfig = configMapToKafkaConfig(loadConfigOrThrow[Map[String, String]](ConfigKeys.kafkaCommon))