From b6675edb92c3edacf1609f5fec092871e8c371ef Mon Sep 17 00:00:00 2001 From: Jiandong Ma Date: Thu, 3 Jul 2025 19:57:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Declare=20messageSelector=20parameters=20in?= =?UTF-8?q?=20JmsOperations=20as=20@=E2=81=A0Nullable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See gh-35151 Signed-off-by: Jiandong Ma --- .../java/org/springframework/jms/core/JmsOperations.java | 6 +++--- .../main/java/org/springframework/jms/core/JmsTemplate.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java index cbccdbfa9ee..5eb92ef25f7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java @@ -247,7 +247,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(String messageSelector) throws JmsException; + Message receiveSelected(@Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -261,7 +261,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(Destination destination, String messageSelector) throws JmsException; + Message receiveSelected(Destination destination, @Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -276,7 +276,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(String destinationName, String messageSelector) throws JmsException; + Message receiveSelected(String destinationName, @Nullable String messageSelector) throws JmsException; //--------------------------------------------------------------------------------------- diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index c63c7d7086a..747e362a53b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -751,7 +751,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public Message receiveSelected(String messageSelector) throws JmsException { + public Message receiveSelected(@Nullable String messageSelector) throws JmsException { Destination defaultDestination = getDefaultDestination(); if (defaultDestination != null) { return receiveSelected(defaultDestination, messageSelector); From 133f330850aa91b0628f372e315c9e396a4e4543 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 4 Jul 2025 11:35:49 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Declare=20remaining=20messageSelector=20par?= =?UTF-8?q?ameters=20in=20JmsOperations=20as=20@=E2=81=A0Nullable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-35151 --- .../springframework/jms/core/JmsOperations.java | 12 ++++++------ .../springframework/jms/core/JmsTemplate.java | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java index 5eb92ef25f7..5e9af5e83ae 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java @@ -336,7 +336,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Object receiveSelectedAndConvert(String messageSelector) throws JmsException; + Object receiveSelectedAndConvert(@Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -351,7 +351,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException; + Object receiveSelectedAndConvert(Destination destination, @Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -367,7 +367,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException; + Object receiveSelectedAndConvert(String destinationName, @Nullable String messageSelector) throws JmsException; //--------------------------------------------------------------------------------------- @@ -468,7 +468,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - T browseSelected(String messageSelector, BrowserCallback action) throws JmsException; + T browseSelected(@Nullable String messageSelector, BrowserCallback action) throws JmsException; /** * Browse selected messages in a JMS queue. The callback gives access to the JMS @@ -481,7 +481,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - T browseSelected(Queue queue, String messageSelector, BrowserCallback action) throws JmsException; + T browseSelected(Queue queue, @Nullable String messageSelector, BrowserCallback action) throws JmsException; /** * Browse selected messages in a JMS queue. The callback gives access to the JMS @@ -495,6 +495,6 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - T browseSelected(String queueName, String messageSelector, BrowserCallback action) throws JmsException; + T browseSelected(String queueName, @Nullable String messageSelector, BrowserCallback action) throws JmsException; } diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index 747e362a53b..b8f30777add 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -763,13 +763,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public Message receiveSelected(final Destination destination, @Nullable final String messageSelector) throws JmsException { + public Message receiveSelected(Destination destination, @Nullable String messageSelector) throws JmsException { return execute(session -> doReceive(session, destination, messageSelector), true); } @Override @Nullable - public Message receiveSelected(final String destinationName, @Nullable final String messageSelector) throws JmsException { + public Message receiveSelected(String destinationName, @Nullable String messageSelector) throws JmsException { return execute(session -> { Destination destination = resolveDestinationName(session, destinationName); return doReceive(session, destination, messageSelector); @@ -857,19 +857,19 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public Object receiveSelectedAndConvert(String messageSelector) throws JmsException { + public Object receiveSelectedAndConvert(@Nullable String messageSelector) throws JmsException { return doConvertFromMessage(receiveSelected(messageSelector)); } @Override @Nullable - public Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException { + public Object receiveSelectedAndConvert(Destination destination, @Nullable String messageSelector) throws JmsException { return doConvertFromMessage(receiveSelected(destination, messageSelector)); } @Override @Nullable - public Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException { + public Object receiveSelectedAndConvert(String destinationName, @Nullable String messageSelector) throws JmsException { return doConvertFromMessage(receiveSelected(destinationName, messageSelector)); } @@ -1022,7 +1022,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public T browseSelected(String messageSelector, BrowserCallback action) throws JmsException { + public T browseSelected(@Nullable String messageSelector, BrowserCallback action) throws JmsException { Queue defaultQueue = getDefaultQueue(); if (defaultQueue != null) { return browseSelected(defaultQueue, messageSelector, action); @@ -1034,7 +1034,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public T browseSelected(final Queue queue, @Nullable final String messageSelector, final BrowserCallback action) + public T browseSelected(Queue queue, @Nullable String messageSelector, BrowserCallback action) throws JmsException { Assert.notNull(action, "Callback object must not be null"); @@ -1051,7 +1051,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public T browseSelected(final String queueName, @Nullable final String messageSelector, final BrowserCallback action) + public T browseSelected(String queueName, @Nullable String messageSelector, BrowserCallback action) throws JmsException { Assert.notNull(action, "Callback object must not be null"); From 5da8d5e795b14af3dc68dbdff5097646e5d77e65 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 4 Jul 2025 11:38:30 +0200 Subject: [PATCH 3/3] Remove unnecessary `final` declarations in JmsTemplate This commit removes unnecessary `final` declarations for parameters that are "effectively final". --- .../springframework/jms/core/JmsTemplate.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index b8f30777add..9b86454281e 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -552,7 +552,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public T execute(final @Nullable Destination destination, final ProducerCallback action) throws JmsException { + public T execute(@Nullable Destination destination, ProducerCallback action) throws JmsException { Assert.notNull(action, "Callback object must not be null"); return execute(session -> { MessageProducer producer = createProducer(session, destination); @@ -567,7 +567,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public T execute(final String destinationName, final ProducerCallback action) throws JmsException { + public T execute(String destinationName, ProducerCallback action) throws JmsException { Assert.notNull(action, "Callback object must not be null"); return execute(session -> { Destination destination = resolveDestinationName(session, destinationName); @@ -598,7 +598,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations } @Override - public void send(final Destination destination, final MessageCreator messageCreator) throws JmsException { + public void send(Destination destination, MessageCreator messageCreator) throws JmsException { execute(session -> { doSend(session, destination, messageCreator); return null; @@ -606,7 +606,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations } @Override - public void send(final String destinationName, final MessageCreator messageCreator) throws JmsException { + public void send(String destinationName, MessageCreator messageCreator) throws JmsException { execute(session -> { Destination destination = resolveDestinationName(session, destinationName); doSend(session, destination, messageCreator); @@ -678,12 +678,12 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations } @Override - public void convertAndSend(Destination destination, final Object message) throws JmsException { + public void convertAndSend(Destination destination, Object message) throws JmsException { send(destination, session -> getRequiredMessageConverter().toMessage(message, session)); } @Override - public void convertAndSend(String destinationName, final Object message) throws JmsException { + public void convertAndSend(String destinationName, Object message) throws JmsException { send(destinationName, session -> getRequiredMessageConverter().toMessage(message, session)); } @@ -700,7 +700,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override public void convertAndSend( - Destination destination, final Object message, final MessagePostProcessor postProcessor) + Destination destination, Object message, MessagePostProcessor postProcessor) throws JmsException { send(destination, session -> { @@ -711,7 +711,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override public void convertAndSend( - String destinationName, final Object message, final MessagePostProcessor postProcessor) + String destinationName, Object message, MessagePostProcessor postProcessor) throws JmsException { send(destinationName, session -> { @@ -910,13 +910,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public Message sendAndReceive(final Destination destination, final MessageCreator messageCreator) throws JmsException { + public Message sendAndReceive(Destination destination, MessageCreator messageCreator) throws JmsException { return executeLocal(session -> doSendAndReceive(session, destination, messageCreator), true); } @Override @Nullable - public Message sendAndReceive(final String destinationName, final MessageCreator messageCreator) throws JmsException { + public Message sendAndReceive(String destinationName, MessageCreator messageCreator) throws JmsException { return executeLocal(session -> { Destination destination = resolveDestinationName(session, destinationName); return doSendAndReceive(session, destination, messageCreator);