addres first batch of review suggestions

Author: tzolov

spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2022 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,20 +19,17 @@
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.UUID;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 
 
 /**
  * @author Oleg Zhurakousky
  * @author Artem Bilan
- * @author Christian Tzolov
  *
  */
 class TimeBasedUUIDGenerator {
 
-	static final Lock lock = new ReentrantLock();
+	static final Object lock = new Object();
 
 	private static final Logger logger = Logger.getLogger(TimeBasedUUIDGenerator.class.getName());
 
@@ -59,8 +56,7 @@ static UUID generateId() {
 	static UUID generateIdFromTimestamp(long currentTimeMillis) {
 		long time;
 
-		lock.lock();
-		try {
+		synchronized (lock) {
 			if (currentTimeMillis > lastTime) {
 				lastTime = currentTimeMillis;
 				clockSequence = 0;
@@ -69,9 +65,7 @@ static UUID generateIdFromTimestamp(long currentTimeMillis) {
 				++clockSequence;
 			}
 		}
-		finally {
-			lock.unlock();
-		}
+
 
 		time = currentTimeMillis;
 

spring-integration-file/src/main/java/org/springframework/integration/file/locking/FileChannelCache.java

@@ -76,7 +76,7 @@ public static FileLock tryLockFor(File fileToLock) throws IOException {
 		FileLock lock = null;
 		if (channel != null) {
 			try {
-				lock = channel.lock();
+				lock = channel.tryLock();
 			}
 			catch (OverlappingFileLockException e) {
 				// File is already locked in this thread or virtual machine

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastReceivingChannelAdapter.java

@@ -42,8 +42,6 @@ public class MulticastReceivingChannelAdapter extends UnicastReceivingChannelAda
 
 	private final String group;
 
-	private final Lock lock = new ReentrantLock();
-
 	/**
 	 * Constructs a MulticastReceivingChannelAdapter that listens for packets on the
 	 * specified multichannel address (group) and port.

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java

@@ -51,8 +51,6 @@ public class MulticastSendingMessageHandler extends UnicastSendingMessageHandler
 
 	private volatile MulticastSocket multicastSocket;
 
-	private final Lock lock = new ReentrantLock();
-
 	/**
 	 * Constructs a MulticastSendingMessageHandler to send data to the multicast address/port.
 	 * @param address The multicast address.

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java

@@ -56,7 +56,7 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 
 	private final DatagramPacketMessageMapper mapper = new DatagramPacketMessageMapper();
 
-	private final Lock lock = new ReentrantLock();
+	protected final Lock lock = new ReentrantLock();
 
 	private DatagramSocket socket;
 

spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java

@@ -69,7 +69,7 @@ public class UnicastSendingMessageHandler extends
 
 	private static final int DEFAULT_ACK_TIMEOUT = 5000;
 
-	private final Lock lock = new ReentrantLock();
+	protected final Lock lock = new ReentrantLock();
 
 	private final DatagramPacketMessageMapper mapper = new DatagramPacketMessageMapper();
 

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -18,8 +18,6 @@
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.integration.support.MessageBuilder;
@@ -28,15 +26,11 @@
 
 /**
  * @author Gary Russell
- * @author Christian Tzolov
- *
  * @since 2.0
  *
  */
 public class HelloWorldInterceptor extends TcpConnectionInterceptorSupport {
 
-	private final Lock lock = new ReentrantLock();
-
 	private volatile boolean negotiated;
 
 	private final Semaphore negotiationSemaphore = new Semaphore(0);
@@ -63,8 +57,7 @@ public HelloWorldInterceptor(String hello, String world, ApplicationEventPublish
 	@Override
 	public boolean onMessage(Message<?> message) {
 		if (!this.negotiated) {
-			this.lock.lock();
-			try {
+			synchronized (this) {
 				if (!this.negotiated) {
 					Object payload = message.getPayload();
 					logger.debug(this.toString() + " received " + payload);
@@ -98,9 +91,6 @@ public boolean onMessage(Message<?> message) {
 					}
 				}
 			}
-			finally {
-				this.lock.unlock();
-			}
 		}
 		try {
 			return super.onMessage(message);

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/LockInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -16,31 +16,21 @@
 
 package org.springframework.integration.jdbc;
 
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
 /**
  * @author Dave Syer
- * @author Christian Tzolov
  *
  */
 public class LockInterceptor extends ReentrantLock implements MethodInterceptor {
 
 	private static final long serialVersionUID = 1L;
 
-	private final Lock lock = new ReentrantLock();
-
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		this.lock.lock();
-		try {
-			return invocation.proceed();
-		}
-		finally {
-			this.lock.unlock();
-		}
+	public synchronized Object invoke(MethodInvocation invocation) throws Throwable {
+		return invocation.proceed();
 	}
 
 }

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDelegateTests.java

@@ -63,7 +63,7 @@ public void testLessAmountOfUnlockThanLock() {
 
 		final Lock lock = registry.obtain("foo");
 		for (int i = 0; i < lockCount; i++) {
-			lock.lock();
+			lock.tryLock();
 		}
 		for (int i = 0; i < unlockCount; i++) {
 			lock.unlock();
@@ -79,7 +79,7 @@ public void testSameAmountOfUnlockThanLock() {
 
 		final Lock lock = registry.obtain("foo");
 		for (int i = 0; i < lockCount; i++) {
-			lock.lock();
+			lock.tryLock();
 		}
 		for (int i = 0; i < lockCount; i++) {
 			lock.unlock();
@@ -91,7 +91,7 @@ public void testSameAmountOfUnlockThanLock() {
 	@Test
 	public void testTransientDataAccessException() {
 		final Lock lock = registry.obtain("foo");
-		lock.lock();
+		lock.tryLock();
 
 		final AtomicBoolean shouldThrow = new AtomicBoolean(true);
 		doAnswer(invocation -> {
@@ -109,7 +109,7 @@ public void testTransientDataAccessException() {
 	@Test
 	public void testTransactionTimedOutException() {
 		final Lock lock = registry.obtain("foo");
-		lock.lock();
+		lock.tryLock();
 
 		final AtomicBoolean shouldThrow = new AtomicBoolean(true);
 		doAnswer(invocation -> {
@@ -127,7 +127,7 @@ public void testTransactionTimedOutException() {
 	@Test
 	public void testTransactionSystemException() {
 		final Lock lock = registry.obtain("foo");
-		lock.lock();
+		lock.tryLock();
 
 		final AtomicBoolean shouldThrow = new AtomicBoolean(true);
 		doAnswer(invocation -> {

spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/Consumer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -20,8 +20,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,8 +29,6 @@
 /**
  *
  * @author Gunnar Hillert
- * @author Christian Tzolov
- *
  * @since 2.2
  *
  */
@@ -42,27 +38,13 @@ public final class Consumer {
 
 	private static final BlockingQueue<Message<Collection<?>>> MESSAGES = new LinkedBlockingQueue<Message<Collection<?>>>();
 
-	private final Lock lock = new ReentrantLock();
-
-	public void receive(Message<Collection<?>> message) {
-		this.lock.lock();
-		try {
-			logger.info("Service Activator received Message: " + message);
-			MESSAGES.add(message);
-		}
-		finally {
-			this.lock.unlock();
-		}
+	public synchronized void receive(Message<Collection<?>> message) {
+		logger.info("Service Activator received Message: " + message);
+		MESSAGES.add(message);
 	}
 
-	public Message<Collection<?>> poll(long timeoutInMillis) throws InterruptedException {
-		this.lock.lock();
-		try {
-			return MESSAGES.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
-		}
-		finally {
-			this.lock.unlock();
-		}
+	public synchronized Message<Collection<?>> poll(long timeoutInMillis) throws InterruptedException {
+		return MESSAGES.poll(timeoutInMillis, TimeUnit.MILLISECONDS);
 	}
 
 }

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java

@@ -50,7 +50,7 @@ public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T
 
 	private static final int DEFAULT_MANAGER_PHASE = 0;
 
-	private final Lock lock = new ReentrantLock();
+	protected final Lock lock = new ReentrantLock();
 
 	private final Set<ConnectCallback> connectCallbacks = Collections.synchronizedSet(new HashSet<>());
 

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java

@@ -47,8 +47,6 @@ public class Mqttv3ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallbackExtended {
 
-	private final Lock lock = new ReentrantLock();
-
 	private final MqttConnectOptions connectionOptions;
 
 	private MqttClientPersistence persistence;

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java

@@ -49,8 +49,6 @@ public class Mqttv5ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback {
 
-	private final Lock lock = new ReentrantLock();
-
 	private final MqttConnectionOptions connectionOptions;
 
 	private MqttClientPersistence persistence;