Skip to content

Commit 133f330

Browse files
committed
Declare remaining messageSelector parameters in JmsOperations as @⁠Nullable
Closes gh-35151
1 parent b6675ed commit 133f330

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
336336
* @throws JmsException checked JMSException converted to unchecked
337337
*/
338338
@Nullable
339-
Object receiveSelectedAndConvert(String messageSelector) throws JmsException;
339+
Object receiveSelectedAndConvert(@Nullable String messageSelector) throws JmsException;
340340

341341
/**
342342
* Receive a message synchronously from the specified destination, but only
@@ -351,7 +351,7 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
351351
* @throws JmsException checked JMSException converted to unchecked
352352
*/
353353
@Nullable
354-
Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException;
354+
Object receiveSelectedAndConvert(Destination destination, @Nullable String messageSelector) throws JmsException;
355355

356356
/**
357357
* Receive a message synchronously from the specified destination, but only
@@ -367,7 +367,7 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
367367
* @throws JmsException checked JMSException converted to unchecked
368368
*/
369369
@Nullable
370-
Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException;
370+
Object receiveSelectedAndConvert(String destinationName, @Nullable String messageSelector) throws JmsException;
371371

372372

373373
//---------------------------------------------------------------------------------------
@@ -468,7 +468,7 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
468468
* @throws JmsException checked JMSException converted to unchecked
469469
*/
470470
@Nullable
471-
<T> T browseSelected(String messageSelector, BrowserCallback<T> action) throws JmsException;
471+
<T> T browseSelected(@Nullable String messageSelector, BrowserCallback<T> action) throws JmsException;
472472

473473
/**
474474
* Browse selected messages in a JMS queue. The callback gives access to the JMS
@@ -481,7 +481,7 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
481481
* @throws JmsException checked JMSException converted to unchecked
482482
*/
483483
@Nullable
484-
<T> T browseSelected(Queue queue, String messageSelector, BrowserCallback<T> action) throws JmsException;
484+
<T> T browseSelected(Queue queue, @Nullable String messageSelector, BrowserCallback<T> action) throws JmsException;
485485

486486
/**
487487
* Browse selected messages in a JMS queue. The callback gives access to the JMS
@@ -495,6 +495,6 @@ void convertAndSend(String destinationName, Object message, MessagePostProcessor
495495
* @throws JmsException checked JMSException converted to unchecked
496496
*/
497497
@Nullable
498-
<T> T browseSelected(String queueName, String messageSelector, BrowserCallback<T> action) throws JmsException;
498+
<T> T browseSelected(String queueName, @Nullable String messageSelector, BrowserCallback<T> action) throws JmsException;
499499

500500
}

spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -763,13 +763,13 @@ public Message receiveSelected(@Nullable String messageSelector) throws JmsExcep
763763

764764
@Override
765765
@Nullable
766-
public Message receiveSelected(final Destination destination, @Nullable final String messageSelector) throws JmsException {
766+
public Message receiveSelected(Destination destination, @Nullable String messageSelector) throws JmsException {
767767
return execute(session -> doReceive(session, destination, messageSelector), true);
768768
}
769769

770770
@Override
771771
@Nullable
772-
public Message receiveSelected(final String destinationName, @Nullable final String messageSelector) throws JmsException {
772+
public Message receiveSelected(String destinationName, @Nullable String messageSelector) throws JmsException {
773773
return execute(session -> {
774774
Destination destination = resolveDestinationName(session, destinationName);
775775
return doReceive(session, destination, messageSelector);
@@ -857,19 +857,19 @@ public Object receiveAndConvert(String destinationName) throws JmsException {
857857

858858
@Override
859859
@Nullable
860-
public Object receiveSelectedAndConvert(String messageSelector) throws JmsException {
860+
public Object receiveSelectedAndConvert(@Nullable String messageSelector) throws JmsException {
861861
return doConvertFromMessage(receiveSelected(messageSelector));
862862
}
863863

864864
@Override
865865
@Nullable
866-
public Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException {
866+
public Object receiveSelectedAndConvert(Destination destination, @Nullable String messageSelector) throws JmsException {
867867
return doConvertFromMessage(receiveSelected(destination, messageSelector));
868868
}
869869

870870
@Override
871871
@Nullable
872-
public Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException {
872+
public Object receiveSelectedAndConvert(String destinationName, @Nullable String messageSelector) throws JmsException {
873873
return doConvertFromMessage(receiveSelected(destinationName, messageSelector));
874874
}
875875

@@ -1022,7 +1022,7 @@ public <T> T browse(String queueName, BrowserCallback<T> action) throws JmsExcep
10221022

10231023
@Override
10241024
@Nullable
1025-
public <T> T browseSelected(String messageSelector, BrowserCallback<T> action) throws JmsException {
1025+
public <T> T browseSelected(@Nullable String messageSelector, BrowserCallback<T> action) throws JmsException {
10261026
Queue defaultQueue = getDefaultQueue();
10271027
if (defaultQueue != null) {
10281028
return browseSelected(defaultQueue, messageSelector, action);
@@ -1034,7 +1034,7 @@ public <T> T browseSelected(String messageSelector, BrowserCallback<T> action) t
10341034

10351035
@Override
10361036
@Nullable
1037-
public <T> T browseSelected(final Queue queue, @Nullable final String messageSelector, final BrowserCallback<T> action)
1037+
public <T> T browseSelected(Queue queue, @Nullable String messageSelector, BrowserCallback<T> action)
10381038
throws JmsException {
10391039

10401040
Assert.notNull(action, "Callback object must not be null");
@@ -1051,7 +1051,7 @@ public <T> T browseSelected(final Queue queue, @Nullable final String messageSel
10511051

10521052
@Override
10531053
@Nullable
1054-
public <T> T browseSelected(final String queueName, @Nullable final String messageSelector, final BrowserCallback<T> action)
1054+
public <T> T browseSelected(String queueName, @Nullable String messageSelector, BrowserCallback<T> action)
10551055
throws JmsException {
10561056

10571057
Assert.notNull(action, "Callback object must not be null");

0 commit comments

Comments
 (0)