Consistent Lock field declaration (instead of ReentrantLock field type)

Author: jhoeller

spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java

@@ -28,6 +28,7 @@
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.context.ResourceLoaderAware;
@@ -650,7 +651,7 @@ protected class PropertiesHolder {
 
 		private volatile long refreshTimestamp = -2;
 
-		private final ReentrantLock refreshLock = new ReentrantLock();
+		private final Lock refreshLock = new ReentrantLock();
 
 		/** Cache to hold already generated MessageFormats per message code. */
 		private final ConcurrentMap<String, Map<Locale, MessageFormat>> cachedMessageFormats =

spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorLifecycleDelegate.java

@@ -18,6 +18,7 @@
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.context.SmartLifecycle;
@@ -36,7 +37,7 @@ final class ExecutorLifecycleDelegate implements SmartLifecycle {
 
 	private final ExecutorService executor;
 
-	private final ReentrantLock pauseLock = new ReentrantLock();
+	private final Lock pauseLock = new ReentrantLock();
 
 	private final Condition unpaused = this.pauseLock.newCondition();
 

spring-web/src/main/java/org/springframework/web/server/session/InMemoryWebSessionStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import reactor.core.publisher.Mono;
@@ -315,12 +316,10 @@ private class ExpiredSessionChecker {
 		/** Max time between expiration checks. */
 		private static final int CHECK_PERIOD = 60 * 1000;
 
-
-		private final ReentrantLock lock = new ReentrantLock();
+		private final Lock lock = new ReentrantLock();
 
 		private Instant checkTime = clock.instant().plus(CHECK_PERIOD, ChronoUnit.MILLIS);
 
-
 		public void checkIfNecessary(Instant now) {
 			if (this.checkTime.isBefore(now)) {
 				removeExpiredSessions(now);

spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java

@@ -25,6 +25,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.logging.Log;
@@ -98,7 +99,7 @@ public class SubProtocolWebSocketHandler
 
 	private volatile long lastSessionCheckTime = System.currentTimeMillis();
 
-	private final ReentrantLock sessionCheckLock = new ReentrantLock();
+	private final Lock sessionCheckLock = new ReentrantLock();
 
 	private final DefaultStats stats = new DefaultStats();