optimize: remove druid dependency in ConnectionProxy

changes/en-us/develop.md

@@ -47,7 +47,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#4750](https://github.com/seata/seata/pull/4750)] optimize unBranchLock romove xid
 - [[#4797](https://github.com/seata/seata/pull/4797)] optimize the github actions
 - [[#4800](https://github.com/seata/seata/pull/4800)] Add NOTICE as Apache License V2
-- [[#4681](https://github.com/seata/seata/pull/4681)] optimize lock priority attempts to insert
+- [[#4681](https://github.com/seata/seata/pull/4681)] optimize the check lock during global transaction
 - [[#4761](https://github.com/seata/seata/pull/4761)] use hget replace hmget because only one field
 - [[#4414](https://github.com/seata/seata/pull/4414)] exclude log4j dependencies
 - [[#4836](https://github.com/seata/seata/pull/4836)] optimize BaseTransactionalExecutor#buildLockKey(TableRecords rowsIncludingPK) method more readable
@@ -70,6 +70,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5047](https://github.com/seata/seata/pull/5047)] remove useless code
 - [[#5051](https://github.com/seata/seata/pull/5051)] undo log dirty throw BranchRollbackFailed_Unretriable
 - [[#5075](https://github.com/seata/seata/pull/5075)] intercept the InsertOnDuplicateUpdate statement which has no primary key and unique index value
+- [[#5104](https://github.com/seata/seata/pull/5104)] remove the druid dependency in ConnectionProxy
 
 
 ### test:

changes/zh-cn/develop.md

@@ -70,6 +70,7 @@
 - [[#5047](https://github.com/seata/seata/pull/5047)] 移除无用代码
 - [[#5051](https://github.com/seata/seata/pull/5051)] 回滚时undolog产生脏写需要抛出不再重试(BranchRollbackFailed_Unretriable)的异常
 - [[#5075](https://github.com/seata/seata/pull/5075)] 拦截没有主键及唯一索引值的insert on duplicate update语句
+- [[#5104](https://github.com/seata/seata/pull/5104)] ConnectionProxy脱离对druid的依赖
 
 ### test：
 - [[#4411](https://github.com/seata/seata/pull/4411)] 测试Oracle数据库AT模式下类型支持

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

@@ -19,7 +19,6 @@
 import java.sql.SQLException;
 import java.sql.Savepoint;
 import java.util.concurrent.Callable;
-import com.alibaba.druid.mock.MockConnection;
 import io.seata.common.util.StringUtils;
 import io.seata.config.ConfigurationFactory;
 import io.seata.core.constants.ConfigurationKeys;
@@ -272,8 +271,7 @@ private void register() throws TransactionException {
         }
 
         Long branchId = DefaultResourceManager.get().branchRegister(BranchType.AT, getDataSourceProxy().getResourceId(),
-            null, context.getXid(), this.targetConnection == null || this.targetConnection instanceof MockConnection
-                ? null : context.getApplicationData(),
+            null, context.getXid(), context.getApplicationData(),
             context.buildLockKeys());
         context.setBranchId(branchId);
     }

rm-datasource/src/test/java/io/seata/rm/datasource/ConnectionProxyTest.java

@@ -15,10 +15,12 @@
  */
 package io.seata.rm.datasource;
 
+import io.seata.common.LockStrategyMode;
+import io.seata.core.context.GlobalLockConfigHolder;
 import io.seata.core.exception.TransactionException;
 import io.seata.core.exception.TransactionExceptionCode;
 import io.seata.core.model.BranchType;
-import io.seata.core.model.ResourceManager;
+import io.seata.core.model.GlobalLockConfig;
 import io.seata.rm.DefaultResourceManager;
 import io.seata.rm.datasource.exec.LockWaitTimeoutException;
 import io.seata.rm.datasource.mock.MockConnection;
@@ -51,6 +53,8 @@ public class ConnectionProxyTest {
 
     private final static String lockKey = "order:123";
 
+    private final static String DB_TYPE = "mysql";
+
     private Field branchRollbackFlagField;
 
     @BeforeEach
@@ -66,8 +70,10 @@ public void initBeforeEach() throws Exception {
         dataSourceProxy = Mockito.mock(DataSourceProxy.class);
         Mockito.when(dataSourceProxy.getResourceId())
                 .thenReturn(TEST_RESOURCE_ID);
-        ResourceManager rm = Mockito.mock(ResourceManager.class);
-        Mockito.when(rm.branchRegister(BranchType.AT, dataSourceProxy.getResourceId(), null, TEST_XID, null, lockKey))
+        Mockito.when(dataSourceProxy.getDbType()).thenReturn(DB_TYPE);
+        DefaultResourceManager rm = Mockito.mock(DefaultResourceManager.class);
+
+        Mockito.when(rm.branchRegister(BranchType.AT, dataSourceProxy.getResourceId(), null, TEST_XID, "{\"autoCommit\":false}", lockKey))
                 .thenThrow(new TransactionException(TransactionExceptionCode.LockKeyConflict));
         DefaultResourceManager defaultResourceManager = DefaultResourceManager.get();
         Assertions.assertNotNull(defaultResourceManager);
@@ -78,6 +84,11 @@ public void initBeforeEach() throws Exception {
     public void testLockRetryPolicyRollbackOnConflict() throws Exception {
         boolean oldBranchRollbackFlag = (boolean) branchRollbackFlagField.get(null);
         branchRollbackFlagField.set(null, true);
+        GlobalLockConfig preGlobalLockConfig = new GlobalLockConfig();
+        preGlobalLockConfig.setLockRetryTimes(0);
+        preGlobalLockConfig.setLockRetryInterval(10);
+        preGlobalLockConfig.setLockStrategyMode(LockStrategyMode.PESSIMISTIC);
+        GlobalLockConfig globalLockConfig = GlobalLockConfigHolder.setAndReturnPrevious(preGlobalLockConfig);
         ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, new MockConnection(new MockDriver(), "", null));
         connectionProxy.bind(TEST_XID);
         SQLUndoLog sqlUndoLog = new SQLUndoLog();
@@ -95,6 +106,11 @@ public void testLockRetryPolicyRollbackOnConflict() throws Exception {
     public void testLockRetryPolicyNotRollbackOnConflict() throws Exception {
         boolean oldBranchRollbackFlag = (boolean) branchRollbackFlagField.get(null);
         branchRollbackFlagField.set(null, false);
+        GlobalLockConfig preGlobalLockConfig = new GlobalLockConfig();
+        preGlobalLockConfig.setLockRetryTimes(30);
+        preGlobalLockConfig.setLockRetryInterval(10);
+        preGlobalLockConfig.setLockStrategyMode(LockStrategyMode.PESSIMISTIC);
+        GlobalLockConfig globalLockConfig = GlobalLockConfigHolder.setAndReturnPrevious(preGlobalLockConfig);
         ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, null);
         connectionProxy.bind(TEST_XID);
         connectionProxy.appendUndoLog(new SQLUndoLog());