Fixes #1247: allow usage of absolute domain paths ending with a "." a…

…s Kafka bootstrap servers Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Dec 20, 2021 · f985bd3 · f985bd3
1 parent 9bedab9
commit f985bd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...clipse/ditto/connectivity/service/messaging/kafka/KafkaBootstrapServerSpecificConfig.java b/...clipse/ditto/connectivity/service/messaging/kafka/KafkaBootstrapServerSpecificConfig.java
@@ -38,7 +38,7 @@ final class KafkaBootstrapServerSpecificConfig implements KafkaSpecificConfig {
     private static final Logger LOG = LoggerFactory.getLogger(KafkaBootstrapServerSpecificConfig.class);
 
     private static final Pattern BOOTSTRAP_SERVERS_PATTERN = Pattern.compile(
-            "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*:([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])[\\s,]*?)+$");
+            "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*\\.?:([1-9]|[1-5]?[0-9]{2,4}|6[1-4][0-9]{3}|65[1-4][0-9]{2}|655[1-2][0-9]|6553[1-5])[\\s,]*?)+$");
     private static final String INVALID_BOOTSTRAP_SERVERS =
             "The provided list of bootstrap servers ''{0}'' is not valid";
 

diff --git a/...se/ditto/connectivity/service/messaging/kafka/KafkaBootstrapServerSpecificConfigTest.java b/...se/ditto/connectivity/service/messaging/kafka/KafkaBootstrapServerSpecificConfigTest.java
@@ -55,6 +55,8 @@ public final class KafkaBootstrapServerSpecificConfigTest {
     private static final String BOOTSTRAP_SERVERS = String.join(",", BOOTSTRAP_SERVERS_ARRAY);
     private static final String BOOTSTRAP_SERVERS_CONFIG_KEY = "bootstrapServers";
 
+    private static final String DEFAULT_SERVER_ENDING_WITH_DOT = "org.apache.kafka.:9092";
+
     private static final Set<Connection> CONNECTIONS_WITH_EMPTY_SERVERS = Collections.unmodifiableSet(
             new HashSet<>(Arrays.asList(
                     connectionWithBootstrapServers(null),
@@ -72,6 +74,8 @@ public final class KafkaBootstrapServerSpecificConfigTest {
                     connectionWithBootstrapServers(DEFAULT_SERVER),
                     connectionWithBootstrapServers(BOOTSTRAP_SERVERS)
             )));
+    private static final Connection CONNECTION_WITH_SERVER_ENDING_WITH_DOT =
+            connectionWithBootstrapServers(DEFAULT_SERVER_ENDING_WITH_DOT);
 
     private final KafkaBootstrapServerSpecificConfig bootstrapServerSpecificConfig =
             KafkaBootstrapServerSpecificConfig.getInstance();
@@ -81,6 +85,7 @@ public void shouldAlwaysBeApplicable() {
         CONNECTIONS_WITH_EMPTY_SERVERS.forEach(this::shouldBeApplicable);
         CONNECTIONS_WITH_INVALID_PATTERN.forEach(this::shouldBeApplicable);
         CONNECTIONS_WITH_CORRECT_SERVERS.forEach(this::shouldBeApplicable);
+        shouldBeApplicable(CONNECTION_WITH_SERVER_ENDING_WITH_DOT);
     }
 
     private void shouldBeApplicable(final Connection connection) {
@@ -104,7 +109,11 @@ public void shouldNotBeValidIfBootstrapServersDontMatchValidPattern() {
     @Test
     public void shouldBeValidForCorrectListOfBootstrapServers() {
         CONNECTIONS_WITH_CORRECT_SERVERS.forEach(this::shouldBeValid);
+    }
 
+    @Test
+    public void shouldBeValidForBootstrapEntryEndingWithDot() {
+        shouldBeValid(CONNECTION_WITH_SERVER_ENDING_WITH_DOT);
     }
 
     private void shouldBeValid(final Connection connection) {