Use the java.util.concurrent.locks.ReentrantLock directly

Author: harawata

src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import java.lang.ref.SoftReference;
 import java.util.Deque;
 import java.util.LinkedList;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.ibatis.cache.Cache;
-import org.apache.ibatis.util.LockKit;
 
 /**
  * Soft Reference cache decorator.
@@ -35,6 +35,7 @@ public class SoftCache implements Cache {
   private final ReferenceQueue<Object> queueOfGarbageCollectedEntries;
   private final Cache delegate;
   private int numberOfHardLinks;
+  private final ReentrantLock lock = new ReentrantLock();
 
   public SoftCache(Cache delegate) {
     this.delegate = delegate;
@@ -75,7 +76,6 @@ public Object getObject(Object key) {
         delegate.removeObject(key);
       } else {
         // See #586 (and #335) modifications need more than a read lock
-        LockKit.ReentrantLock lock = LockKit.obtainLock(hardLinksToAvoidGarbageCollection);
         lock.lock();
         try {
           hardLinksToAvoidGarbageCollection.addFirst(result);
@@ -100,7 +100,6 @@ public Object removeObject(Object key) {
 
   @Override
   public void clear() {
-    LockKit.ReentrantLock lock = LockKit.obtainLock(hardLinksToAvoidGarbageCollection);
     lock.lock();
     try {
       hardLinksToAvoidGarbageCollection.clear();

src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import java.lang.ref.WeakReference;
 import java.util.Deque;
 import java.util.LinkedList;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.ibatis.cache.Cache;
-import org.apache.ibatis.util.LockKit;
 
 /**
  * Weak Reference cache decorator.
@@ -35,6 +35,7 @@ public class WeakCache implements Cache {
   private final ReferenceQueue<Object> queueOfGarbageCollectedEntries;
   private final Cache delegate;
   private int numberOfHardLinks;
+  private final ReentrantLock lock = new ReentrantLock();
 
   public WeakCache(Cache delegate) {
     this.delegate = delegate;
@@ -74,7 +75,6 @@ public Object getObject(Object key) {
       if (result == null) {
         delegate.removeObject(key);
       } else {
-        LockKit.ReentrantLock lock = LockKit.obtainLock(hardLinksToAvoidGarbageCollection);
         lock.lock();
         try {
           hardLinksToAvoidGarbageCollection.addFirst(result);
@@ -99,7 +99,6 @@ public Object removeObject(Object key) {
 
   @Override
   public void clear() {
-    LockKit.ReentrantLock lock = LockKit.obtainLock(hardLinksToAvoidGarbageCollection);
     lock.lock();
     try {
       hardLinksToAvoidGarbageCollection.clear();

src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,15 +17,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.ibatis.util.LockKit;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author Clinton Begin
  */
 public class PoolState {
 
-  private final LockKit.ReentrantLock reentrantLock;
+  // This lock does not guarantee consistency.
+  // Field values can be modified in PooledDataSource
+  // after the instance is returned from
+  // PooledDataSource#getPoolState().
+  // A possible fix is to create and return a 'snapshot'.
+  private final ReentrantLock lock = new ReentrantLock();
 
   protected PooledDataSource dataSource;
 
@@ -42,103 +46,102 @@ public class PoolState {
 
   public PoolState(PooledDataSource dataSource) {
     this.dataSource = dataSource;
-    this.reentrantLock = LockKit.obtainLock(dataSource);
   }
 
   public long getRequestCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return requestCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getAverageRequestTime() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return requestCount == 0 ? 0 : accumulatedRequestTime / requestCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getAverageWaitTime() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return hadToWaitCount == 0 ? 0 : accumulatedWaitTime / hadToWaitCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getHadToWaitCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return hadToWaitCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getBadConnectionCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return badConnectionCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getClaimedOverdueConnectionCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return claimedOverdueConnectionCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getAverageOverdueCheckoutTime() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return claimedOverdueConnectionCount == 0 ? 0
           : accumulatedCheckoutTimeOfOverdueConnections / claimedOverdueConnectionCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public long getAverageCheckoutTime() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return requestCount == 0 ? 0 : accumulatedCheckoutTime / requestCount;
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public int getIdleConnectionCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return idleConnections.size();
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   public int getActiveConnectionCount() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       return activeConnections.size();
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 
   @Override
   public String toString() {
-    reentrantLock.lock();
+    lock.lock();
     try {
       StringBuilder builder = new StringBuilder();
       builder.append("\n===CONFIGURATION==============================================");
@@ -168,7 +171,7 @@ public String toString() {
       builder.append("\n===============================================================");
       return builder.toString();
     } finally {
-      reentrantLock.unlock();
+      lock.unlock();
     }
   }
 

src/main/java/org/apache/ibatis/executor/loader/AbstractEnhancedDeserializationProxy.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.reflection.ExceptionUtil;
 import org.apache.ibatis.reflection.factory.ObjectFactory;
 import org.apache.ibatis.reflection.property.PropertyCopier;
 import org.apache.ibatis.reflection.property.PropertyNamer;
-import org.apache.ibatis.util.LockKit;
 
 /**
  * @author Clinton Begin
@@ -39,7 +39,7 @@ public abstract class AbstractEnhancedDeserializationProxy {
   private final ObjectFactory objectFactory;
   private final List<Class<?>> constructorArgTypes;
   private final List<Object> constructorArgs;
-  private final LockKit.ReentrantLock reentrantLock;
+  private final ReentrantLock lock = new ReentrantLock();
   private boolean reloadingProperty;
 
   protected AbstractEnhancedDeserializationProxy(Class<?> type,
@@ -50,7 +50,6 @@ protected AbstractEnhancedDeserializationProxy(Class<?> type,
     this.objectFactory = objectFactory;
     this.constructorArgTypes = constructorArgTypes;
     this.constructorArgs = constructorArgs;
-    this.reentrantLock = new LockKit.ReentrantLock();
     this.reloadingProperty = false;
   }
 
@@ -69,7 +68,7 @@ public final Object invoke(Object enhanced, Method method, Object[] args) throws
         return this.newSerialStateHolder(original, unloadedProperties, objectFactory, constructorArgTypes,
             constructorArgs);
       }
-      reentrantLock.lock();
+      lock.lock();
       try {
         if (!FINALIZE_METHOD.equals(methodName) && PropertyNamer.isProperty(methodName) && !reloadingProperty) {
           final String property = PropertyNamer.methodToProperty(methodName);
@@ -96,7 +95,7 @@ public final Object invoke(Object enhanced, Method method, Object[] args) throws
 
         return enhanced;
       } finally {
-        reentrantLock.unlock();
+        lock.unlock();
       }
     } catch (Throwable t) {
       throw ExceptionUtil.unwrapThrowable(t);

src/main/java/org/apache/ibatis/executor/loader/cglib/CglibProxyFactory.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.Enhancer;
@@ -38,7 +39,6 @@
 import org.apache.ibatis.reflection.property.PropertyCopier;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.util.LockKit;
 
 /**
  * @author Clinton Begin
@@ -110,6 +110,7 @@ private static class EnhancedResultObjectProxyImpl implements MethodInterceptor
     private final ObjectFactory objectFactory;
     private final List<Class<?>> constructorArgTypes;
     private final List<Object> constructorArgs;
+    private final ReentrantLock lock = new ReentrantLock();
 
     private EnhancedResultObjectProxyImpl(Class<?> type, ResultLoaderMap lazyLoader, Configuration configuration,
         ObjectFactory objectFactory, List<Class<?>> constructorArgTypes, List<Object> constructorArgs) {
@@ -135,7 +136,6 @@ public static Object createProxy(Object target, ResultLoaderMap lazyLoader, Conf
     @Override
     public Object intercept(Object enhanced, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
       final String methodName = method.getName();
-      LockKit.ReentrantLock lock = LockKit.obtainLock(lazyLoader);
       lock.lock();
       try {
         if (WRITE_REPLACE_METHOD.equals(methodName)) {