You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2023/06/21 19:44:21 UTC
[kafka] branch trunk updated: MINOR: Fix generated client ids for Connect (#13896)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3c059133d30 MINOR: Fix generated client ids for Connect (#13896)
3c059133d30 is described below
commit 3c059133d3008d87f018f2efa4af27027fd5d18e
Author: Mickael Maison <mi...@users.noreply.github.com>
AuthorDate: Wed Jun 21 21:44:14 2023 +0200
MINOR: Fix generated client ids for Connect (#13896)
Reviewers: Chris Egerton <fe...@gmail.com>
---
.../src/main/java/org/apache/kafka/connect/util/ConnectUtils.java | 2 +-
.../src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/util/ConnectUtils.java b/connect/runtime/src/main/java/org/apache/kafka/connect/util/ConnectUtils.java
index 767e99be6c2..3a2c88b0893 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/util/ConnectUtils.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/util/ConnectUtils.java
@@ -204,7 +204,7 @@ public final class ConnectUtils {
String result = Optional.ofNullable(config.groupId())
.orElse("connect");
String userSpecifiedClientId = config.getString(CLIENT_ID_CONFIG);
- if (userSpecifiedClientId != null) {
+ if (userSpecifiedClientId != null && !userSpecifiedClientId.trim().isEmpty()) {
result += "-" + userSpecifiedClientId;
}
return result + "-";
diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
index 04701f2f712..d34918649a8 100644
--- a/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
+++ b/connect/runtime/src/test/java/org/apache/kafka/connect/util/ConnectUtilsTest.java
@@ -153,6 +153,9 @@ public class ConnectUtilsTest {
expectedClientIdBase = "connect-" + userSpecifiedClientId + "-";
assertClientIdBase(null, userSpecifiedClientId, expectedClientIdBase);
+
+ expectedClientIdBase = "connect-";
+ assertClientIdBase(null, "", expectedClientIdBase);
}
private void assertClientIdBase(String groupId, String userSpecifiedClientId, String expectedClientIdBase) {