Merge pull request apache#1 from nbaligad/fix/code_quality

fix(refactor) : Improved code quality by refactoring as per sonar suggestions

Author: Nagarjuna Baligadugula

core/src/main/java/io/seata/core/store/db/AbstractDataSourceProvider.java

@@ -37,7 +37,7 @@
 
 /**
  * The abstract datasource provider
- * 
+ *
  * @author zhangsen
  * @author will
  */
@@ -161,6 +161,7 @@ private static Map<String, ClassLoader> createMysqlDriverClassLoaders() {
                         loaders.putIfAbsent(MYSQL_DRIVER_CLASS_NAME, loader);
                     }
                 } catch (MalformedURLException ignore) {
+                    LOGGER.error("MysqlDriverClassLoaders URL is not valid");
                 }
             });
         return loaders;

discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java

@@ -157,14 +157,10 @@ public void unsubscribe(String cluster, IZkChildListener listener) throws Except
         String path = ROOT_PATH + cluster;
         if (getClientInstance().exists(path)) {
             getClientInstance().unsubscribeChildChanges(path, listener);
-
-            List<IZkChildListener> subscribeList = LISTENER_SERVICE_MAP.get(cluster);
-            if (subscribeList != null) {
-                List<IZkChildListener> newSubscribeList = subscribeList.stream()
-                        .filter(eventListener -> !eventListener.equals(listener))
-                        .collect(Collectors.toList());
-                LISTENER_SERVICE_MAP.put(cluster, newSubscribeList);
-            }
+            List<IZkChildListener> newSubscribeList = LISTENER_SERVICE_MAP.computeIfPresent(cluster,
+                    (key, subscribeList) -> subscribeList.stream()
+                            .filter(eventListener -> !eventListener.equals(listener)).collect(Collectors.toList()));
+            LISTENER_SERVICE_MAP.put(cluster, newSubscribeList);
         }
 
     }
@@ -196,7 +192,7 @@ List<InetSocketAddress> doLookup(String clusterName) throws Exception {
                 if (!LISTENER_SERVICE_MAP.containsKey(clusterName)) {
                     boolean exist = getClientInstance().exists(ROOT_PATH + clusterName);
                     if (!exist) {
-                        return null;
+                        return new ArrayList<>();
                     }
 
                     List<String> childClusterPath = getClientInstance().getChildren(ROOT_PATH + clusterName);
@@ -232,11 +228,12 @@ private ZkClient getClientInstance() {
     // visible for test.
     ZkClient buildZkClient(String address, int sessionTimeout, int connectTimeout,String... authInfo) {
         ZkClient zkClient = new ZkClient(address, sessionTimeout, connectTimeout);
-        if (authInfo != null && authInfo.length == 2) {
-            if (!StringUtils.isBlank(authInfo[0]) && !StringUtils.isBlank(authInfo[1])) {
-                StringBuilder auth = new StringBuilder(authInfo[0]).append(":").append(authInfo[1]);
-                zkClient.addAuthInfo("digest", auth.toString().getBytes());
-            }
+        if (authInfo != null && authInfo.length == 2 &&
+                !StringUtils.isBlank(authInfo[0]) && !StringUtils.isBlank(authInfo[1])) {
+
+            StringBuilder auth = new StringBuilder(authInfo[0]).append(":").append(authInfo[1]);
+            zkClient.addAuthInfo("digest", auth.toString().getBytes());
+
         }
         if (!zkClient.exists(ROOT_PATH_WITHOUT_SUFFIX)) {
             zkClient.createPersistent(ROOT_PATH_WITHOUT_SUFFIX, true);

rm-datasource/src/main/java/io/seata/rm/datasource/AbstractConnectionProxy.java

@@ -64,7 +64,7 @@ public abstract class AbstractConnectionProxy implements Connection {
      * @param dataSourceProxy  the data source proxy
      * @param targetConnection the target connection
      */
-    public AbstractConnectionProxy(DataSourceProxy dataSourceProxy, Connection targetConnection) {
+    protected AbstractConnectionProxy(DataSourceProxy dataSourceProxy, Connection targetConnection) {
         this.dataSourceProxy = dataSourceProxy;
         this.targetConnection = targetConnection;
     }

rm-datasource/src/main/java/io/seata/rm/datasource/AbstractDataSourceCacheResourceManager.java

@@ -34,7 +34,7 @@ public abstract class AbstractDataSourceCacheResourceManager extends AbstractRes
     /**
      * Instantiates a new Data source manager.
      */
-    public AbstractDataSourceCacheResourceManager() {
+    protected AbstractDataSourceCacheResourceManager() {
     }
 
     @Override

rm-datasource/src/main/java/io/seata/rm/datasource/AbstractDataSourceProxy.java

@@ -36,14 +36,14 @@ public abstract class AbstractDataSourceProxy implements SeataDataSourceProxy {
     /**
      * Instantiates a new Abstract data source proxy.
      */
-    public AbstractDataSourceProxy(){}
+    protected AbstractDataSourceProxy(){}
 
     /**
      * Instantiates a new Abstract data source proxy.
      *
      * @param targetDataSource the target data source
      */
-    public AbstractDataSourceProxy(DataSource targetDataSource) {
+    protected AbstractDataSourceProxy(DataSource targetDataSource) {
         this.targetDataSource = targetDataSource;
     }
 

rm-datasource/src/main/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutor.java

@@ -58,7 +58,7 @@ public abstract class AbstractDMLBaseExecutor<T, S extends Statement> extends Ba
      * @param statementCallback the statement callback
      * @param sqlRecognizer     the sql recognizer
      */
-    public AbstractDMLBaseExecutor(StatementProxy<S> statementProxy, StatementCallback<T, S> statementCallback,
+    protected AbstractDMLBaseExecutor(StatementProxy<S> statementProxy, StatementCallback<T, S> statementCallback,
                                    SQLRecognizer sqlRecognizer) {
         super(statementProxy, statementCallback, sqlRecognizer);
     }
@@ -70,7 +70,7 @@ public AbstractDMLBaseExecutor(StatementProxy<S> statementProxy, StatementCallba
      * @param statementCallback the statement callback
      * @param sqlRecognizers    the multi sql recognizer
      */
-    public AbstractDMLBaseExecutor(StatementProxy<S> statementProxy, StatementCallback<T, S> statementCallback,
+    protected AbstractDMLBaseExecutor(StatementProxy<S> statementProxy, StatementCallback<T, S> statementCallback,
                                    List<SQLRecognizer> sqlRecognizers) {
         super(statementProxy, statementCallback, sqlRecognizers);
     }

rm-datasource/src/main/java/io/seata/rm/datasource/xa/AbstractConnectionProxyXA.java

@@ -58,7 +58,7 @@ public abstract class AbstractConnectionProxyXA implements Connection {
 
     protected String xid;
 
-    public AbstractConnectionProxyXA(Connection originalConnection, XAConnection xaConnection, BaseDataSourceResource resource, String xid) {
+    protected AbstractConnectionProxyXA(Connection originalConnection, XAConnection xaConnection, BaseDataSourceResource resource, String xid) {
         this.originalConnection = originalConnection;
         this.xaConnection = xaConnection;
         this.resource = resource;

server/src/main/java/io/seata/server/coordinator/AbstractCore.java

@@ -61,7 +61,7 @@ public abstract class AbstractCore implements Core {
 
     protected RemotingServer remotingServer;
 
-    public AbstractCore(RemotingServer remotingServer) {
+    protected AbstractCore(RemotingServer remotingServer) {
         if (remotingServer == null) {
             throw new IllegalArgumentException("remotingServer must be not null");
         }

tm/src/test/java/io/seata/tm/api/APITest.java

@@ -86,7 +86,7 @@ public void cleanRootContext() {
     public void testCurrent() throws Exception {
         RootContext.bind(DEFAULT_XID);
         GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
-        Assertions.assertEquals(tx.getXid(), DEFAULT_XID);
+        Assertions.assertEquals(DEFAULT_XID,tx.getXid());
         Assertions.assertEquals(tx.getStatus(), GlobalStatus.Begin);
 
     }