Skip to content

Commit 83eb987

Browse files
committed
More nullability for AsyncRabbitTemplate
1 parent 05420a6 commit 83eb987

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -376,12 +376,12 @@ public RabbitMessageFuture sendAndReceive(Message message) {
376376
}
377377

378378
@Override
379-
public RabbitMessageFuture sendAndReceive(String routingKey, Message message) {
379+
public RabbitMessageFuture sendAndReceive(@Nullable String routingKey, Message message) {
380380
return sendAndReceive(this.template.getExchange(), routingKey, message);
381381
}
382382

383383
@Override
384-
public RabbitMessageFuture sendAndReceive(String exchange, String routingKey, Message message) {
384+
public RabbitMessageFuture sendAndReceive(@Nullable String exchange, @Nullable String routingKey, Message message) {
385385
String correlationId = getOrSetCorrelationIdAndSetReplyTo(message, null);
386386
RabbitMessageFuture future = new RabbitMessageFuture(correlationId, message, this::canceler,
387387
this::timeoutTask);
@@ -410,32 +410,35 @@ public <C> RabbitConverterFuture<C> convertSendAndReceive(Object object) {
410410
}
411411

412412
@Override
413-
public <C> RabbitConverterFuture<C> convertSendAndReceive(String routingKey, Object object) {
413+
public <C> RabbitConverterFuture<C> convertSendAndReceive(@Nullable String routingKey, Object object) {
414414
return convertSendAndReceive(this.template.getExchange(), routingKey, object, null);
415415
}
416416

417417
@Override
418-
public <C> RabbitConverterFuture<C> convertSendAndReceive(String exchange, String routingKey, Object object) {
418+
public <C> RabbitConverterFuture<C> convertSendAndReceive(@Nullable String exchange, @Nullable String routingKey,
419+
Object object) {
420+
419421
return convertSendAndReceive(exchange, routingKey, object, null);
420422
}
421423

422424
@Override
423425
public <C> RabbitConverterFuture<C> convertSendAndReceive(Object object,
424426
MessagePostProcessor messagePostProcessor) {
427+
425428
return convertSendAndReceive(this.template.getExchange(), this.template.getRoutingKey(), object,
426429
messagePostProcessor);
427430
}
428431

429432
@Override
430-
public <C> RabbitConverterFuture<C> convertSendAndReceive(String routingKey, Object object,
433+
public <C> RabbitConverterFuture<C> convertSendAndReceive(@Nullable String routingKey, Object object,
431434
MessagePostProcessor messagePostProcessor) {
432435

433436
return convertSendAndReceive(this.template.getExchange(), routingKey, object, messagePostProcessor);
434437
}
435438

436439
@Override
437-
public <C> RabbitConverterFuture<C> convertSendAndReceive(String exchange, String routingKey, Object object,
438-
@Nullable MessagePostProcessor messagePostProcessor) {
440+
public <C> RabbitConverterFuture<C> convertSendAndReceive(@Nullable String exchange, @Nullable String routingKey,
441+
Object object, @Nullable MessagePostProcessor messagePostProcessor) {
439442

440443
return convertSendAndReceive(exchange, routingKey, object, messagePostProcessor, null);
441444
}
@@ -449,15 +452,15 @@ public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(Object object,
449452
}
450453

451454
@Override
452-
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(String routingKey, Object object,
455+
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(@Nullable String routingKey, Object object,
453456
ParameterizedTypeReference<C> responseType) {
454457

455458
return convertSendAndReceiveAsType(this.template.getExchange(), routingKey, object, null, responseType);
456459
}
457460

458461
@Override
459-
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(String exchange, String routingKey, Object object,
460-
ParameterizedTypeReference<C> responseType) {
462+
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(@Nullable String exchange,
463+
@Nullable String routingKey, Object object, ParameterizedTypeReference<C> responseType) {
461464

462465
return convertSendAndReceiveAsType(exchange, routingKey, object, null, responseType);
463466
}
@@ -471,24 +474,26 @@ public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(Object object,
471474
}
472475

473476
@Override
474-
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(String routingKey, Object object,
477+
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(@Nullable String routingKey, Object object,
475478
@Nullable MessagePostProcessor messagePostProcessor, @Nullable ParameterizedTypeReference<C> responseType) {
476479

477480
return convertSendAndReceiveAsType(this.template.getExchange(), routingKey, object, messagePostProcessor,
478481
responseType);
479482
}
480483

481484
@Override
482-
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(String exchange, String routingKey, Object object,
483-
@Nullable MessagePostProcessor messagePostProcessor, @Nullable ParameterizedTypeReference<C> responseType) {
485+
public <C> RabbitConverterFuture<C> convertSendAndReceiveAsType(@Nullable String exchange,
486+
@Nullable String routingKey, Object object, @Nullable MessagePostProcessor messagePostProcessor,
487+
@Nullable ParameterizedTypeReference<C> responseType) {
484488

485489
Assert.state(this.template.getMessageConverter() instanceof SmartMessageConverter,
486490
"template's message converter must be a SmartMessageConverter");
487491
return convertSendAndReceive(exchange, routingKey, object, messagePostProcessor, responseType);
488492
}
489493

490-
private <C> RabbitConverterFuture<C> convertSendAndReceive(String exchange, String routingKey, Object object,
491-
@Nullable MessagePostProcessor messagePostProcessor, @Nullable ParameterizedTypeReference<C> responseType) {
494+
private <C> RabbitConverterFuture<C> convertSendAndReceive(@Nullable String exchange, @Nullable String routingKey,
495+
Object object, @Nullable MessagePostProcessor messagePostProcessor,
496+
@Nullable ParameterizedTypeReference<C> responseType) {
492497

493498
AsyncCorrelationData<C> correlationData = new AsyncCorrelationData<>(messagePostProcessor, responseType,
494499
this.enableConfirms);
@@ -510,7 +515,7 @@ private <C> RabbitConverterFuture<C> convertSendAndReceive(String exchange, Stri
510515
return future;
511516
}
512517

513-
private void sendDirect(Channel channel, String exchange, String routingKey, Message message,
518+
private void sendDirect(Channel channel, @Nullable String exchange, @Nullable String routingKey, Message message,
514519
@Nullable CorrelationData correlationData) {
515520

516521
message.getMessageProperties().setReplyTo(Address.AMQ_RABBITMQ_REPLY_TO);

0 commit comments

Comments
 (0)