From 99cbb6a8b8720ecb5f09f60b089fdbc412914934 Mon Sep 17 00:00:00 2001 From: ayeshLK Date: Wed, 10 Jan 2024 01:27:48 +0530 Subject: [PATCH] Update subscriber-id construction logic --- examples/kafka-hub/hub/modules/util/util.bal | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/examples/kafka-hub/hub/modules/util/util.bal b/examples/kafka-hub/hub/modules/util/util.bal index 736baf71..a8b02048 100644 --- a/examples/kafka-hub/hub/modules/util/util.bal +++ b/examples/kafka-hub/hub/modules/util/util.bal @@ -24,9 +24,8 @@ import ballerina/log; # + topic - The `topic` which subscriber needs to subscribe # + callbackUrl - Subscriber callback URL # + return - Generated subscriber Id for the subscriber -public isolated function generateSubscriberId(string topic, string callbackUrl) returns string { - string idValue = topic + ":::" + callbackUrl; - return nomalizeString(idValue); +public isolated function generatedSubscriberId(string topic, string callbackUrl) returns string { + return string `${topic}___${callbackUrl}`; } # Generates a group name for the kafka-consumer. @@ -35,16 +34,7 @@ public isolated function generateSubscriberId(string topic, string callbackUrl) # + callbackUrl - Subscriber callback URL # + return - Generated consumer group name the subscriber public isolated function generateGroupName(string topic, string callbackUrl) returns string { - string idValue = topic + ":::" + callbackUrl + ":::" + time:monotonicNow().toBalString(); - return nomalizeString(idValue); -} - -# Normalizes a `string` by replacing special characters with `_`. -# -# + baseString - `string` to be normalized -# + return - Normalized `string` -isolated function nomalizeString(string baseString) returns string { - return re `[^a-zA-Z0-9]`.replaceAll(baseString, "_"); + return string `${topic}___${callbackUrl}___${time:monotonicNow().toBalString()}`; } # Generates a random `string` of 10 characters