From 1a3df027e28ef5526fc75d254dda61aa56a15049 Mon Sep 17 00:00:00 2001 From: Jooyoung Pyoung Date: Tue, 10 Jun 2025 00:53:17 +0900 Subject: [PATCH] GH-10069: Mitigate `warning: [this-escape]` in the project Fixes: https://github.com/spring-projects/spring-integration/issues/10069 Suppress warnings introduced with Java 24 build toolchain: spring-integration-core: - Add `@SuppressWarnings("this-escape")` for 23 constructor calls - Make `PublisherAnnotationAdvisor.pointcut` `transient` (serial warning) spring-integration-amqp: - Add `@SuppressWarnings("this-escape")` for 7 constructor calls spring-integration-cassandra: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-event: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-file: - Add `@SuppressWarnings("this-escape")` for 4 constructor calls - Fix 2 deprecation warnings (`Locale` constructor, `Runtime.exec`) spring-integration-ftp: - Add `@SuppressWarnings("this-escape")` for 4 constructor calls spring-integration-graphql: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-jms: - Add `@SuppressWarnings("this-escape")` for 3 constructor calls spring-integration-jmx: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-kafka: - Add `@SuppressWarnings("this-escape")` for 4 constructor calls spring-integration-mail: - Add `@SuppressWarnings("this-escape")` for 5 constructor calls spring-integration-mqtt: - Add `@SuppressWarnings("this-escape")` for 2 constructor calls spring-integration-redis: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-rsocket: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-sftp: - Add `@SuppressWarnings("this-escape")` for 4 constructor calls - Fix 1 serial warnings spring-integration-smb: - Add `@SuppressWarnings("this-escape")` for 3 constructor calls spring-integration-webflux: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-websocket: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-ws: - Add `@SuppressWarnings("this-escape")` for 6 constructor calls spring-integration-xml: - Add `@SuppressWarnings("this-escape")` for 1 constructor call - Fix 1 deprecation warnings (`Locale` constructor) spring-integration-xmpp: - Add `@SuppressWarnings("this-escape")` for 1 constructor call spring-integration-zeromq: - Add `@SuppressWarnings("this-escape")` for 2 constructor calls Signed-off-by: Jooyoung Pyoung --- .../amqp/inbound/AmqpInboundChannelAdapter.java | 3 ++- .../integration/amqp/inbound/AmqpInboundGateway.java | 5 ++++- .../integration/amqp/outbound/AmqpOutboundEndpoint.java | 3 ++- .../amqp/outbound/AsyncAmqpOutboundGateway.java | 3 ++- .../integration/amqp/support/DefaultAmqpHeaderMapper.java | 3 ++- .../cassandra/outbound/CassandraMessageHandler.java | 3 ++- .../integration/aop/PublisherAnnotationAdvisor.java | 5 +++-- .../integration/channel/MessagePublishingErrorHandler.java | 4 +++- .../integration/config/TransformerFactoryBean.java | 3 ++- .../config/xml/StandardHeaderEnricherParser.java | 3 ++- .../integration/core/MessagingTemplate.java | 3 ++- .../dispatcher/AggregateMessageDeliveryException.java | 3 ++- .../integration/dsl/IntegrationFlowExtension.java | 3 ++- .../integration/endpoint/AbstractPollingEndpoint.java | 1 + .../integration/endpoint/EventDrivenConsumer.java | 3 ++- .../integration/endpoint/MessageProducerSupport.java | 1 + .../filter/SimpleExpressionEvaluatingSelector.java | 4 +++- .../springframework/integration/handler/DelayHandler.java | 3 ++- .../handler/ExpressionEvaluatingMessageHandler.java | 3 ++- .../handler/advice/ErrorMessageSendingRecoverer.java | 3 ++- .../integration/mapping/AbstractHeaderMapper.java | 3 ++- .../integration/router/ExpressionEvaluatingRouter.java | 3 ++- .../integration/splitter/ExpressionEvaluatingSplitter.java | 4 ++-- .../integration/store/SimpleMessageStore.java | 1 + .../support/json/ErrorMessageJacksonDeserializer.java | 3 ++- .../transaction/TransactionHandleMessageAdvice.java | 3 ++- .../transformer/MessageTransformingHandler.java | 3 ++- .../transformer/PayloadDeserializingTransformer.java | 3 ++- .../transformer/PayloadSerializingTransformer.java | 3 ++- .../inbound/ApplicationEventListeningMessageProducer.java | 1 + .../remote/gateway/AbstractRemoteFileOutboundGateway.java | 1 + .../integration/file/splitter/FileSplitter.java | 3 ++- .../integration/file/config/ChainElementsTests.java | 3 ++- .../integration/file/remote/StreamingInboundTests.java | 2 ++ .../integration/file/tail/TailCondition.java | 4 +++- .../integration/ftp/gateway/FtpOutboundGateway.java | 4 +++- .../ftp/inbound/FtpInboundFileSynchronizer.java | 3 ++- .../integration/ftp/inbound/FtpStreamingMessageSource.java | 3 ++- .../graphql/outbound/GraphQlMessageHandler.java | 3 ++- .../integration/jms/JmsMessageDrivenEndpoint.java | 2 ++ .../integration/jms/config/JmsHeaderEnricherParser.java | 3 ++- .../integration/monitor/IntegrationMBeanExporter.java | 1 + .../kafka/inbound/KafkaErrorSendingMessageRecoverer.java | 3 ++- .../integration/kafka/inbound/KafkaInboundGateway.java | 1 + .../kafka/inbound/KafkaMessageDrivenChannelAdapter.java | 1 + .../kafka/outbound/KafkaProducerMessageHandler.java | 3 ++- .../springframework/integration/mail/ImapMailReceiver.java | 4 +++- .../springframework/integration/mail/Pop3MailReceiver.java | 4 +++- .../integration/mail/config/MailHeaderEnricherParser.java | 3 ++- .../integration/mqtt/core/Mqttv3ClientManager.java | 3 ++- .../integration/mqtt/core/Mqttv5ClientManager.java | 3 ++- .../redis/inbound/ReactiveRedisStreamMessageProducer.java | 3 ++- .../rsocket/outbound/RSocketOutboundGateway.java | 3 ++- .../integration/sftp/gateway/SftpOutboundGateway.java | 4 +++- .../sftp/inbound/SftpInboundFileSynchronizer.java | 3 ++- .../sftp/inbound/SftpStreamingMessageSource.java | 3 ++- .../integration/sftp/server/DirectoryCreatedEvent.java | 5 +++-- .../integration/smb/inbound/SmbStreamingMessageSource.java | 3 ++- .../integration/smb/outbound/SmbOutboundGateway.java | 4 +++- .../websocket/inbound/WebSocketInboundChannelAdapter.java | 3 ++- .../ws/MarshallingWebServiceOutboundGateway.java | 7 ++++++- .../ws/config/WebServiceHeaderEnricherParser.java | 3 ++- .../integration/xml/config/TestXmlApplicationContext.java | 3 ++- .../xml/config/XmlPayloadValidatingFilterParserTests.java | 5 +++-- .../integration/xmpp/config/XmppHeaderEnricherParser.java | 3 ++- .../integration/zeromq/channel/ZeroMqChannel.java | 4 +++- 66 files changed, 142 insertions(+), 60 deletions(-) diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java index 7f8a9c1ef9..726391f93a 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -130,6 +130,7 @@ public class AmqpInboundChannelAdapter extends MessageProducerSupport implements * Construct an instance using the provided container. * @param listenerContainer the container. */ + @SuppressWarnings("this-escape") public AmqpInboundChannelAdapter(MessageListenerContainer listenerContainer) { Assert.notNull(listenerContainer, "listenerContainer must not be null"); Assert.isNull(listenerContainer.getMessageListener(), diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java index 4a708885ee..f741898169 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -98,6 +98,7 @@ public class AmqpInboundGateway extends MessagingGatewaySupport { private boolean replyHeadersMappedLast; + @SuppressWarnings("this-escape") public AmqpInboundGateway(AbstractMessageListenerContainer listenerContainer) { this(listenerContainer, new RabbitTemplate(listenerContainer.getConnectionFactory()), false); } @@ -108,10 +109,12 @@ public class AmqpInboundGateway extends MessagingGatewaySupport { * @param listenerContainer the {@link MessageListenerContainer} to receive AMQP messages. * @param amqpTemplate the {@link AmqpTemplate} to send reply messages. */ + @SuppressWarnings("this-escape") public AmqpInboundGateway(MessageListenerContainer listenerContainer, AmqpTemplate amqpTemplate) { this(listenerContainer, amqpTemplate, true); } + @SuppressWarnings("this-escape") private AmqpInboundGateway(MessageListenerContainer listenerContainer, AmqpTemplate amqpTemplate, boolean amqpTemplateExplicitlySet) { diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java index a66f47ec5c..e9b6a892ed 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -65,6 +65,7 @@ public class AmqpOutboundEndpoint extends AbstractAmqpOutboundEndpoint private boolean multiSend; + @SuppressWarnings("this-escape") public AmqpOutboundEndpoint(AmqpTemplate amqpTemplate) { Assert.notNull(amqpTemplate, "amqpTemplate must not be null"); this.amqpTemplate = amqpTemplate; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AsyncAmqpOutboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AsyncAmqpOutboundGateway.java index d86665980c..c215ca42ef 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AsyncAmqpOutboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AsyncAmqpOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2025 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. @@ -52,6 +52,7 @@ public class AsyncAmqpOutboundGateway extends AbstractAmqpOutboundEndpoint { private final MessageConverter messageConverter; + @SuppressWarnings("this-escape") public AsyncAmqpOutboundGateway(AsyncRabbitTemplate template) { Assert.notNull(template, "AsyncRabbitTemplate cannot be null"); this.template = template; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java index 6b5e341666..9544351af6 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -91,6 +91,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper channelResolver) { this(); setChannelResolver(channelResolver); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java index 5bf942003b..83d1d511fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -37,6 +37,7 @@ import org.springframework.util.StringUtils; */ public class TransformerFactoryBean extends AbstractStandardMessageHandlerFactoryBean { + @SuppressWarnings("this-escape") public TransformerFactoryBean() { setRequiresReply(true); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java index 362ef6bfd8..3008457003 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -40,6 +40,7 @@ import org.springframework.util.StringUtils; */ public class StandardHeaderEnricherParser extends HeaderEnricherParserSupport { + @SuppressWarnings("this-escape") public StandardHeaderEnricherParser() { addElementToHeaderMapping("reply-channel", MessageHeaders.REPLY_CHANNEL); addElementToHeaderMapping("error-channel", MessageHeaders.ERROR_CHANNEL); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java index e4dcca64aa..5b4e711fc3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2025 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. @@ -58,6 +58,7 @@ public class MessagingTemplate extends GenericMessagingTemplate { * Create a MessagingTemplate with the given default channel. * @param defaultChannel the default {@link MessageChannel} for {@code send} operations */ + @SuppressWarnings("this-escape") public MessagingTemplate(MessageChannel defaultChannel) { super.setDefaultDestination(defaultChannel); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java index 84f0bddd72..a182882bf9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -38,6 +38,7 @@ public class AggregateMessageDeliveryException extends MessageDeliveryException private final List aggregatedExceptions; + @SuppressWarnings("this-escape") public AggregateMessageDeliveryException(Message undeliveredMessage, String description, List aggregatedExceptions) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowExtension.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowExtension.java index 483fa23155..110688071a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowExtension.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlowExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2025 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. @@ -66,6 +66,7 @@ public abstract class IntegrationFlowExtension(expressionString, Boolean.class)); ((ExpressionEvaluatingMessageProcessor) getMessageProcessor()).setSimpleEvaluationContext(true); this.expressionString = expressionString; } + @SuppressWarnings("this-escape") public SimpleExpressionEvaluatingSelector(Expression expression) { super(new ExpressionEvaluatingMessageProcessor<>(expression, Boolean.class)); ((ExpressionEvaluatingMessageProcessor) getMessageProcessor()).setSimpleEvaluationContext(true); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 96da2c3861..bddb4b40f7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -170,6 +170,7 @@ public class DelayHandler extends AbstractReplyProducingMessageHandler implement * @param messageGroupId The message group identifier. * @param taskScheduler A task scheduler. */ + @SuppressWarnings("this-escape") public DelayHandler(String messageGroupId, TaskScheduler taskScheduler) { this(messageGroupId); setTaskScheduler(taskScheduler); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java index 90e6be1fcb..f3cbd49b74 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -37,6 +37,7 @@ public class ExpressionEvaluatingMessageHandler extends AbstractMessageHandler { private String componentType; + @SuppressWarnings("this-escape") public ExpressionEvaluatingMessageHandler(Expression expression) { Assert.notNull(expression, "'expression' must not be null"); this.processor = new ExpressionEvaluatingMessageProcessor<>(expression, Void.class); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java index a1ee875e21..66bb24b4ab 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -70,6 +70,7 @@ public class ErrorMessageSendingRecoverer extends ErrorMessagePublisher implemen * {@link DefaultErrorMessageStrategy} is used. * @since 4.3.10 */ + @SuppressWarnings("this-escape") public ErrorMessageSendingRecoverer(MessageChannel channel, ErrorMessageStrategy errorMessageStrategy) { setChannel(channel); setErrorMessageStrategy( diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java index 8156e6c6cd..7759c58fe6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -97,6 +97,7 @@ public abstract class AbstractHeaderMapper implements RequestReplyHeaderMappe * @param requestHeaderNames the header names that should be mapped from a request to {@link MessageHeaders} * @param replyHeaderNames the header names that should be mapped to a response from {@link MessageHeaders} */ + @SuppressWarnings("this-escape") protected AbstractHeaderMapper(String standardHeaderPrefix, Collection requestHeaderNames, Collection replyHeaderNames) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/ExpressionEvaluatingRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/ExpressionEvaluatingRouter.java index 2b0422c317..3986038471 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/ExpressionEvaluatingRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/ExpressionEvaluatingRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -42,6 +42,7 @@ public class ExpressionEvaluatingRouter extends AbstractMessageProcessingRouter * Construct an instance with the supplied {@link Expression}. * @param expression the expression. */ + @SuppressWarnings("this-escape") public ExpressionEvaluatingRouter(Expression expression) { super(new ExpressionEvaluatingMessageProcessor(expression)); setPrimaryExpression(expression); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/ExpressionEvaluatingSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/ExpressionEvaluatingSplitter.java index 66eeb41860..29f8c9f452 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/ExpressionEvaluatingSplitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/ExpressionEvaluatingSplitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -31,7 +31,7 @@ import org.springframework.integration.handler.ExpressionEvaluatingMessageProces */ public class ExpressionEvaluatingSplitter extends AbstractMessageProcessingSplitter { - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes", "this-escape"}) public ExpressionEvaluatingSplitter(Expression expression) { super(new ExpressionEvaluatingMessageProcessor(expression)); setPrimaryExpression(expression); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java index 230b33cb48..ded03f5c95 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java @@ -120,6 +120,7 @@ public class SimpleMessageStore extends AbstractMessageGroupStore * @param lockRegistry The lock registry. * @since 4.3 */ + @SuppressWarnings("this-escape") public SimpleMessageStore(int individualCapacity, int groupCapacity, long upperBoundTimeout, LockRegistry lockRegistry) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java index 04718afaf3..5632536c32 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 the original author or authors. + * Copyright 2017-2025 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. @@ -37,6 +37,7 @@ public class ErrorMessageJacksonDeserializer extends MessageJacksonDeserializer< private static final long serialVersionUID = 1L; + @SuppressWarnings("this-escape") public ErrorMessageJacksonDeserializer() { super(ErrorMessage.class); setPayloadType(TypeFactory.defaultInstance().constructType(Throwable.class)); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java index e812153f8b..8119b37dbd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionHandleMessageAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2025 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. @@ -46,6 +46,7 @@ public class TransactionHandleMessageAdvice extends TransactionInterceptor imple public TransactionHandleMessageAdvice() { } + @SuppressWarnings("this-escape") public TransactionHandleMessageAdvice(TransactionManager transactionManager, Properties transactionAttributes) { setTransactionManager(transactionManager); setTransactionAttributes(transactionAttributes); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java index 96987516b9..2cd8b257a1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2025 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. @@ -48,6 +48,7 @@ public class MessageTransformingHandler extends AbstractReplyProducingMessageHan * The target delegate {@link Transformer} must be provided then via setter. * @since 6.2 */ + @SuppressWarnings("this-escape") public MessageTransformingHandler() { setRequiresReply(true); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java index 755f014cc0..6d002ba986 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -40,6 +40,7 @@ public class PayloadDeserializingTransformer extends PayloadTypeConvertingTransf * Instantiate based on the {@link AllowListDeserializingConverter} with the * {@link org.springframework.core.serializer.DefaultDeserializer}. */ + @SuppressWarnings("this-escape") public PayloadDeserializingTransformer() { doSetConverter(new AllowListDeserializingConverter()); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java index 1dcb0f3573..1e1e308028 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -38,6 +38,7 @@ public class PayloadSerializingTransformer extends PayloadTypeConvertingTransfor * Instantiate based on the {@link SerializingConverter} with the * {@link org.springframework.core.serializer.DefaultSerializer}. */ + @SuppressWarnings("this-escape") public PayloadSerializingTransformer() { doSetConverter(new SerializingConverter()); } diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java index 8c30b34250..60a5415d69 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java @@ -58,6 +58,7 @@ public class ApplicationEventListeningMessageProducer extends ExpressionMessageP /** * Construct an instance. */ + @SuppressWarnings("this-escape") public ApplicationEventListeningMessageProducer() { setPhase(Integer.MAX_VALUE / 2 - 1000); // NOSONAR magic number } diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index f7f0fa1b61..20cde48eef 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -219,6 +219,7 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply * @param command the command. * @param expressionArg the remote path. */ + @SuppressWarnings("this-escape") public AbstractRemoteFileOutboundGateway(RemoteFileTemplate remoteFileTemplate, Command command, @Nullable String expressionArg) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java index 2734412695..dae9bb8f2a 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/splitter/FileSplitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2025 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. @@ -130,6 +130,7 @@ public class FileSplitter extends AbstractMessageSplitter { * @param markersJson when true, markers are represented as JSON. * @since 4.2.7 */ + @SuppressWarnings("this-escape") public FileSplitter(boolean iterator, boolean markers, boolean markersJson) { this.returnIterator = iterator; this.markers = markers; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java index 1153b33b1d..96588d1590 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java @@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.fail; /** * @author Gunnar Hillert * @author Artem Bilan + * @author Jooyoung Pyoung * * @since 2.2 */ @@ -49,7 +50,7 @@ public class ChainElementsTests { @BeforeEach public void setUp() { localeBeforeTest = Locale.getDefault(); - Locale.setDefault(new Locale("en", "US")); + Locale.setDefault(Locale.US); } @AfterEach diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java index a17c7241de..1fde528c9e 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java @@ -269,11 +269,13 @@ public class StreamingInboundTests { ConcurrentHashMap metadataMap = new ConcurrentHashMap<>(); + @SuppressWarnings("this-escape") protected Streamer(RemoteFileTemplate template) { super(template, null); doSetFilter(null); } + @SuppressWarnings("this-escape") protected Streamer(RemoteFileTemplate template, Comparator comparator) { super(template, comparator); doSetFilter(new StringPersistentFileListFilter(new SimpleMetadataStore(this.metadataMap), "streamer")); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailCondition.java b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailCondition.java index 6716234f9e..ce148bf886 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailCondition.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailCondition.java @@ -45,6 +45,7 @@ import org.springframework.core.annotation.MergedAnnotations; * @author Gary Russell * @author Artem Bilan * @author Jiandong Ma + * @author Jooyoung Pyoung * * @since 6.5 * @@ -94,7 +95,8 @@ public class TailCondition implements ExecutionCondition { ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor(); Future future = newSingleThreadExecutor.submit(() -> { - final Process process = Runtime.getRuntime().exec(commandToTest + " " + file.getAbsolutePath()); + ProcessBuilder pb = new ProcessBuilder(commandToTest, file.getAbsolutePath()); + final Process process = pb.start(); ExecutorService executorService = Executors.newSingleThreadExecutor(); executorService.execute(() -> { try { diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java index 089e0fd310..4cf50233f7 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/FtpOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -64,6 +64,7 @@ public class FtpOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, MessageSessionCallback messageSessionCallback) { @@ -91,6 +92,7 @@ public class FtpOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, String command, @Nullable String expression) { this(new FtpRemoteFileTemplate(sessionFactory), command, expression); ((FtpRemoteFileTemplate) getRemoteFileTemplate()).setExistsMode(FtpRemoteFileTemplate.ExistsMode.NLST); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java index 8ff99dc9c1..ef44d4cd94 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpInboundFileSynchronizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -42,6 +42,7 @@ public class FtpInboundFileSynchronizer extends AbstractInboundFileSynchronizer< * {@link org.springframework.integration.file.remote.session.Session} instances. * @param sessionFactory The session factory. */ + @SuppressWarnings("this-escape") public FtpInboundFileSynchronizer(SessionFactory sessionFactory) { super(sessionFactory); doSetRemoteDirectoryExpression(new LiteralExpression(null)); // NOSONAR - LE can actually handle null ok diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSource.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSource.java index 47f9f9f560..4abf7373de 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSource.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2025 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. @@ -56,6 +56,7 @@ public class FtpStreamingMessageSource extends AbstractRemoteFileStreamingMessag * @param template the template. * @param comparator the comparator. */ + @SuppressWarnings("this-escape") public FtpStreamingMessageSource(RemoteFileTemplate template, Comparator comparator) { super(template, comparator); doSetFilter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "ftpStreamingMessageSource")); diff --git a/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java b/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java index 58edacdf8d..2b2646b51b 100644 --- a/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java +++ b/spring-integration-graphql/src/main/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2022-2023 the original author or authors. + * Copyright 2022-2025 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. @@ -62,6 +62,7 @@ public class GraphQlMessageHandler extends AbstractReplyProducingMessageHandler private Expression executionIdExpression = new FunctionExpression>(message -> message.getHeaders().getId()); + @SuppressWarnings("this-escape") public GraphQlMessageHandler(ExecutionGraphQlService graphQlService) { Assert.notNull(graphQlService, "'graphQlService' must not be null"); this.graphQlService = graphQlService; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java index 6a2603daf0..73ee4c9d46 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java @@ -59,6 +59,7 @@ public class JmsMessageDrivenEndpoint extends MessageProducerSupport implements * @param listenerContainer the container. * @param listener the listener. */ + @SuppressWarnings("this-escape") public JmsMessageDrivenEndpoint(AbstractMessageListenerContainer listenerContainer, ChannelPublishingJmsMessageListener listener) { @@ -74,6 +75,7 @@ public class JmsMessageDrivenEndpoint extends MessageProducerSupport implements * @param externalContainer true if the container is externally configured and should not have its ack mode * coerced when no sessionAcknowledgeMode was supplied. */ + @SuppressWarnings("this-escape") private JmsMessageDrivenEndpoint(AbstractMessageListenerContainer listenerContainer, ChannelPublishingJmsMessageListener listener, boolean externalContainer) { diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsHeaderEnricherParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsHeaderEnricherParser.java index d05362bb51..d93f1fd21f 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsHeaderEnricherParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsHeaderEnricherParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -27,6 +27,7 @@ import org.springframework.jms.support.JmsHeaders; */ public class JmsHeaderEnricherParser extends HeaderEnricherParserSupport { + @SuppressWarnings("this-escape") public JmsHeaderEnricherParser() { this.addElementToHeaderMapping("correlation-id", JmsHeaders.CORRELATION_ID); this.addElementToHeaderMapping("reply-to", JmsHeaders.REPLY_TO); diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java index f8819780b3..db72b89827 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java @@ -153,6 +153,7 @@ public class IntegrationMBeanExporter extends MBeanExporter private volatile boolean singletonsInstantiated; + @SuppressWarnings("this-escape") public IntegrationMBeanExporter() { // Shouldn't be necessary, but to be on the safe side... setAutodetect(false); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaErrorSendingMessageRecoverer.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaErrorSendingMessageRecoverer.java index c591e6c4ae..4149bee2c2 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaErrorSendingMessageRecoverer.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaErrorSendingMessageRecoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2025 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. @@ -52,6 +52,7 @@ public class KafkaErrorSendingMessageRecoverer extends ErrorMessagePublisher imp * @param channel the channel. * @param errorMessageStrategy the strategy. */ + @SuppressWarnings("this-escape") public KafkaErrorSendingMessageRecoverer(MessageChannel channel, ErrorMessageStrategy errorMessageStrategy) { setChannel(channel); setErrorMessageStrategy(errorMessageStrategy); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java index 379ae129a1..67a5a83392 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaInboundGateway.java @@ -97,6 +97,7 @@ public class KafkaInboundGateway extends MessagingGatewaySupport * @param messageListenerContainer the container. * @param kafkaTemplate the kafka template. */ + @SuppressWarnings("this-escape") public KafkaInboundGateway(AbstractMessageListenerContainer messageListenerContainer, KafkaTemplate kafkaTemplate) { diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java index cf40018fd3..20006e21f2 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/inbound/KafkaMessageDrivenChannelAdapter.java @@ -120,6 +120,7 @@ public class KafkaMessageDrivenChannelAdapter extends MessageProducerSuppo * @param messageListenerContainer the container. * @param mode the mode. */ + @SuppressWarnings("this-escape") public KafkaMessageDrivenChannelAdapter(AbstractMessageListenerContainer messageListenerContainer, ListenerMode mode) { diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java index 9883f19577..3498526d7c 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2024 the original author or authors. + * Copyright 2013-2025 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. @@ -167,6 +167,7 @@ public class KafkaProducerMessageHandler extends AbstractReplyProducingMes private volatile byte[] singleReplyTopic; + @SuppressWarnings("this-escape") public KafkaProducerMessageHandler(final KafkaTemplate kafkaTemplate) { Assert.notNull(kafkaTemplate, "kafkaTemplate cannot be null"); this.kafkaTemplate = kafkaTemplate; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java index 8eadb19f4d..b7d145ac33 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -73,10 +73,12 @@ public class ImapMailReceiver extends AbstractMailReceiver { private volatile ScheduledFuture pingTask; + @SuppressWarnings("this-escape") public ImapMailReceiver() { setProtocol(PROTOCOL); } + @SuppressWarnings("this-escape") public ImapMailReceiver(String url) { super(url); if (url != null) { diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/Pop3MailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/Pop3MailReceiver.java index 325ecb4a7b..2318b7cb45 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/Pop3MailReceiver.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/Pop3MailReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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,10 +35,12 @@ public class Pop3MailReceiver extends AbstractMailReceiver { public static final String PROTOCOL = "pop3"; + @SuppressWarnings("this-escape") public Pop3MailReceiver() { setProtocol(PROTOCOL); } + @SuppressWarnings("this-escape") public Pop3MailReceiver(String url) { super(url); if (url != null) { diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java index a2b7b5b47d..92d3b25b63 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/MailHeaderEnricherParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -26,6 +26,7 @@ import org.springframework.integration.mail.MailHeaders; */ public class MailHeaderEnricherParser extends HeaderEnricherParserSupport { + @SuppressWarnings("this-escape") public MailHeaderEnricherParser() { this.addElementToHeaderMapping("subject", MailHeaders.SUBJECT); this.addElementToHeaderMapping("to", MailHeaders.TO); 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 0936bfadeb..9f2f263dc3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2022-2024 the original author or authors. + * Copyright 2022-2025 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. @@ -54,6 +54,7 @@ public class Mqttv3ClientManager this(buildDefaultConnectionOptions(url), clientId); } + @SuppressWarnings("this-escape") public Mqttv3ClientManager(MqttConnectOptions connectionOptions, String clientId) { super(clientId); Assert.notNull(connectionOptions, "'connectionOptions' is required"); 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 3bcbcca520..eeb5f9ada5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2022-2024 the original author or authors. + * Copyright 2022-2025 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. @@ -56,6 +56,7 @@ public class Mqttv5ClientManager this(buildDefaultConnectionOptions(url), clientId); } + @SuppressWarnings("this-escape") public Mqttv5ClientManager(MqttConnectionOptions connectionOptions, String clientId) { super(clientId); Assert.notNull(connectionOptions, "'connectionOptions' is required"); diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java index 5ad255781c..0e0a66840b 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2025 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. @@ -65,6 +65,7 @@ public class ReactiveRedisStreamMessageProducer extends MessageProducerSupport { private final String streamKey; + @SuppressWarnings("this-escape") private final StreamReceiver.StreamReceiverOptionsBuilder streamReceiverOptionsBuilder = StreamReceiver.StreamReceiverOptions.builder() .pollTimeout(Duration.ZERO) diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java index 002fa0e45b..0b1f45ce70 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 the original author or authors. + * Copyright 2019-2025 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. @@ -112,6 +112,7 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler * in this expression evaluation, for example using some bean with an appropriate logic. * @param routeExpression the SpEL expression to use. */ + @SuppressWarnings("this-escape") public RSocketOutboundGateway(Expression routeExpression) { Assert.notNull(routeExpression, "'routeExpression' must not be null"); this.routeExpression = routeExpression; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java index 94d691dbbf..1f71e32f01 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/SftpOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -51,6 +51,7 @@ public class SftpOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, MessageSessionCallback messageSessionCallback) { @@ -77,6 +78,7 @@ public class SftpOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, String command, @Nullable String expression) { diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java index fca7fcc2c1..dec459061b 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -39,6 +39,7 @@ public class SftpInboundFileSynchronizer extends AbstractInboundFileSynchronizer * Create a synchronizer with the {@code SessionFactory} used to acquire {@code Session} instances. * @param sessionFactory The session factory. */ + @SuppressWarnings("this-escape") public SftpInboundFileSynchronizer(SessionFactory sessionFactory) { super(sessionFactory); doSetFilter(new SftpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "sftpMessageSource")); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSource.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSource.java index 288abeed75..987c2a300a 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSource.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2025 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. @@ -56,6 +56,7 @@ public class SftpStreamingMessageSource extends AbstractRemoteFileStreamingMessa * @param template the template. * @param comparator the comparator. */ + @SuppressWarnings("this-escape") public SftpStreamingMessageSource(RemoteFileTemplate template, Comparator comparator) { diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java index efaedda08b..39f84f469d 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/server/DirectoryCreatedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2025 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. @@ -25,6 +25,7 @@ import org.springframework.lang.Nullable; * An event emitted when a directory is created. * * @author Gary Russell + * @author Jooyoung Pyoung * @since 5.2 * */ @@ -34,7 +35,7 @@ public class DirectoryCreatedEvent extends ApacheMinaSftpEvent { private transient Path path; - private final Map attrs; + private final transient Map attrs; public DirectoryCreatedEvent(Object source, Path path, Map attrs) { super(source); diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java index 68c89a0569..c3f8d7e8f7 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 the original author or authors. + * Copyright 2022-2025 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. @@ -60,6 +60,7 @@ public class SmbStreamingMessageSource extends AbstractRemoteFileStreamingMessag * @param template the template. * @param comparator the comparator. */ + @SuppressWarnings("this-escape") public SmbStreamingMessageSource(RemoteFileTemplate template, Comparator comparator) { super(template, comparator); doSetFilter(new SmbPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "smbStreamingMessageSource")); diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java index 9f35c6660c..dbc1820dc4 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2022-2024 the original author or authors. + * Copyright 2022-2025 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. @@ -48,6 +48,7 @@ public class SmbOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, MessageSessionCallback messageSessionCallback) { @@ -74,6 +75,7 @@ public class SmbOutboundGateway extends AbstractRemoteFileOutboundGateway sessionFactory, String command, @Nullable String expression) { this(new SmbRemoteFileTemplate(sessionFactory), command, expression); remoteFileTemplateExplicitlySet(false); diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java index a1c398199a..45b9df4281 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2024 the original author or authors. + * Copyright 2014-2025 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. @@ -115,6 +115,7 @@ public class WebSocketInboundChannelAdapter extends MessageProducerSupport this(webSocketContainer, new SubProtocolHandlerRegistry(new PassThruSubProtocolHandler())); } + @SuppressWarnings("this-escape") public WebSocketInboundChannelAdapter(IntegrationWebSocketContainer webSocketContainer, SubProtocolHandlerRegistry protocolHandlerRegistry) { diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java index 4853015278..6a5329b9e3 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -43,6 +43,7 @@ import org.springframework.ws.client.support.destination.DestinationProvider; */ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutboundGateway { + @SuppressWarnings("this-escape") public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, Marshaller marshaller, Unmarshaller unmarshaller, WebServiceMessageFactory messageFactory) { super(destinationProvider, messageFactory); @@ -63,6 +64,7 @@ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutb this(destinationProvider, marshaller, (WebServiceMessageFactory) null); } + @SuppressWarnings("this-escape") public MarshallingWebServiceOutboundGateway(String uri, Marshaller marshaller, Unmarshaller unmarshaller, WebServiceMessageFactory messageFactory) { super(uri, messageFactory); @@ -88,6 +90,7 @@ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutb * @param webServiceTemplate the WebServiceTemplate * @since 5.0 */ + @SuppressWarnings("this-escape") public MarshallingWebServiceOutboundGateway(String uri, WebServiceTemplate webServiceTemplate) { super(uri, null); doSetWebServiceTemplate(webServiceTemplate); @@ -99,6 +102,7 @@ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutb * @param webServiceTemplate the WebServiceTemplate * @since 5.0 */ + @SuppressWarnings("this-escape") public MarshallingWebServiceOutboundGateway(DestinationProvider destinationProvider, WebServiceTemplate webServiceTemplate) { super(destinationProvider, null); @@ -111,6 +115,7 @@ public class MarshallingWebServiceOutboundGateway extends AbstractWebServiceOutb * @param marshaller The marshaller. * @param unmarshallerArg The unmarshaller. */ + @SuppressWarnings("this-escape") private void configureMarshallers(Marshaller marshaller, @Nullable Unmarshaller unmarshallerArg) { Unmarshaller unmarshaller = unmarshallerArg; Assert.notNull(marshaller, "marshaller must not be null"); diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherParser.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherParser.java index d82e110723..9dbe52cfb7 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherParser.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -25,6 +25,7 @@ import org.springframework.integration.ws.WebServiceHeaders; */ public class WebServiceHeaderEnricherParser extends HeaderEnricherParserSupport { + @SuppressWarnings("this-escape") public WebServiceHeaderEnricherParser() { this.addElementToHeaderMapping("soap-action", WebServiceHeaders.SOAP_ACTION); } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java index 5f125b50e3..76f2cbb211 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -28,6 +28,7 @@ public class TestXmlApplicationContext extends AbstractXmlApplicationContext { private final Resource[] resources; + @SuppressWarnings("this-escape") public TestXmlApplicationContext(String... xmlStrings) { resources = new Resource[xmlStrings.length]; for (int i = 0; i < xmlStrings.length; i++) { diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java index fb49556628..8af7e4226a 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2025 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,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * @author Gunnar Hillert * @author Artem Bilan * @author Gary Russell + * @author Jooyoung Pyoung */ @SpringJUnitConfig @DirtiesContext @@ -63,7 +64,7 @@ public class XmlPayloadValidatingFilterParserTests { @BeforeEach public void setUp() { localeBeforeTest = Locale.getDefault(); - Locale.setDefault(new Locale("en", "US")); + Locale.setDefault(Locale.US); } @AfterEach diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java index 6804a24b54..b968d13a53 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2025 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. @@ -27,6 +27,7 @@ import org.springframework.integration.xmpp.XmppHeaders; */ public class XmppHeaderEnricherParser extends HeaderEnricherParserSupport { + @SuppressWarnings("this-escape") public XmppHeaderEnricherParser() { this.addElementToHeaderMapping("chat-to", XmppHeaders.TO); this.addElementToHeaderMapping("chat-thread-id", XmppHeaders.THREAD); diff --git a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java index 8c94355450..b1cd3792cd 100644 --- a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java +++ b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 the original author or authors. + * Copyright 2020-2025 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. @@ -128,6 +128,7 @@ public class ZeroMqChannel extends AbstractMessageChannel implements Subscribabl * @param context the {@link ZContext} to use. * @param pubSub the communication model: push/pull or pub/sub. */ + @SuppressWarnings("this-escape") public ZeroMqChannel(ZContext context, boolean pubSub) { Assert.notNull(context, "'context' must not be null"); this.context = context; @@ -141,6 +142,7 @@ public class ZeroMqChannel extends AbstractMessageChannel implements Subscribabl this.subscriberData = prepareSubscriberDataFlux(); } + @SuppressWarnings("this-escape") private Mono prepareProxyMono() { return Mono.defer(() -> { if (this.zeroMqProxy != null) {