diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java index d7415fb4f7..98aea69773 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java @@ -19,9 +19,13 @@ * {@link RuntimeHintsRegistrar} for Spring Integration MQTT module. * * @author Artem Bilan + * @author Jaehong Park * * @since 6.1.9 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") class MqttRuntimeHints implements RuntimeHintsRegistrar { @Override diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java index 5ca7c71e64..679265524d 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java @@ -18,10 +18,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttMessageDrivenChannelAdapterParser extends AbstractChannelAdapterParser { @Override diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java index 19786fa9ef..5340c230e0 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java @@ -10,10 +10,13 @@ * The namespace handler for the MqttAdapter namespace. * * @author Gary Russell + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttNamespaceHandler extends AbstractIntegrationNamespaceHandler { @Override diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java index eadb5c520d..bce32c966f 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java @@ -18,9 +18,12 @@ * The parser for the MqttAdapter Outbound Channel Adapter. * * @author Gary Russell + * @author Jaehong Park * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser { @Override diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java index 0ae8935d90..8cdd56e167 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java @@ -23,10 +23,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") final class MqttParserUtils { private MqttParserUtils() { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java index abe0ba873c..58a5205e08 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java @@ -30,9 +30,13 @@ * @author Artem Vozhdayenko * @author Artem Bilan * @author Christian Tzolov + * @author Jaehong Park * * @since 6.0 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public abstract class AbstractMqttClientManager implements ClientManager, ApplicationEventPublisherAware { protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java index 98313166e5..08f5e4d775 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java @@ -20,9 +20,13 @@ * @author Artem Bilan * @author Jiri Soucek * @author Jiandong Ma + * @author Jaehong Park * * @since 6.0 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public interface ClientManager extends SmartLifecycle, MqttComponent { /** diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java index b69d9a761a..3f829d1851 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java @@ -20,10 +20,13 @@ * * @author Gary Russell * @author Gunnar Hillert + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class DefaultMqttPahoClientFactory implements MqttPahoClientFactory { private MqttConnectOptions options = new MqttConnectOptions(); @@ -65,6 +68,9 @@ public MqttConnectOptions getConnectionOptions() { return this.options; } + /** + * An MQTT will message. + */ public static class Will { private final String topic; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java index f7ab64e7a5..96fc037358 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java @@ -12,9 +12,12 @@ * @param The connection information type. * * @author Gary Russell + * @author Jaehong Park * @since 2.5 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public interface MqttComponent extends BeanNameAware { /** diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java index e5e9cfe250..209b1e5f77 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java @@ -12,9 +12,12 @@ /** * @author Gary Russell + * @author Jaehong Park * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public interface MqttPahoClientFactory { /** diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java index db14394a52..fbcf3fe9ff 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java @@ -10,9 +10,12 @@ * An extension of {@link MqttComponent} for Eclipse Paho components. * * @author Gary Russell + * @author Jaehong Park * @since 5.4 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public interface MqttPahoComponent extends MqttComponent { @Override diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java index b78235f0a7..f5773a206c 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java @@ -28,9 +28,13 @@ * @author Artem Bilan * @author Christian Tzolov * @author Jiri Soucek + * @author Jaehong Park * * @since 6.0 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class Mqttv3ClientManager extends AbstractMqttClientManager implements MqttCallbackExtended { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java index 838c0afab9..e8f5a60922 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java @@ -31,9 +31,13 @@ * @author Artem Bilan * @author Christian Tzolov * @author Jiri Soucek + * @author Jaehong Park * * @since 6.0 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class Mqttv5ClientManager extends AbstractMqttClientManager implements MqttCallback { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java index 3b54191cf6..a7a4d2e752 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java @@ -12,11 +12,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.2.2 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public class MqttConnectionFailedEvent extends MqttIntegrationEvent { public MqttConnectionFailedEvent(Object source) { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java index 6d1c8c83fa..d0eb910840 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java @@ -15,10 +15,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.1 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public abstract class MqttIntegrationEvent extends IntegrationEvent { public MqttIntegrationEvent(Object source) { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java index ba8f319b43..857ce79b39 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java @@ -9,10 +9,12 @@ * was delivered. * * @author Gary Russell + * @author Jaehong Park * @since 4.1 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public class MqttMessageDeliveredEvent extends MqttMessageDeliveryEvent { public MqttMessageDeliveredEvent(Object source, int messageId, String clientId, diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java index 5e4e10330b..7879566392 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java @@ -9,10 +9,12 @@ * {@link #clientId} and {@link #clientInstance} can be used to correlate events. * * @author Gary Russell + * @author Jaehong Park * @since 4.1 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public abstract class MqttMessageDeliveryEvent extends MqttIntegrationEvent { private final int messageId; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java index fd38742142..5781e1583c 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java @@ -11,10 +11,13 @@ * was not delivered on publish operation. * * @author Artem Bilan + * @author Jaehong Park * * @since 6.4 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttMessageNotDeliveredEvent extends MqttMessageDeliveryEvent { @Serial diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java index 771f3fe701..5b82ddb2a2 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java @@ -11,10 +11,12 @@ * has been sent. * * @author Gary Russell + * @author Jaehong Park * @since 4.1 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public class MqttMessageSentEvent extends MqttMessageDeliveryEvent { private final Message message; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java index c2c7400d87..6a5d87b7ae 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java @@ -10,12 +10,15 @@ * The even representing an MQTT error occurred during client interaction. * * @author Artem Bilan + * @author Jaehong Park * * @since 5.5.5 * * @see org.eclipse.paho.mqttv5.client.MqttCallback#mqttErrorOccurred(MqttException) + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public class MqttProtocolErrorEvent extends MqttIntegrationEvent { public MqttProtocolErrorEvent(Object source, MqttException exception) { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java index 69f78a2d14..2795682eab 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java @@ -6,10 +6,12 @@ /** * @author Gary Russell + * @author Jaehong Park * @since 4.2.2 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ -@SuppressWarnings("serial") +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings({"serial", "removal"}) public class MqttSubscribedEvent extends MqttIntegrationEvent { private final String message; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java index ddfd3d8ae5..987b4d8eb1 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java @@ -40,12 +40,15 @@ * @author Artem Vozhdayenko * @author Jiri Soucek * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) @ManagedResource @IntegrationManagedResource +@SuppressWarnings("removal") public abstract class AbstractMqttMessageDrivenChannelAdapter extends MessageProducerSupport implements ApplicationEventPublisherAware, ClientManager.ConnectCallback { 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 6574fee22f..0a80ffd0f5 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 @@ -49,10 +49,13 @@ * @author Artem Bilan * @author Artem Vozhdayenko * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttPahoMessageDrivenChannelAdapter extends AbstractMqttMessageDrivenChannelAdapter implements MqttCallbackExtended, MqttPahoComponent { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java index fda2f52421..fdc5d9e346 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java @@ -76,10 +76,13 @@ * @author Matthias Thoma * @author Glenn Renfro * @author Goutam Adwant + * @author Jaehong Park * * @since 5.5.5 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class Mqttv5PahoMessageDrivenChannelAdapter extends AbstractMqttMessageDrivenChannelAdapter implements MqttCallback, MqttComponent { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java index b5b56b145c..e7e574e75d 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java @@ -38,10 +38,13 @@ * @author Gary Russell * @author Artem Bilan * @author Artem Vozhdayenko + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public abstract class AbstractMqttMessageHandler extends AbstractMessageHandler implements ManageableLifecycle, ApplicationEventPublisherAware { 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 853b73b799..c503b1d53f 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 @@ -39,10 +39,13 @@ * @author Artem Bilan * @author Artem Vozhdayenko * @author Christian Tzolov + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttPahoMessageHandler extends AbstractMqttMessageHandler implements MqttCallback, MqttPahoComponent { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java index e32605bfcb..3575b2e89a 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java @@ -45,9 +45,13 @@ * @author Artem Vozhdayenko * @author Glenn Renfro * @author Deng Pan + * @author Jaehong Park * * @since 5.5.5 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class Mqttv5PahoMessageHandler extends AbstractMqttMessageHandler implements MqttCallback, MqttComponent { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java index 08aebe05b4..9daff2385d 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java @@ -28,10 +28,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class DefaultPahoMessageConverter implements MqttMessageConverter, BeanFactoryAware { private final Charset charset; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java index 9b232ca72f..3bd3b898d1 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java @@ -12,9 +12,12 @@ * Helper for typed access to incoming MQTT message headers. * * @author Gary Russell + * @author Jaehong Park * @since 5.3 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public final class MqttHeaderAccessor { private MqttHeaderAccessor() { diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java index 3518dba9ec..7ec7b16e3b 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java @@ -26,9 +26,13 @@ * The default {@link HeaderMapper} implementation for MQTT v5 message properties mapping. * * @author Artem Bilan + * @author Jaehong Park * * @since 5.5.5 + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public class MqttHeaderMapper implements HeaderMapper { private static final LogAccessor LOGGER = new LogAccessor(MqttHeaderMapper.class); diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java index 346814e7a9..c97f897f7a 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java @@ -8,10 +8,13 @@ * Spring Integration headers. * * @author Gary Russell + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public final class MqttHeaders { public static final String PREFIX = "mqtt_"; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java index f0fc34e925..a9c671ef9b 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java @@ -18,10 +18,13 @@ * * @author Gary Russell * @author Artem Bilan + * @author Jaehong Park * * @since 4.0 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public interface MqttMessageConverter extends MessageConverter { /** diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java index 197fc3badf..12c5ac5f1c 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java @@ -19,10 +19,13 @@ * MQTT Utilities. * * @author Gary Russell + * @author Jaehong Park * * @since 5.4 - * + * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module. */ +@Deprecated(since = "7.2", forRemoval = true) +@SuppressWarnings("removal") public final class MqttUtils { private static final boolean PAHO_MQTTV3_PRESENT = diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java index e0e2db9666..9d4fa85930 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java @@ -52,12 +52,14 @@ * @author Gary Russell * @author Artem Bilan * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 * */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class BackToBackAdapterTests implements MosquittoContainerTest { private static final long QUIESCENT_TIMEOUT = 1; diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java index dffb380574..a798264b54 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java @@ -47,9 +47,11 @@ /** * @author Artem Vozhdayenko * @author Artem Bilan + * @author Jaehong Park * * @since 6.0 */ +@SuppressWarnings("removal") class ClientManagerBackToBackTests implements MosquittoContainerTest { static final long QUIESCENT_TIMEOUT = 1L; diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java index 3bd59287c3..ddfc1dceef 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java @@ -35,12 +35,14 @@ * @author Gary Russell * @author Artem Bilan * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 * */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class DownstreamExceptionTests implements MosquittoContainerTest { @Autowired diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java index bb38ada766..46a5bd7669 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java @@ -16,10 +16,12 @@ * started only once per JVM, therefore the target Docker container is reused automatically. * * @author Artem Bilan + * @author Jaehong Park * * @since 5.5.5 */ @Testcontainers(disabledWithoutDocker = true) +@SuppressWarnings("removal") public interface MosquittoContainerTest { GenericContainer MOSQUITTO_CONTAINER = diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java index e896822074..406db9a66c 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java @@ -86,10 +86,12 @@ * @author Artem Bilan * @author Artem Vozhdayenko * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 * */ +@SuppressWarnings("removal") public class MqttAdapterTests implements TestApplicationContextAware { private final IMqttToken alwaysComplete; diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java index fc302115c3..5ec16deabd 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java @@ -41,11 +41,13 @@ /** * @author Artem Bilan + * @author Jaehong Park * * @since 5.1.2 */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class MqttDslTests implements MosquittoContainerTest, TestApplicationContextAware { @Autowired diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java index 3896859a71..87d8954745 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java @@ -43,10 +43,12 @@ * @author Artem Vozhdayenko * @author Matthias Thoma * @author Goutam Adwant + * @author Jaehong Park * * @since 5.5.16 * */ +@SuppressWarnings("removal") public class Mqttv5AdapterTests { @Test diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java index 76e0d87345..165fca7dd9 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java @@ -38,11 +38,13 @@ /** * @author Lucas Bowler * @author Artem Bilan + * @author Jaehong Park * * @since 5.5.13 */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class Mqttv5BackToBackAutomaticReconnectTests implements MosquittoContainerTest { @Autowired diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java index cf21538e05..08487457e6 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java @@ -48,12 +48,14 @@ * @author Mikhail Polivakha * @author Glenn Renfro * @author Goutam Adwant + * @author Jaehong Park * * @since 5.5.5 * */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class Mqttv5BackToBackTests implements MosquittoContainerTest { private static final long QUIESCENT_TIMEOUT = 1; diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java index d38d7d2299..536f5fbfcc 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java @@ -34,9 +34,11 @@ * conversion path. * * @author Deng Pan + * @author Jaehong Park * * @since 7.1 */ +@SuppressWarnings("removal") class Mqttv5HandlerTests { @Test diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java index 68d031baa4..aef0cfc2b0 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java @@ -39,9 +39,11 @@ * in {@link Mqttv5PahoMessageHandler}. * * @author Glenn Renfro + * @author Jaehong Park * * @since 7.1 */ +@SuppressWarnings("removal") public class Mqttv5ReconnectionConditionTests { @Test diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java index d3bafbdfec..ae301092c6 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java @@ -33,11 +33,13 @@ /** * @author Artem Bilan + * @author Jaehong Park * * @since 6.0.3 */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class ResubscribeAfterAutomaticReconnectTests implements MosquittoContainerTest { @Autowired diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java index 3fc432ba93..9a5d56ae8a 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java @@ -23,12 +23,14 @@ * @author Gary Russell * @author Artem Bilan * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 * */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class MqttMessageDrivenChannelAdapterParserTests { @Autowired diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java index b5ea1fb386..debdbd2f77 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java @@ -29,11 +29,13 @@ * @author Gary Russell * @author Artem Bilan * @author Glenn Renfro + * @author Jaehong Park * * @since 4.0 */ @SpringJUnitConfig @DirtiesContext +@SuppressWarnings("removal") public class MqttOutboundChannelAdapterParserTests { @Autowired diff --git a/src/reference/antora/modules/ROOT/pages/mqtt.adoc b/src/reference/antora/modules/ROOT/pages/mqtt.adoc index a7943b9d8e..2d208c2638 100644 --- a/src/reference/antora/modules/ROOT/pages/mqtt.adoc +++ b/src/reference/antora/modules/ROOT/pages/mqtt.adoc @@ -3,6 +3,10 @@ Spring Integration provides inbound and outbound channel adapters to support the Message Queueing Telemetry Transport (MQTT) protocol. +IMPORTANT: Starting with version 7.2, the Paho-based `spring-integration-mqtt` module is deprecated for removal in favor of the HiveMQ-based `spring-integration-mqtt-client` module. +The following sections describe the deprecated Paho-based adapters. +To migrate, use the `spring-integration-mqtt-client` dependency and the components in the `org.springframework.integration.mqtt.client` packages, and adapt your client configuration to the HiveMQ MQTT client API. + This dependency is required for the project: [tabs] @@ -565,4 +569,4 @@ private void addAddRuntimeAdapter(IntegrationFlowContext flowContext, Mqttv5Clie .get()) .register(); } ----- \ No newline at end of file +---- diff --git a/src/reference/antora/modules/ROOT/pages/whats-new.adoc b/src/reference/antora/modules/ROOT/pages/whats-new.adoc index cbd447ada3..a7c4f73f80 100644 --- a/src/reference/antora/modules/ROOT/pages/whats-new.adoc +++ b/src/reference/antora/modules/ROOT/pages/whats-new.adoc @@ -21,6 +21,7 @@ A new `KafkaShareMessageDrivenChannelAdapter` provides a message-driven inbound See xref:kafka.adoc#kafka-share-inbound[Message-driven Channel Adapter for Share Groups] for more information. A new `spring-integration-mqtt-client` module has been introduced to provide similar capabilities to the existing `spring-integration-mqtt`, but based on the HiveMQ MQTT client. +The Paho-based `spring-integration-mqtt` module is deprecated for removal in favor of this new module. See xref:mqtt.adoc[] for more information. A new `PayloadValidatingMessageSelector` accepts a message only if its payload passes a Spring `Validator`, such as a Bean Validation one from the `LocalValidatorFactoryBean`.