[dubbo] branch 3.2 updated: fix #12233 redis cluster not support password bug. (#12240)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new da9fbbdbf8 fix #12233 redis cluster not support password bug. (#12240)
da9fbbdbf8 is described below

commit da9fbbdbf8b46a35af9a202f733b5c4d11f6b807
Author: goto456 <wangbiwe...@126.com>
AuthorDate: Mon May 8 07:32:00 2023 +0800

    fix #12233 redis cluster not support password bug. (#12240)
    
    * fix #12233 redis cluster not support password bug.
    
    * fix #12233 redis cluster not support password bug.
---
 .../apache/dubbo/metadata/store/redis/RedisMetadataReport.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
 
b/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
index a7b0b5d189..47097f2214 100644
--- 
a/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
+++ 
b/dubbo-metadata/dubbo-metadata-report-redis/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java
@@ -66,6 +66,7 @@ public class RedisMetadataReport extends 
AbstractMetadataReport {
     public RedisMetadataReport(URL url) {
         super(url);
         timeout = url.getParameter(TIMEOUT_KEY, DEFAULT_TIMEOUT);
+        password = url.getPassword();
         if (url.getParameter(CLUSTER_KEY, false)) {
             jedisClusterNodes = new HashSet<>();
             List<URL> urls = url.getBackupUrls();
@@ -74,7 +75,7 @@ public class RedisMetadataReport extends 
AbstractMetadataReport {
             }
         } else {
             int database = url.getParameter(REDIS_DATABASE_KEY, 0);
-            pool = new JedisPool(new JedisPoolConfig(), url.getHost(), 
url.getPort(), timeout, url.getPassword(), database);
+            pool = new JedisPool(new JedisPoolConfig(), url.getHost(), 
url.getPort(), timeout, password, database);
         }
     }
 
@@ -131,7 +132,7 @@ public class RedisMetadataReport extends 
AbstractMetadataReport {
     }
 
     private void storeMetadataInCluster(BaseMetadataIdentifier 
metadataIdentifier, String v) {
-        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig())) {
+        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig<>())) {
             jedisCluster.set(metadataIdentifier.getIdentifierKey() + 
META_DATA_STORE_TAG, v);
         } catch (Throwable e) {
             String msg = "Failed to put " + metadataIdentifier + " to redis 
cluster " + v + ", cause: " + e.getMessage();
@@ -159,7 +160,7 @@ public class RedisMetadataReport extends 
AbstractMetadataReport {
     }
 
     private void deleteMetadataInCluster(BaseMetadataIdentifier 
metadataIdentifier) {
-        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig())) {
+        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig<>())) {
             jedisCluster.del(metadataIdentifier.getIdentifierKey() + 
META_DATA_STORE_TAG);
         } catch (Throwable e) {
             String msg = "Failed to delete " + metadataIdentifier + " from 
redis cluster , cause: " + e.getMessage();
@@ -187,7 +188,7 @@ public class RedisMetadataReport extends 
AbstractMetadataReport {
     }
 
     private String getMetadataInCluster(BaseMetadataIdentifier 
metadataIdentifier) {
-        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig())) {
+        try (JedisCluster jedisCluster = new JedisCluster(jedisClusterNodes, 
timeout, timeout, 2, password, new GenericObjectPoolConfig<>())) {
             return jedisCluster.get(metadataIdentifier.getIdentifierKey() + 
META_DATA_STORE_TAG);
         } catch (Throwable e) {
             String msg = "Failed to get " + metadataIdentifier + " from redis 
cluster , cause: " + e.getMessage();