From 064cb57ac0605bb13e194b5904d8391d07fdcb67 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 22 Jul 2020 11:32:53 -0400 Subject: [PATCH] Fix new Sonar smells --- .../mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java | 7 +++---- .../integration/mqtt/outbound/MqttPahoMessageHandler.java | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java index 570c921c05..0c75530896 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java @@ -37,7 +37,6 @@ import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; import org.springframework.integration.mqtt.core.MqttPahoClientFactory; import org.springframework.integration.mqtt.core.MqttPahoComponent; import org.springframework.integration.mqtt.event.MqttConnectionFailedEvent; -import org.springframework.integration.mqtt.event.MqttIntegrationEvent; import org.springframework.integration.mqtt.event.MqttSubscribedEvent; import org.springframework.integration.mqtt.support.MqttUtils; import org.springframework.integration.support.AbstractIntegrationMessageBuilder; @@ -46,8 +45,8 @@ import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** - * Eclipse Paho Implementation. When consuming {@link MqttIntegrationEvent}s published by - * this component use {@code MqttPahoComponent adapter = event.getSourceAsType()} to get a + * Eclipse Paho Implementation. When consuming {@link org.springframework.integration.mqtt.event.MqttIntegrationEvent}s + * published by this component use {@code MqttPahoComponent adapter = event.getSourceAsType()} to get a * reference, allowing you to obtain the bean name and {@link MqttConnectOptions}. This * technique allows consumption of events from both inbound and outbound endpoints in the * same event listener. @@ -423,7 +422,7 @@ public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDriv } /** - * Used to complete message arrival when {@link AckMode#MANUAL}. + * Used to complete message arrival when {@link #manualAcks} is true. * * @since 5.3 */ diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java index e291708444..111bf5eb96 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java @@ -29,7 +29,6 @@ import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; import org.springframework.integration.mqtt.core.MqttPahoClientFactory; import org.springframework.integration.mqtt.core.MqttPahoComponent; import org.springframework.integration.mqtt.event.MqttConnectionFailedEvent; -import org.springframework.integration.mqtt.event.MqttIntegrationEvent; import org.springframework.integration.mqtt.event.MqttMessageDeliveredEvent; import org.springframework.integration.mqtt.event.MqttMessageSentEvent; import org.springframework.integration.mqtt.support.MqttMessageConverter; @@ -40,8 +39,8 @@ import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** - * Eclipse Paho Implementation. When consuming {@link MqttIntegrationEvent}s published by - * this component use {@code MqttPahoComponent handler = event.getSourceAsType()} to get a + * Eclipse Paho Implementation. When consuming {@link org.springframework.integration.mqtt.event.MqttIntegrationEvent}s + * published by this component use {@code MqttPahoComponent handler = event.getSourceAsType()} to get a * reference, allowing you to obtain the bean name and {@link MqttConnectOptions}. This * technique allows consumption of events from both inbound and outbound endpoints in the * same event listener.