@@ -74,12 +74,6 @@ void testV3ClientManagerReconnect() throws Exception {
7474 Mqttv3ConfigWithDisconnect .subscribedLatch );
7575 }
7676
77- @ Test
78- void testV3ClientManagerStarted () throws Exception {
79- testSubscribeAndPublish (Mqttv3ConfigWithStartedManager .class , Mqttv3ConfigWithStartedManager .TOPIC_NAME ,
80- Mqttv3ConfigWithStartedManager .subscribedLatch );
81- }
82-
8377 @ Test
8478 void testV3ClientManagerRuntime () throws Exception {
8579 testSubscribeAndPublishRuntime (Mqttv3ConfigRuntime .class , Mqttv3ConfigRuntime .TOPIC_NAME ,
@@ -92,12 +86,6 @@ void testV5ClientManagerReconnect() throws Exception {
9286 Mqttv5ConfigWithDisconnect .subscribedLatch );
9387 }
9488
95- @ Test
96- void testV5ClientManagerStarted () throws Exception {
97- testSubscribeAndPublish (Mqttv5ConfigWithStartedManager .class , Mqttv5ConfigWithStartedManager .TOPIC_NAME ,
98- Mqttv5ConfigWithStartedManager .subscribedLatch );
99- }
100-
10189 @ Test
10290 void testV5ClientManagerRuntime () throws Exception {
10391 testSubscribeAndPublishRuntime (Mqttv5ConfigRuntime .class , Mqttv5ConfigRuntime .TOPIC_NAME ,
@@ -238,43 +226,6 @@ public IntegrationFlow mqttInFlow(Mqttv3ClientManager mqttv3ClientManager) {
238226
239227 }
240228
241- @ Configuration
242- @ EnableIntegration
243- public static class Mqttv3ConfigWithStartedManager {
244-
245- static final String TOPIC_NAME = "test-topic-v3" ;
246-
247- static final CountDownLatch subscribedLatch = new CountDownLatch (1 );
248-
249- @ EventListener
250- public void onSubscribed (MqttSubscribedEvent e ) {
251- subscribedLatch .countDown ();
252- }
253-
254- @ Bean
255- public Mqttv3ClientManager mqttv3ClientManager () {
256- MqttConnectOptions connectionOptions = new MqttConnectOptions ();
257- connectionOptions .setServerURIs (new String [] {MosquittoContainerTest .mqttUrl ()});
258- connectionOptions .setAutomaticReconnect (true );
259- Mqttv3ClientManager manager = new Mqttv3ClientManager (connectionOptions , "client-manager-client-id-v3" );
260- manager .start ();
261- return manager ;
262- }
263-
264- @ Bean
265- public IntegrationFlow mqttOutFlow (Mqttv3ClientManager mqttv3ClientManager ) {
266- return f -> f .handle (new MqttPahoMessageHandler (mqttv3ClientManager ));
267- }
268-
269- @ Bean
270- public IntegrationFlow mqttInFlow (Mqttv3ClientManager mqttv3ClientManager ) {
271- return IntegrationFlow .from (new MqttPahoMessageDrivenChannelAdapter (mqttv3ClientManager , TOPIC_NAME ))
272- .channel (c -> c .queue ("fromMqttChannel" ))
273- .get ();
274- }
275-
276- }
277-
278229 @ Configuration
279230 @ EnableIntegration
280231 public static class Mqttv3ConfigRuntime implements MessageDrivenChannelAdapterFactory {
@@ -378,41 +329,6 @@ public IntegrationFlow mqttInFlow(Mqttv5ClientManager mqttv5ClientManager) {
378329
379330 }
380331
381- @ Configuration
382- @ EnableIntegration
383- public static class Mqttv5ConfigWithStartedManager {
384-
385- static final String TOPIC_NAME = "test-topic-v5" ;
386-
387- static final CountDownLatch subscribedLatch = new CountDownLatch (1 );
388-
389- @ EventListener
390- public void onSubscribed (MqttSubscribedEvent e ) {
391- subscribedLatch .countDown ();
392- }
393-
394- @ Bean
395- public Mqttv5ClientManager mqttv5ClientManager () {
396- Mqttv5ClientManager manager = new Mqttv5ClientManager (MosquittoContainerTest .mqttUrl (), "client-manager-client-id-v5" );
397- manager .start ();
398- return manager ;
399- }
400-
401- @ Bean
402- @ ServiceActivator (inputChannel = "mqttOutFlow.input" )
403- public Mqttv5PahoMessageHandler mqttv5PahoMessageHandler (Mqttv5ClientManager mqttv5ClientManager ) {
404- return new Mqttv5PahoMessageHandler (mqttv5ClientManager );
405- }
406-
407- @ Bean
408- public IntegrationFlow mqttInFlow (Mqttv5ClientManager mqttv5ClientManager ) {
409- return IntegrationFlow .from (new Mqttv5PahoMessageDrivenChannelAdapter (mqttv5ClientManager , TOPIC_NAME ))
410- .channel (c -> c .queue ("fromMqttChannel" ))
411- .get ();
412- }
413-
414- }
415-
416332 @ Configuration
417333 @ EnableIntegration
418334 public static class Mqttv5ConfigRuntime implements MessageDrivenChannelAdapterFactory {
0 commit comments