Merge pull request #54 from lasanthaS/master

Fix JDBC URLs to accept hostnames
siddhi-io · Mar 20, 2020 · cd5c722 · cd5c722
2 parents bf4ef2a + 9193e39
commit cd5c722
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCSourceUtil.java b/component/src/main/java/io/siddhi/extension/io/cdc/util/CDCSourceUtil.java
@@ -52,8 +52,7 @@ public static Map<String, Object> getConfigMap(String username, String password,
             switch (splittedURL[1]) {
                 case "mysql": {
                     //Extract url details
-                    String regex = "jdbc:mysql://(\\w*|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}):" +
-                            "(\\d++)/(\\w*)";
+                    String regex = "jdbc:mysql://([a-zA-Z0-9-_\\.]+):(\\d++)/(\\w*)";
                     Pattern p = Pattern.compile(regex);
                     Matcher matcher = p.matcher(url);
                     if (matcher.find()) {
@@ -77,8 +76,7 @@ public static Map<String, Object> getConfigMap(String username, String password,
                 }
                 case "postgresql": {
                     //Extract url details
-                    String regex = "jdbc:postgresql://(\\w*|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}):" +
-                            "(\\d++)/(\\w*)";
+                    String regex = "jdbc:postgresql://([a-zA-Z0-9-_\\.]+):(\\d++)/(\\w*)";
                     Pattern p = Pattern.compile(regex);
                     Matcher matcher = p.matcher(url);
                     if (matcher.find()) {
@@ -103,8 +101,7 @@ public static Map<String, Object> getConfigMap(String username, String password,
                 }
                 case "sqlserver": {
                     //Extract url details
-                    String regex = "jdbc:sqlserver://(\\w*|[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}):" +
-                            "(\\d++);databaseName=(\\w*)";
+                    String regex = "jdbc:sqlserver://([a-zA-Z0-9-_\\.]+):(\\d++);databaseName=(\\w*)";
                     Pattern p = Pattern.compile(regex);
                     Matcher matcher = p.matcher(url);
                     if (matcher.find()) {
@@ -162,8 +159,7 @@ public static Map<String, Object> getConfigMap(String username, String password,
                 case "mongodb": {
                     //Extract url details
                     isMongodb = true;
-                    String regex = "jdbc:mongodb://(\\w*|(\\w*)/[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}):" +
-                            "(\\d++)/(\\w*)";
+                    String regex = "jdbc:mongodb://(\\w*|(\\w*)/[a-zA-Z0-9-_\\.]+):(\\d++)/(\\w*)";
                     Pattern p = Pattern.compile(regex);
                     Matcher matcher = p.matcher(url);
                     String replicaSetName;

diff --git a/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java b/component/src/test/java/io/siddhi/extension/io/cdc/source/TestCaseOfCDCSourceValidation.java
@@ -103,7 +103,7 @@ public void cdcUrlValidation() throws InterruptedException {
 
         SiddhiManager siddhiManager = new SiddhiManager();
 
-        String wrongURL = "jdbc:mysql://0.0.0.0.0:3306/SimpleDB";
+        String wrongURL = "jdbc:mysql://0.0.0.0:3306abc/SimpleDB";
 
         //stream definition with invalid operation.
         String inStreamDefinition = "" +