Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-4014: MQTT ClientManager: completion timeouts (#8552)

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/4014

The `ClientManager` implementations uses by mistake a `connectionTimeout` for operations with completion wait

* Introduce `completionTimeout` and `disconnectCompletionTimeout` for `ClientManager`
abstraction to realign the logic with existing channel adapters and Paho Client by itself.
* Deprecate `DEFAULT_COMPLETION_TIMEOUT` and `DISCONNECT_COMPLETION_TIMEOUT` constants
in the `AbstractMqttMessageDrivenChannelAdapter` in favor of respective replacement in the `ClientManager`
* Pull `disconnectCompletionTimeout` property from the `MqttPahoMessageDrivenChannelAdapter` to its superclass
* Use new `disconnectCompletionTimeout` in the `Mqttv5PahoMessageDrivenChannelAdapter` for similar `disconnectForcibly()` call
* Fix Lifecycle race condition when `ClientManager` is started by the outbound channel adapter
(`Integer.MIN_VALUE` phase and auto-startup - see `DefaultLifecycleProcessor.doStart()` and logic around `dependencies`)
which is much earlier than `MessageProducerSupport` (`Integer.MAX_VALUE / 2` phase) and there a `connectComplete()` callback
might be called before the `MessageProducerSupport.start()`.
For that purpose check for an `isRunning()` in the `connectComplete()` before subscribing and set `readyToSubscribeOnStart` flag
to `subscribe()` in a `doStart()` of this `MqttMessageDrivenChannelAdapter`
* Remove redundant `MqttPahoMessageDrivenChannelAdapter.cleanSession` property in favor of
`this.clientFactory.getConnectionOptions().isCleanSession()` call

GH-8550: MQTT: Always re-subscribe on re-connect

Fixes https://github.com/spring-projects/spring-integration/issues/8550

Turns out the Paho MQTT client does not re-subscribe when connection
re-established on automatic reconnection

* Fix `AbstractMqttMessageDrivenChannelAdapter` to always subscribe to their topics
in the `connectComplete()` independently of the `reconnect` status
* Verify behavior with `MOSQUITTO_CONTAINER` image restart in Docker
This commit is contained in:
Artem Bilan
2023-02-15 17:26:12 -05:00
committed by GitHub
parent 3d245276e4
commit b482b002cb
8 changed files with 282 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2022 the original author or authors.
* Copyright 2022-2023 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.
@@ -53,6 +53,10 @@ public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T
private int phase = DEFAULT_MANAGER_PHASE;
private long completionTimeout = ClientManager.DEFAULT_COMPLETION_TIMEOUT;
private long disconnectCompletionTimeout = ClientManager.DISCONNECT_COMPLETION_TIMEOUT;
private boolean manualAcks;
private ApplicationEventPublisher applicationEventPublisher;
@@ -96,6 +100,34 @@ public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T
return this.connectCallbacks;
}
/**
* Set the completion timeout for operations.
* Default {@value #DEFAULT_COMPLETION_TIMEOUT} milliseconds.
* @param completionTimeout The timeout.
* @since 6.0.3
*/
public void setCompletionTimeout(long completionTimeout) {
this.completionTimeout = completionTimeout;
}
protected long getCompletionTimeout() {
return this.completionTimeout;
}
/**
* Set the completion timeout when disconnecting.
* Default {@value #DISCONNECT_COMPLETION_TIMEOUT} milliseconds.
* @param completionTimeout The timeout.
* @since 6.0.3
*/
public synchronized void setDisconnectCompletionTimeout(long completionTimeout) {
this.disconnectCompletionTimeout = completionTimeout;
}
protected long getDisconnectCompletionTimeout() {
return this.disconnectCompletionTimeout;
}
@Override
public boolean isManualAcks() {
return this.manualAcks;
@@ -123,7 +155,7 @@ public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T
}
/**
* The phase of component autostart in {@link SmartLifecycle}.
* The phase of component auto-start in {@link SmartLifecycle}.
* If the custom one is required, note that for the correct behavior it should be less than phase of
* {@link AbstractMqttMessageDrivenChannelAdapter} implementations.
* The default phase is {@link #DEFAULT_MANAGER_PHASE}.

12
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2022 the original author or authors.
* Copyright 2022-2023 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.
@@ -33,6 +33,16 @@ import org.springframework.context.SmartLifecycle;
*/
public interface ClientManager<T, C> extends SmartLifecycle, MqttComponent<C> {
/**
* The default completion timeout in milliseconds.
*/
long DEFAULT_COMPLETION_TIMEOUT = 30_000L;
/**
* The default disconnect completion timeout in milliseconds.
*/
long DISCONNECT_COMPLETION_TIMEOUT = 5_000L;
/**
* Return the managed client.
* @return the managed client.

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

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2022 the original author or authors.
* Copyright 2022-2023 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.
@@ -35,6 +35,8 @@ import org.springframework.util.Assert;
* {@link MqttConnectionFailedEvent} and reconnect the MQTT client manually.
*
* @author Artem Vozhdayenko
* @author Artem Bilan
*
* @since 6.0
*/
public class Mqttv3ClientManager
@@ -97,10 +99,9 @@ public class Mqttv3ClientManager
}
setClient(client);
try {
client.connect(this.connectionOptions)
.waitForCompletion(this.connectionOptions.getConnectionTimeout());
client.connect(this.connectionOptions).waitForCompletion(getCompletionTimeout());
}
catch (MqttException e) {
catch (MqttException ex) {
// See GH-3822
if (this.connectionOptions.isAutomaticReconnect()) {
try {
@@ -113,10 +114,10 @@ public class Mqttv3ClientManager
else {
var applicationEventPublisher = getApplicationEventPublisher();
if (applicationEventPublisher != null) {
applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, e));
applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, ex));
}
else {
logger.error("Could not start client manager, client_id=" + getClientId(), e);
logger.error("Could not start client manager, client_id=" + getClientId(), ex);
}
}
}
@@ -138,7 +139,7 @@ public class Mqttv3ClientManager
return;
}
try {
client.disconnectForcibly(this.connectionOptions.getConnectionTimeout());
client.disconnectForcibly(getDisconnectCompletionTimeout());
}
catch (MqttException e) {
logger.error("Could not disconnect from the client", e);

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

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2022 the original author or authors.
* Copyright 2022-2023 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.
@@ -101,8 +101,7 @@ public class Mqttv5ClientManager
}
setClient(client);
try {
client.connect(this.connectionOptions)
.waitForCompletion(this.connectionOptions.getConnectionTimeout());
client.connect(this.connectionOptions).waitForCompletion(getCompletionTimeout());
}
catch (MqttException ex) {
if (this.connectionOptions.isAutomaticReconnect()) {
@@ -142,7 +141,7 @@ public class Mqttv5ClientManager
}
try {
client.disconnectForcibly(this.connectionOptions.getConnectionTimeout());
client.disconnectForcibly(getDisconnectCompletionTimeout());
}
catch (MqttException e) {
logger.error("Could not disconnect from the client", e);

33
spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@@ -61,7 +61,14 @@ public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends Mess
/**
* The default completion timeout in milliseconds.
*/
public static final long DEFAULT_COMPLETION_TIMEOUT = 30_000L;
@Deprecated(since = "6.0.3", forRemoval = true)
public static final long DEFAULT_COMPLETION_TIMEOUT = ClientManager.DEFAULT_COMPLETION_TIMEOUT;
/**
* The default disconnect completion timeout in milliseconds.
*/
@Deprecated(since = "6.0.3", forRemoval = true)
public static final long DISCONNECT_COMPLETION_TIMEOUT = ClientManager.DISCONNECT_COMPLETION_TIMEOUT;
protected final Lock topicLock = new ReentrantLock(); // NOSONAR
@@ -73,7 +80,9 @@ public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends Mess
private final ClientManager<T, C> clientManager;
private long completionTimeout = DEFAULT_COMPLETION_TIMEOUT;
private long completionTimeout = ClientManager.DEFAULT_COMPLETION_TIMEOUT;
private long disconnectCompletionTimeout = ClientManager.DISCONNECT_COMPLETION_TIMEOUT;
private boolean manualAcks;
@@ -179,6 +188,20 @@ public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends Mess
}
}
/**
* Set the completion timeout when disconnecting.
* Default {@value #DISCONNECT_COMPLETION_TIMEOUT} milliseconds.
* @param completionTimeout The timeout.
* @since 5.1.10
*/
public synchronized void setDisconnectCompletionTimeout(long completionTimeout) {
this.disconnectCompletionTimeout = completionTimeout;
}
protected long getDisconnectCompletionTimeout() {
return this.disconnectCompletionTimeout;
}
@Override
protected void onInit() {
super.onInit();
@@ -223,8 +246,8 @@ public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends Mess
}
/**
* Set the completion timeout for operations. Not settable using the namespace.
* Default {@value #DEFAULT_COMPLETION_TIMEOUT} milliseconds.
* Set the completion timeout for operations.
* Default {@value ClientManager#DEFAULT_COMPLETION_TIMEOUT} milliseconds.
* @param completionTimeout The timeout.
* @since 4.1
*/

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

@@ -64,22 +64,15 @@ public class MqttPahoMessageDrivenChannelAdapter
extends AbstractMqttMessageDrivenChannelAdapter<IMqttAsyncClient, MqttConnectOptions>
implements MqttCallbackExtended, MqttPahoComponent {
/**
* The default disconnect completion timeout in milliseconds.
*/
public static final long DISCONNECT_COMPLETION_TIMEOUT = 5_000L;
private final MqttPahoClientFactory clientFactory;
private long disconnectCompletionTimeout = DISCONNECT_COMPLETION_TIMEOUT;
private volatile IMqttAsyncClient client;
private volatile boolean cleanSession;
@SuppressWarnings("deprecation")
private volatile org.springframework.integration.mqtt.core.ConsumerStopAction consumerStopAction;
private volatile boolean readyToSubscribeOnStart;
/**
* Use this constructor when you don't need additional {@link MqttConnectOptions}.
* @param url The URL.
@@ -138,16 +131,6 @@ public class MqttPahoMessageDrivenChannelAdapter
this.clientFactory = factory;
}
/**
* Set the completion timeout when disconnecting. Not settable using the namespace.
* Default {@value #DISCONNECT_COMPLETION_TIMEOUT} milliseconds.
* @param completionTimeout The timeout.
* @since 5.1.10
*/
public synchronized void setDisconnectCompletionTimeout(long completionTimeout) {
this.disconnectCompletionTimeout = completionTimeout;
}
@Override
public MqttConnectOptions getConnectionInfo() {
MqttConnectOptions options = this.clientFactory.getConnectionOptions();
@@ -175,6 +158,9 @@ public class MqttPahoMessageDrivenChannelAdapter
protected void doStart() {
try {
connect();
if (this.readyToSubscribeOnStart) {
subscribe();
}
}
catch (Exception ex) {
if (getConnectionInfo().isAutomaticReconnect()) {
@@ -195,15 +181,38 @@ public class MqttPahoMessageDrivenChannelAdapter
}
}
@SuppressWarnings("deprecation")
private synchronized void connect() throws MqttException {
MqttConnectOptions connectionOptions = this.clientFactory.getConnectionOptions();
this.consumerStopAction = this.clientFactory.getConsumerStopAction();
if (this.consumerStopAction == null) {
this.consumerStopAction = org.springframework.integration.mqtt.core.ConsumerStopAction.UNSUBSCRIBE_CLEAN;
}
var clientManager = getClientManager();
if (clientManager == null) {
Assert.state(getUrl() != null || connectionOptions.getServerURIs() != null,
"If no 'url' provided, connectionOptions.getServerURIs() must not be null");
this.client = this.clientFactory.getAsyncClientInstance(getUrl(), getClientId());
this.client.setCallback(this);
this.client.connect(connectionOptions).waitForCompletion(getCompletionTimeout());
this.client.setManualAcks(isManualAcks());
}
else {
this.client = clientManager.getClient();
}
}
@SuppressWarnings("deprecation")
@Override
protected synchronized void doStop() {
this.readyToSubscribeOnStart = false;
try {
if (this.consumerStopAction
.equals(org.springframework.integration.mqtt.core.ConsumerStopAction.UNSUBSCRIBE_ALWAYS)
|| (this.consumerStopAction
.equals(org.springframework.integration.mqtt.core.ConsumerStopAction.UNSUBSCRIBE_CLEAN)
&& this.cleanSession)) {
&& this.clientFactory.getConnectionOptions().isCleanSession())) {
this.client.unsubscribe(getTopic());
}
@@ -217,7 +226,7 @@ public class MqttPahoMessageDrivenChannelAdapter
}
try {
this.client.disconnectForcibly(this.disconnectCompletionTimeout);
this.client.disconnectForcibly(getDisconnectCompletionTimeout());
}
catch (MqttException ex) {
logger.error(ex, "Exception while disconnecting");
@@ -273,29 +282,6 @@ public class MqttPahoMessageDrivenChannelAdapter
}
}
@SuppressWarnings("deprecation")
private synchronized void connect() throws MqttException { // NOSONAR
MqttConnectOptions connectionOptions = this.clientFactory.getConnectionOptions();
this.cleanSession = connectionOptions.isCleanSession();
this.consumerStopAction = this.clientFactory.getConsumerStopAction();
if (this.consumerStopAction == null) {
this.consumerStopAction = org.springframework.integration.mqtt.core.ConsumerStopAction.UNSUBSCRIBE_CLEAN;
}
var clientManager = getClientManager();
if (clientManager == null) {
Assert.state(getUrl() != null || connectionOptions.getServerURIs() != null,
"If no 'url' provided, connectionOptions.getServerURIs() must not be null");
this.client = this.clientFactory.getAsyncClientInstance(getUrl(), getClientId());
this.client.setCallback(this);
this.client.connect(connectionOptions).waitForCompletion(getCompletionTimeout());
this.client.setManualAcks(isManualAcks());
}
else {
this.client = clientManager.getClient();
}
}
private void subscribe() {
this.topicLock.lock();
String[] topics = getTopic();
@@ -418,9 +404,12 @@ public class MqttPahoMessageDrivenChannelAdapter
@Override
public void connectComplete(boolean reconnect, String serverURI) {
if (!reconnect) {
if (isRunning()) {
subscribe();
}
else {
this.readyToSubscribeOnStart = true;
}
}
/**

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

@@ -1,5 +1,5 @@
/*
* Copyright 2021-2022 the original author or authors.
* Copyright 2021-2023 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.
@@ -57,15 +57,15 @@ import org.springframework.util.Assert;
/**
* The {@link AbstractMqttMessageDrivenChannelAdapter} implementation for MQTT v5.
*
* <p>
* The {@link MqttProperties} are mapped via the provided {@link HeaderMapper};
* meanwhile the regular {@link MqttMessage} properties are always mapped into headers.
*
* <p>
* It is recommended to have the {@link MqttConnectionOptions#setAutomaticReconnect(boolean)}
* set to true to let an internal {@link IMqttAsyncClient} instance to handle reconnects.
* Otherwise, only the manual restart of this component can handle reconnects, e.g. via
* {@link MqttConnectionFailedEvent} handling on disconnection.
*
* <p>
* See {@link #setPayloadType} for more information about type conversion.
*
* @author Artem Bilan
@@ -94,6 +94,8 @@ public class Mqttv5PahoMessageDrivenChannelAdapter
private HeaderMapper<MqttProperties> headerMapper = new MqttHeaderMapper();
private volatile boolean readyToSubscribeOnStart;
public Mqttv5PahoMessageDrivenChannelAdapter(String url, String clientId, String... topic) {
super(url, clientId, topic);
Assert.hasText(url, "'url' cannot be null or empty");
@@ -184,28 +186,35 @@ public class Mqttv5PahoMessageDrivenChannelAdapter
@Override
protected void doStart() {
try {
connect();
if (this.readyToSubscribeOnStart) {
subscribe();
}
}
catch (MqttException ex) {
if (getConnectionInfo().isAutomaticReconnect()) {
try {
this.mqttClient.reconnect();
}
catch (MqttException re) {
logger.error(re, "MQTT client failed to connect. Never happens.");
}
}
else {
ApplicationEventPublisher applicationEventPublisher = getApplicationEventPublisher();
if (applicationEventPublisher != null) {
applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, ex));
}
logger.error(ex, "MQTT client failed to connect.");
}
}
}
private synchronized void connect() throws MqttException {
var clientManager = getClientManager();
if (clientManager == null) {
try {
this.mqttClient.connect(this.connectionOptions).waitForCompletion(getCompletionTimeout());
}
catch (MqttException ex) {
if (getConnectionInfo().isAutomaticReconnect()) {
try {
this.mqttClient.reconnect();
}
catch (MqttException re) {
logger.error(re, "MQTT client failed to connect. Never happens.");
}
}
else {
ApplicationEventPublisher applicationEventPublisher = getApplicationEventPublisher();
if (applicationEventPublisher != null) {
applicationEventPublisher.publishEvent(new MqttConnectionFailedEvent(this, ex));
}
logger.error(ex, "MQTT client failed to connect.");
}
}
this.mqttClient.connect(this.connectionOptions).waitForCompletion(getCompletionTimeout());
}
else {
this.mqttClient = clientManager.getClient();
@@ -214,6 +223,7 @@ public class Mqttv5PahoMessageDrivenChannelAdapter
@Override
protected void doStop() {
this.readyToSubscribeOnStart = false;
this.topicLock.lock();
String[] topics = getTopic();
try {
@@ -223,7 +233,7 @@ public class Mqttv5PahoMessageDrivenChannelAdapter
}
if (getClientManager() == null) {
this.mqttClient.disconnect().waitForCompletion(getCompletionTimeout());
this.mqttClient.disconnectForcibly(getDisconnectCompletionTimeout());
}
}
}
@@ -348,9 +358,15 @@ public class Mqttv5PahoMessageDrivenChannelAdapter
@Override
public void connectComplete(boolean reconnect, String serverURI) {
if (reconnect) {
return;
if (isRunning()) {
subscribe();
}
else {
this.readyToSubscribeOnStart = true;
}
}
private void subscribe() {
var clientManager = getClientManager();
if (clientManager != null && this.mqttClient == null) {
this.mqttClient = clientManager.getClient();

121
spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java Normal file
View File

@@ -0,0 +1,121 @@
/*
* Copyright 2023 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.mqtt;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
import org.eclipse.paho.mqttv5.client.MqttConnectionOptionsBuilder;
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;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.mqtt.event.MqttSubscribedEvent;
import org.springframework.integration.mqtt.inbound.Mqttv5PahoMessageDrivenChannelAdapter;
import org.springframework.integration.mqtt.outbound.Mqttv5PahoMessageHandler;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Artem Bilan
*
* @since 6.0.3
*/
@SpringJUnitConfig
@DirtiesContext
public class ResubscribeAfterAutomaticReconnectTests implements MosquittoContainerTest {
@Autowired
@Qualifier("mqttOutFlow.input")
private MessageChannel mqttOutFlowInput;
@Autowired
private PollableChannel fromMqttChannel;
@Autowired
private MqttConnectionOptions connectionOptions;
@Autowired
Config config;
@Test
void messageReceivedAfterResubscriptionOnLostConnection() throws InterruptedException {
GenericMessage<String> testMessage = new GenericMessage<>("test");
this.mqttOutFlowInput.send(testMessage);
assertThat(this.fromMqttChannel.receive(10_000)).isNotNull();
MOSQUITTO_CONTAINER.stop();
MOSQUITTO_CONTAINER.start();
connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()});
assertThat(this.config.subscribeLatch.await(10, TimeUnit.SECONDS)).isTrue();
this.mqttOutFlowInput.send(testMessage);
assertThat(this.fromMqttChannel.receive(10_000)).isNotNull();
}
@Configuration
@EnableIntegration
public static class Config {
CountDownLatch subscribeLatch = new CountDownLatch(2);
@Bean
public MqttConnectionOptions mqttConnectOptions() {
return new MqttConnectionOptionsBuilder()
.serverURI(MosquittoContainerTest.mqttUrl())
.automaticReconnect(true)
.build();
}
@Bean
public IntegrationFlow mqttOutFlow(MqttConnectionOptions mqttConnectOptions) {
Mqttv5PahoMessageHandler messageHandler =
new Mqttv5PahoMessageHandler(mqttConnectOptions, "mqttv5SIout");
messageHandler.setDefaultTopic("siTest");
return f -> f.handle(messageHandler);
}
@Bean
public IntegrationFlow mqttInFlow(MqttConnectionOptions mqttConnectOptions) {
Mqttv5PahoMessageDrivenChannelAdapter messageProducer =
new Mqttv5PahoMessageDrivenChannelAdapter(mqttConnectOptions, "mqttInClient", "siTest");
return IntegrationFlow.from(messageProducer)
.channel(c -> c.queue("fromMqttChannel"))
.get();
}
@EventListener(MqttSubscribedEvent.class)
public void mqttEvents() {
this.subscribeLatch.countDown();
}
}
}