Merge pull request #11 from dinukaamarasinghe817/connection-uri

Update configs to use Redis connector v3
ballerina-platform · Mar 11, 2024 · 1f4179e · 1f4179e
2 parents 3882e93 + ffcc09f
commit 1f4179e
Show file tree

Hide file tree

Showing 16 changed files with 136 additions and 29 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -6,7 +6,7 @@ authors = ["Ballerina"]
 keywords = ["persist", "redis", "experimental"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-persist.redis"
 license = ["Apache-2.0"]
-distribution = "2201.8.0"
+distribution = "2201.9.0"
 
 [platform.java17]
 graalvmCompatible = true

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,16 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.2"
+distribution-version = "2201.9.0-20240229-103900-a949e6d4"
+
+[[package]]
+org = "ballerina"
+name = "crypto"
+version = "2.6.2"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "time"}
+]
 
 [[package]]
 org = "ballerina"
@@ -24,6 +33,26 @@ modules = [
 	{org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"}
 ]
 
+[[package]]
+org = "ballerina"
+name = "lang.__internal"
+version = "0.0.0"
+scope = "testOnly"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.object"}
+]
+
+[[package]]
+org = "ballerina"
+name = "lang.array"
+version = "0.0.0"
+scope = "testOnly"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.__internal"}
+]
+
 [[package]]
 org = "ballerina"
 name = "lang.error"
@@ -33,6 +62,12 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
+[[package]]
+org = "ballerina"
+name = "lang.object"
+version = "0.0.0"
+scope = "testOnly"
+
 [[package]]
 org = "ballerina"
 name = "lang.regexp"
@@ -92,6 +127,7 @@ version = "0.0.0"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.array"},
 	{org = "ballerina", name = "lang.error"}
 ]
 modules = [
@@ -129,8 +165,9 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "redis"
-version = "2.6.0"
+version = "3.0.0"
 dependencies = [
+	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"}
 ]
 modules = [

diff --git a/ballerina/tests/Config.toml b/ballerina/tests/Config.toml
@@ -1,12 +1,2 @@
 [redis]
-host="localhost"
-port=6379
-password=""
-
-[redis.connectionOptions]
-connectionPooling = false
-isClusterConnection = false
-ssl = false
-startTls = false
-verifyPeer = false
-connectionTimeout = 5000
+connection = "redis://localhost:6379"
diff --git a/ballerina/tests/init-test.bal b/ballerina/tests/init-test.bal
@@ -19,17 +19,15 @@ import ballerina/time;
 import ballerinax/redis;
 
 configurable record {|
-    int port;
-    string host;
-    string password;
-    redis:Options connectionOptions = {};
-|} redis = ?;
+    redis:ConnectionUri|redis:ConnectionParams connection?;
+    boolean connectionPooling = false;
+    boolean isClusterConnection = false;
+    redis:SecureSocket secureSocket?;
+|} & readonly redis = ?;
 
 @test:BeforeSuite
 function initTests() returns error? {
-
-    redis:Client redisDbClient = check new (config = {host: string `${redis.host}:${redis.port}`, 
-    password: redis.password, options: redis.connectionOptions});
+    redis:Client redisDbClient = check new (redis);
     _ = check redisDbClient.close();
 }
 

diff --git a/ballerina/tests/persist/test_entities.bal b/ballerina/tests/persist/test_entities.bal
@@ -32,6 +32,8 @@ type AllTypes record {|
     string stringType;
     time:Date dateType;
     time:TimeOfDay timeOfDayType;
+    time:Utc utcType;
+    time:Civil civilType;
     EnumType enumType;
     boolean booleanTypeOptional?;
     int intTypeOptional?;
@@ -40,6 +42,8 @@ type AllTypes record {|
     string stringTypeOptional?;
     time:Date dateTypeOptional?;
     time:TimeOfDay timeOfDayTypeOptional?;
+    time:Utc utcTypeOptional?;
+    time:Civil civilTypeOptional?;
     EnumType enumTypeOptional?;
 |};
 

diff --git a/ballerina/tests/redis_rainier_generated_client.bal b/ballerina/tests/redis_rainier_generated_client.bal
@@ -161,8 +161,7 @@ public isolated client class RedisRainierClient {
     };
 
     public isolated function init() returns persist:Error? {
-        redis:Client|error dbClient = new (config = { host: redis.host+":"+redis.port.toString(), 
-        password: redis.password, options: redis.connectionOptions });
+        redis:Client|error dbClient = new (redis);
         if dbClient is error {
             return <persist:Error>error(dbClient.message());
         }

diff --git a/ballerina/tests/redis_test_entities_generated_client.bal b/ballerina/tests/redis_test_entities_generated_client.bal
@@ -179,8 +179,7 @@ public isolated client class RedisTestEntitiesClient {
     };
 
     public isolated function init() returns persist:Error? {
-        redis:Client|error dbClient = new (config = { host: redis.host+":"+redis.port.toString(), 
-        password: redis.password, options: redis.connectionOptions });
+        redis:Client|error dbClient = new (redis);
         if dbClient is error {
             return <persist:Error>error(dbClient.message());
         }

diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml
@@ -6,7 +6,7 @@ authors = ["Ballerina"]
 keywords = ["persist", "redis", "experimental"]
 repository = "https://github.com/ballerina-platform/module-ballerinax-persist.redis"
 license = ["Apache-2.0"]
-distribution = "2201.8.0"
+distribution = "2201.9.0"
 
 [platform.java17]
 graalvmCompatible = true

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ testngVersion=7.6.1
 gsonVersion=2.10
 ballerinaGradlePluginVersion=2.0.1
 
-ballerinaLangVersion=2201.8.2
+ballerinaLangVersion=2201.9.0-20240229-103900-a949e6d4
 
 # Direct Dependencies
 # Level 01
@@ -41,7 +41,7 @@ stdlibOAuth2Version=2.10.0
 stdlibHttpVersion=2.10.0
 
 # Level 08
-stdlibRedisVersion=2.6.0
+stdlibRedisVersion=3.0.0
 
 # Level 09
 stdlibPersistVersion=1.2.0