优化客户端名称和密码参数值为空时的处理逻辑

Author: suninformation

ymate-platform-persistence-redis/src/main/java/net/ymate/platform/persistence/redis/impl/DefaultRedisModuleCfg.java

@@ -85,8 +85,8 @@ private RedisDataSourceCfgMeta __doParserDataSourceCfgMeta(String dsName, Map<St
                     _servMeta.setMaxAttempts(_serverCfg.getInt(MAX_ATTEMPTS, 3));
                     _servMeta.setWeight(_serverCfg.getInt(WEIGHT, 1));
                     _servMeta.setDatabase(_serverCfg.getInt(DATABASE, 0));
-                    _servMeta.setClientName(_serverCfg.getString(CLIENT_NAME));
-                    _servMeta.setPassword(_serverCfg.getString(PASSWORD));
+                    _servMeta.setClientName(StringUtils.trimToNull(_serverCfg.getString(CLIENT_NAME)));
+                    _servMeta.setPassword(StringUtils.trimToNull(_serverCfg.getString(PASSWORD)));
                     //
                     boolean _isPwdEncrypted = _dataSourceCfg.getBoolean(PASSWORD_ENCRYPTED);
                     //
@@ -95,9 +95,7 @@ private RedisDataSourceCfgMeta __doParserDataSourceCfgMeta(String dsName, Map<St
                         if (_proc == null) {
                             _proc = __owner.getConfig().getDefaultPasswordClass().newInstance();
                         }
-                        if (_proc != null) {
-                            _servMeta.setPassword(_proc.decrypt(_servMeta.getPassword()));
-                        }
+                        _servMeta.setPassword(_proc.decrypt(_servMeta.getPassword()));
                     }
                     //
                     _servers.add(_servMeta);