Fix RabbitAmqpUtils.toAmqpMessage() util for to prop

The `messageProperties.getReplyTo()` might be null, so set it into `amqpMessage::to`
only if it is not null

* Add convenient `JavaUtils.acceptOrElseIfNotNull()` for two alternative values

Author: artembilan

spring-amqp/src/main/java/org/springframework/amqp/utils/JavaUtils.java

@@ -136,4 +136,24 @@ public <T> JavaUtils acceptIfHasText(T t1, @Nullable String value, BiConsumer<T,
 		return this;
 	}
 
+
+	/**
+	 * Invoke {@link Consumer#accept(Object)} with the value or alternative if one of them is not null.
+	 * @param value the value.
+	 * @param alternative the other value if the {@code value} argument is null.
+	 * @param consumer the consumer.
+	 * @param <T> the value type.
+	 * @return this.
+	 * @since 4.0
+	 */
+	public <T> JavaUtils acceptOrElseIfNotNull(@Nullable T value, @Nullable T alternative, Consumer<T> consumer) {
+		if (value != null) {
+			consumer.accept(value);
+		}
+		else if (alternative != null) {
+			consumer.accept(alternative);
+		}
+		return this;
+	}
+
 }

spring-rabbitmq-client/src/main/java/org/springframework/amqp/rabbitmq/client/RabbitAmqpUtils.java

@@ -19,7 +19,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 
 import com.rabbitmq.client.amqp.Consumer;
@@ -88,20 +87,19 @@ public static void toAmqpMessage(Message message, com.rabbitmq.client.amqp.Messa
 				.contentEncoding(messageProperties.getContentEncoding())
 				.contentType(messageProperties.getContentType())
 				.messageId(messageProperties.getMessageId())
-				.correlationId(
-						Objects.requireNonNullElse(
-								messageProperties.getCorrelationId(), messageProperties.getMessageId()))
-				.priority(messageProperties.getPriority().byteValue())
-				.to(messageProperties.getReplyTo());
+				.priority(messageProperties.getPriority().byteValue());
 
 		Map<String, @Nullable Object> headers = messageProperties.getHeaders();
 		if (!headers.isEmpty()) {
 			headers.forEach((key, val) -> mapProp(key, val, amqpMessage));
 		}
 
 		JavaUtils.INSTANCE
+				.acceptOrElseIfNotNull(messageProperties.getCorrelationId(),
+						messageProperties.getMessageId(), amqpMessage::correlationId)
 				.acceptIfNotNull(messageProperties.getUserId(),
 						(userId) -> amqpMessage.userId(userId.getBytes(StandardCharsets.UTF_8)))
+				.acceptIfNotNull(messageProperties.getReplyTo(), amqpMessage::to)
 				.acceptIfNotNull(messageProperties.getTimestamp(),
 						(timestamp) -> amqpMessage.creationTime(timestamp.getTime()))
 				.acceptIfNotNull(messageProperties.getExpiration(),