Remove regex usages

ballerina-platform · Feb 28, 2024 · b7ef635 · b7ef635
1 parent 6b1e004
commit b7ef635
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -181,6 +181,9 @@ version = "0.0.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
+modules = [
+	{org = "ballerina", packageName = "lang.regexp", moduleName = "lang.regexp"}
+]
 
 [[package]]
 org = "ballerina"
@@ -267,19 +270,6 @@ modules = [
 	{org = "ballerina", packageName = "os", moduleName = "os"}
 ]
 
-[[package]]
-org = "ballerina"
-name = "regex"
-version = "1.4.3"
-scope = "testOnly"
-dependencies = [
-	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "lang.string"}
-]
-modules = [
-	{org = "ballerina", packageName = "regex", moduleName = "regex"}
-]
-
 [[package]]
 org = "ballerina"
 name = "task"
@@ -321,15 +311,15 @@ dependencies = [
 [[package]]
 org = "ballerinax"
 name = "azure.ad"
-version = "2.3.0"
+version = "2.5.0"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.regexp"},
 	{org = "ballerina", name = "lang.runtime"},
 	{org = "ballerina", name = "log"},
 	{org = "ballerina", name = "os"},
-	{org = "ballerina", name = "regex"},
 	{org = "ballerina", name = "test"},
 	{org = "ballerinax", name = "client.config"}
 ]

diff --git a/ballerina/tests/test.bal b/ballerina/tests/test.bal
@@ -19,8 +19,8 @@ import ballerina/jballerina.java;
 import ballerina/lang.runtime;
 import ballerina/log;
 import ballerina/os;
-import ballerina/regex;
 import ballerina/test;
+import ballerina/lang.regexp;
 
 configurable string & readonly refreshUrl = os:getEnv("REFRESH_URL");
 configurable string & readonly refreshToken = os:getEnv("REFRESH_TOKEN");
@@ -541,8 +541,8 @@ function testDeleteUserAndGroup() {
 # + return - A string UUID without hyphens
 function createRandomUUIDWithoutHyphens() returns string {
     string? stringUUID = java:toString(createRandomUUID());
-    if (stringUUID is string) {
-        return 'string:substring(regex:replaceAll(stringUUID, "-", ""), 1, 4);
+    if stringUUID is string {
+        return 'string:substring(regexp:replaceAll(re`-`, stringUUID, ""), 1, 4);
     } else {
         return EMPTY_STRING;
     }