fix checkstyle issues

Author: tzolov

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

@@ -22,8 +22,6 @@
 import java.net.InetSocketAddress;
 import java.net.MulticastSocket;
 import java.net.NetworkInterface;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.messaging.MessagingException;
 

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

@@ -23,8 +23,6 @@
 import java.net.MulticastSocket;
 import java.net.NetworkInterface;
 import java.net.URISyntaxException;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.expression.Expression;
 import org.springframework.messaging.Message;

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/channel/PostgresChannelMessageTableSubscriber.java

@@ -171,65 +171,7 @@ public void start() {
 
 			CountDownLatch startingLatch = new CountDownLatch(1);
 			this.future = this.taskExecutor.submit(() -> {
-				try {
-					while (isActive()) {
-						try {
-							PgConnection conn = this.connectionSupplier.get();
-							try (Statement stmt = conn.createStatement()) {
-								stmt.execute("LISTEN " + this.tablePrefix.toLowerCase() + "channel_message_notify");
-							}
-							catch (Exception ex) {
-								try {
-									conn.close();
-								}
-								catch (Exception suppressed) {
-									ex.addSuppressed(suppressed);
-								}
-								throw ex;
-							}
-							this.subscriptionsMap.values()
-									.forEach(subscriptions -> subscriptions.forEach(Subscription::notifyUpdate));
-							try {
-								this.connection = conn;
-								while (isActive()) {
-									startingLatch.countDown();
-
-									PGNotification[] notifications = conn.getNotifications(0);
-									// Unfortunately, there is no good way of interrupting a notification
-									// poll but by closing its connection.
-									if (!isActive()) {
-										return;
-									}
-									if (notifications != null) {
-										for (PGNotification notification : notifications) {
-											String parameter = notification.getParameter();
-											Set<Subscription> subscriptions = this.subscriptionsMap.get(parameter);
-											if (subscriptions == null) {
-												continue;
-											}
-											for (Subscription subscription : subscriptions) {
-												subscription.notifyUpdate();
-											}
-										}
-									}
-								}
-							}
-							finally {
-								conn.close();
-							}
-						}
-						catch (Exception e) {
-							// The getNotifications method does not throw a meaningful message on interruption.
-							// Therefore, we do not log an error, unless it occurred while active.
-							if (isActive()) {
-								LOGGER.error(e, "Failed to poll notifications from Postgres database");
-							}
-						}
-					}
-				}
-				finally {
-					this.latch.countDown();
-				}
+				doStart(startingLatch);
 			});
 
 			try {
@@ -247,6 +189,69 @@ public void start() {
 		}
 	}
 
+	private void doStart(CountDownLatch startingLatch) {
+		try {
+			while (isActive()) {
+				try {
+					PgConnection conn = this.connectionSupplier.get();
+					try (Statement stmt = conn.createStatement()) {
+						stmt.execute("LISTEN " + this.tablePrefix.toLowerCase() + "channel_message_notify");
+					}
+					catch (Exception ex) {
+						try {
+							conn.close();
+						}
+						catch (Exception suppressed) {
+							ex.addSuppressed(suppressed);
+						}
+						throw ex;
+					}
+					this.subscriptionsMap.values()
+							.forEach(subscriptions -> subscriptions.forEach(Subscription::notifyUpdate));
+					try {
+						this.connection = conn;
+						while (isActive()) {
+							startingLatch.countDown();
+
+							PGNotification[] notifications = conn.getNotifications(0);
+							// Unfortunately, there is no good way of interrupting a notification
+							// poll but by closing its connection.
+							if (!isActive()) {
+								return;
+							}
+							if (notifications != null) {
+								for (PGNotification notification : notifications) {
+									String parameter = notification.getParameter();
+									Set<Subscription> subscriptions = this.subscriptionsMap.get(parameter);
+									if (subscriptions == null) {
+										continue;
+									}
+									for (Subscription subscription : subscriptions) {
+										subscription.notifyUpdate();
+									}
+								}
+							}
+						}
+					}
+					finally {
+						conn.close();
+					}
+				}
+				catch (Exception e) {
+					// The getNotifications method does not throw a meaningful message on interruption.
+					// Therefore, we do not log an error, unless it occurred while active.
+					if (isActive()) {
+						LOGGER.error(e, "Failed to poll notifications from Postgres database");
+					}
+				}
+			}
+		}
+		finally {
+			this.latch.countDown();
+		}
+
+	}
+
 	private boolean isActive() {
 		if (Thread.interrupted()) {
 			Thread.currentThread().interrupt();

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

@@ -16,9 +16,6 @@
 
 package org.springframework.integration.mqtt.core;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;

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

@@ -16,9 +16,6 @@
 
 package org.springframework.integration.mqtt.core;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.eclipse.paho.mqttv5.client.IMqttAsyncClient;
 import org.eclipse.paho.mqttv5.client.IMqttToken;
 import org.eclipse.paho.mqttv5.client.MqttAsyncClient;

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java

@@ -17,8 +17,6 @@
 package org.springframework.integration.mqtt.inbound;
 
 import java.util.Arrays;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Stream;
 
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java

@@ -18,8 +18,6 @@
 
 import java.util.Arrays;
 import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.IntStream;
 
 import org.eclipse.paho.mqttv5.client.IMqttAsyncClient;

spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java

@@ -16,9 +16,6 @@
 
 package org.springframework.integration.mqtt.outbound;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;

spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ClientWebSocketContainer.java

@@ -21,8 +21,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.context.SmartLifecycle;

spring-integration-websocket/src/main/java/org/springframework/integration/websocket/ServerWebSocketContainer.java

@@ -17,8 +17,6 @@
 package org.springframework.integration.websocket;
 
 import java.util.Arrays;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.springframework.context.Lifecycle;
 import org.springframework.context.SmartLifecycle;

spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/config/LeaderInitiatorFactoryBean.java

@@ -17,8 +17,6 @@
 package org.springframework.integration.zookeeper.config;
 
 import java.util.UUID;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.curator.framework.CuratorFramework;
 

spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/lock/ZookeeperLockRegistry.java

@@ -152,7 +152,8 @@ public Lock obtain(Object lockKey) {
 		this.locksLock.lock();
 		try {
 			lock = this.locks.computeIfAbsent(path, p -> new ZkLock(this.client, this.mutexTaskExecutor, p));
-		} finally {
+		}
+		finally {
 			this.locksLock.unlock();
 		}
 		if (this.trackingTime) {