GH-3215: MQTT Event for failed connection outbound

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

@@ -27,6 +27,7 @@
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.event.MqttConnectionFailedEvent;
 import org.springframework.integration.mqtt.event.MqttMessageDeliveredEvent;
 import org.springframework.integration.mqtt.event.MqttMessageSentEvent;
 import org.springframework.integration.mqtt.support.MqttMessageConverter;
@@ -201,6 +202,9 @@ private synchronized IMqttAsyncClient checkConnection() throws MqttException {
 					this.client.close();
 					this.client = null;
 				}
+				if (this.applicationEventPublisher != null) {
+					this.applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, e));
+				}
 				throw new MessagingException("Failed to connect", e);
 			}
 		}
@@ -247,6 +251,9 @@ public synchronized void connectionLost(Throwable cause) {
 				// NOSONAR
 			}
 			this.client = null;
+			if (this.applicationEventPublisher != null) {
+				this.applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, cause));
+			}
 		}
 	}
 

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

@@ -198,6 +198,11 @@ public void testOutboundOptionsApplied() throws Exception {
 
 		verify(client, times(1)).connect(any(MqttConnectOptions.class));
 		assertThat(connectCalled.get()).isTrue();
+		AtomicReference<Object> failed = new AtomicReference<>();
+		handler.setApplicationEventPublisher(event -> failed.set(event));
+		handler.connectionLost(new IllegalStateException());
+		assertThat(failed.get()).isInstanceOf(MqttConnectionFailedEvent.class);
+		handler.stop();
 	}
 
 	@Test
@@ -410,6 +415,10 @@ public void testReconnect() throws Exception {
 		Thread.sleep(1000);
 		// the following assertion should be equalTo, but leq to protect against a slow CI server
 		assertThat(attemptingReconnectCount.get()).isLessThanOrEqualTo(2);
+		AtomicReference<Object> failed = new AtomicReference<>();
+		adapter.setApplicationEventPublisher(event -> failed.set(event));
+		adapter.connectionLost(new IllegalStateException());
+		assertThat(failed.get()).isInstanceOf(MqttConnectionFailedEvent.class);
 		adapter.stop();
 		taskScheduler.destroy();
 	}

src/reference/asciidoc/mqtt.adoc

@@ -278,7 +278,7 @@ The default is `headers['mqtt_topic']`.
 <11> When `true`, the caller does not block.
 Rather, it waits for delivery confirmation when a message is sent.
 The default is `false` (the send blocks until delivery is confirmed).
-<12> When `async` and `async-events` are both `true`, an `MqttMessageSentEvent` is emitted.
+<12> When `async` and `async-events` are both `true`, an `MqttMessageSentEvent` is emitted (See <<events>>).
 It contains the message, the topic, the `messageId` generated by the client library, the `clientId`, and the `clientInstance` (incremented each time the client is connected).
 When the delivery is confirmed by the client library, an `MqttMessageDeliveredEvent` is emitted.
 It contains the the `messageId`, the `clientId`, and the `clientInstance`, enabling delivery to be correlated with the send.
@@ -372,3 +372,14 @@ public class MqttJavaApplication {
 }
 ----
 ====
+
+[[events]]
+=== Events
+
+Certain application events are published by the adapters.
+
+* `MqttConnectionFailedEvent` - published by both adapters if we fail to connect or a connection is subsequently lost.
+* `MqttMessageSentEvent` - published by the outbound adapter when a message has been sent, if running in asynchronous mode.
+* `MqttMessageDeliveredEvent` - published by the outbound adapter when the client indicates that a message has been delivered, if running in asynchronous mode.
+
+These events can be received by an `ApplicationListener<MqttIntegrationEvent>` or with an `@EventListener` method.