spring-projectsGH-3822: Apply spring-framework code style on modified class

Author: Lucas Bowler

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

@@ -90,7 +90,7 @@ public class Mqttv5PahoMessageDrivenChannelAdapter extends AbstractMqttMessageDr
 	public Mqttv5PahoMessageDrivenChannelAdapter(String url, String clientId, String... topic) {
 		super(url, clientId, topic);
 		this.connectionOptions = new MqttConnectionOptions();
-		this.connectionOptions.setServerURIs(new String[]{ url });
+		this.connectionOptions.setServerURIs(new String[] {url});
 		this.connectionOptions.setAutomaticReconnect(true);
 	}
 
@@ -165,14 +165,17 @@ protected void doStart() {
 		ApplicationEventPublisher applicationEventPublisher = getApplicationEventPublisher();
 		try {
 			this.mqttClient.connect(this.connectionOptions).waitForCompletion(getCompletionTimeout());
-		} catch (MqttException ex) {
+		}
+		catch (MqttException ex) {
 			if (this.connectionOptions.isAutomaticReconnect()) {
 				try {
 					this.mqttClient.reconnect();
-				} catch (MqttException e) {
+				}
+				catch (MqttException e) {
 					logger.error(ex, "MQTT client failed to connect. Will retry.");
 				}
-			} else {
+			}
+			else {
 				if (applicationEventPublisher != null) {
 					applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, ex));
 				}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-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.
@@ -80,7 +80,7 @@ public class Mqttv5PahoMessageHandler extends AbstractMqttMessageHandler
 	public Mqttv5PahoMessageHandler(String url, String clientId) {
 		super(url, clientId);
 		this.connectionOptions = new MqttConnectionOptions();
-		this.connectionOptions.setServerURIs(new String[]{ url });
+		this.connectionOptions.setServerURIs(new String[] {url});
 		this.connectionOptions.setAutomaticReconnect(true);
 	}
 
@@ -173,7 +173,8 @@ protected void doStart() {
 				catch (MqttException e) {
 					logger.error(ex, "MQTT client failed to connect. Will retry.");
 				}
-			} else {
+			}
+			else {
 				ApplicationEventPublisher applicationEventPublisher = getApplicationEventPublisher();
 				if (applicationEventPublisher != null) {
 					applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, ex));

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java

@@ -16,12 +16,16 @@
 
 package org.springframework.integration.mqtt;
 
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
 import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -50,11 +54,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 
-import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Lucas Bowler
@@ -80,7 +80,7 @@ public class Mqttv5BackToBackAutomaticReconnectTests implements MosquittoContain
 
 	@Test //GH-3822
 	public void testReconnectionWhenFirstConnectionFails() throws InterruptedException {
-		connectionOptions.setServerURIs(new String[]{MosquittoContainerTest.mqttUrl()});
+		connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()});
 		Thread.sleep(2_500);
 
 		String testPayload = "foo";
@@ -135,14 +135,14 @@ protected boolean supports(Class<?> clazz) {
 
 				@Override
 				protected Object convertFromInternal(Message<?> message, Class<?> targetClass,
-													 Object conversionHint) {
+						Object conversionHint) {
 
 					return message.getPayload().toString().getBytes(StandardCharsets.UTF_8);
 				}
 
 				@Override
 				protected Object convertToInternal(Object payload, MessageHeaders headers,
-												   Object conversionHint) {
+						Object conversionHint) {
 
 					return new String((byte[]) payload);
 				}
@@ -188,7 +188,6 @@ public IntegrationFlow mqttInFlow() {
 					.get();
 		}
 
-
 	}
 
 }