More nullability for AmqpTemplate hierarchy

Author: artembilan

spring-amqp/src/main/java/org/springframework/amqp/core/AmqpTemplate.java

@@ -87,7 +87,7 @@ public interface AmqpTemplate {
 	 * @param message a message to send
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String routingKey, Object message) throws AmqpException;
+	void convertAndSend(@Nullable String routingKey, Object message) throws AmqpException;
 
 	/**
 	 * Convert a Java object to an Amqp {@link Message} and send it to a specific exchange
@@ -98,7 +98,7 @@ public interface AmqpTemplate {
 	 * @param message a message to send
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String exchange, String routingKey, Object message) throws AmqpException;
+	void convertAndSend(@Nullable String exchange, @Nullable String routingKey, Object message) throws AmqpException;
 
 	/**
 	 * Convert a Java object to an Amqp {@link Message} and send it to a default exchange
@@ -119,7 +119,7 @@ public interface AmqpTemplate {
 	 * @param messagePostProcessor a processor to apply to the message before it is sent
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String routingKey, Object message, MessagePostProcessor messagePostProcessor)
+	void convertAndSend(@Nullable String routingKey, Object message, MessagePostProcessor messagePostProcessor)
 			throws AmqpException;
 
 	/**
@@ -132,8 +132,8 @@ void convertAndSend(String routingKey, Object message, MessagePostProcessor mess
 	 * @param messagePostProcessor a processor to apply to the message before it is sent
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String exchange, String routingKey, Object message, MessagePostProcessor messagePostProcessor)
-			throws AmqpException;
+	void convertAndSend(@Nullable String exchange, @Nullable String routingKey, Object message,
+			MessagePostProcessor messagePostProcessor) throws AmqpException;
 
 	// receive methods for messages
 

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitOperations.java

@@ -115,7 +115,7 @@ public interface RabbitOperations extends AmqpTemplate, Lifecycle {
 	 * @throws AmqpException if there is a problem
 	 * @since 2.3
 	 */
-	default void send(String routingKey, Message message, CorrelationData correlationData)
+	default void send(@Nullable String routingKey, Message message, @Nullable CorrelationData correlationData)
 			throws AmqpException {
 
 		throw new UnsupportedOperationException("This implementation does not support this method");
@@ -130,13 +130,13 @@ default void send(String routingKey, Message message, CorrelationData correlatio
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void send(String exchange, String routingKey, Message message, @Nullable CorrelationData correlationData)
+	void send(@Nullable String exchange, @Nullable String routingKey, Message message,
+			@Nullable CorrelationData correlationData)
 			throws AmqpException;
 
 	/**
 	 * Convert a Java object to an Amqp {@link Message} and send it to a default exchange
 	 * with a default routing key.
-	 *
 	 * @param message a message to send
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
@@ -152,19 +152,20 @@ void send(String exchange, String routingKey, Message message, @Nullable Correla
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String routingKey, Object message, CorrelationData correlationData) throws AmqpException;
+	void convertAndSend(@Nullable String routingKey, Object message, @Nullable CorrelationData correlationData)
+			throws AmqpException;
 
 	/**
 	 * Convert a Java object to an Amqp {@link Message} and send it to a specific exchange
 	 * with a specific routing key.
-	 *
 	 * @param exchange the name of the exchange
 	 * @param routingKey the routing key
 	 * @param message a message to send
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String exchange, String routingKey, Object message, CorrelationData correlationData)
+	void convertAndSend(@Nullable String exchange, @Nullable String routingKey, Object message,
+			@Nullable CorrelationData correlationData)
 			throws AmqpException;
 
 	/**
@@ -176,7 +177,8 @@ void convertAndSend(String exchange, String routingKey, Object message, Correlat
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(Object message, MessagePostProcessor messagePostProcessor, CorrelationData correlationData)
+	void convertAndSend(Object message, MessagePostProcessor messagePostProcessor,
+			@Nullable CorrelationData correlationData)
 			throws AmqpException;
 
 	/**
@@ -189,36 +191,36 @@ void convertAndSend(Object message, MessagePostProcessor messagePostProcessor, C
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String routingKey, Object message, MessagePostProcessor messagePostProcessor,
-			CorrelationData correlationData) throws AmqpException;
+	void convertAndSend(@Nullable String routingKey, Object message, MessagePostProcessor messagePostProcessor,
+			@Nullable CorrelationData correlationData)
+			throws AmqpException;
 
 	/**
 	 * Convert a Java object to an Amqp {@link Message} and send it to a specific exchange
 	 * with a specific routing key.
-	 *
 	 * @param exchange the name of the exchange
 	 * @param routingKey the routing key
 	 * @param message a message to send
 	 * @param messagePostProcessor a processor to apply to the message before it is sent
 	 * @param correlationData data to correlate publisher confirms.
 	 * @throws AmqpException if there is a problem
 	 */
-	void convertAndSend(String exchange, String routingKey, Object message, MessagePostProcessor messagePostProcessor,
-			@Nullable CorrelationData correlationData) throws AmqpException;
+	void convertAndSend(@Nullable String exchange, @Nullable String routingKey, Object message,
+			MessagePostProcessor messagePostProcessor, @Nullable CorrelationData correlationData)
+			throws AmqpException;
 
 	/**
 	 * Basic RPC pattern with conversion. Send a Java object converted to a message to a
 	 * default exchange with a default routing key and attempt to receive a response,
 	 * converting that to a Java object. Implementations will normally set the reply-to
 	 * header to an exclusive queue and wait up for some time limited by a timeout.
-	 *
 	 * @param message a message to send.
 	 * @param correlationData data to correlate publisher confirms.
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
 	@Nullable
-	Object convertSendAndReceive(Object message, CorrelationData correlationData) throws AmqpException;
+	Object convertSendAndReceive(Object message, @Nullable CorrelationData correlationData) throws AmqpException;
 
 	/**
 	 * Basic RPC pattern with conversion. Send a Java object converted to a message to a
@@ -233,15 +235,14 @@ void convertAndSend(String exchange, String routingKey, Object message, MessageP
 	 * @throws AmqpException if there is a problem
 	 */
 	@Nullable
-	Object convertSendAndReceive(String routingKey, Object message, CorrelationData correlationData)
+	Object convertSendAndReceive(@Nullable String routingKey, Object message, @Nullable CorrelationData correlationData)
 			throws AmqpException;
 
 	/**
 	 * Basic RPC pattern with conversion. Send a Java object converted to a message to a
 	 * specific exchange with a specific routing key and attempt to receive a response,
 	 * converting that to a Java object. Implementations will normally set the reply-to
 	 * header to an exclusive queue and wait up for some time limited by a timeout.
-	 *
 	 * @param exchange the name of the exchange
 	 * @param routingKey the routing key
 	 * @param message a message to send
@@ -250,15 +251,14 @@ Object convertSendAndReceive(String routingKey, Object message, CorrelationData
 	 * @throws AmqpException if there is a problem
 	 */
 	@Nullable
-	Object convertSendAndReceive(String exchange, String routingKey, Object message,
-			CorrelationData correlationData) throws AmqpException;
+	Object convertSendAndReceive(@Nullable String exchange, @Nullable String routingKey, Object message,
+			@Nullable CorrelationData correlationData) throws AmqpException;
 
 	/**
 	 * Basic RPC pattern with conversion. Send a Java object converted to a message to a
 	 * default exchange with a default routing key and attempt to receive a response,
 	 * converting that to a Java object. Implementations will normally set the reply-to
 	 * header to an exclusive queue and wait up for some time limited by a timeout.
-	 *
 	 * @param message a message to send
 	 * @param messagePostProcessor a processor to apply to the message before it is sent
 	 * @param correlationData data to correlate publisher confirms.
@@ -274,7 +274,6 @@ Object convertSendAndReceive(Object message, MessagePostProcessor messagePostPro
 	 * default exchange with a specific routing key and attempt to receive a response,
 	 * converting that to a Java object. Implementations will normally set the reply-to
 	 * header to an exclusive queue and wait up for some time limited by a timeout.
-	 *
 	 * @param routingKey the routing key
 	 * @param message a message to send
 	 * @param messagePostProcessor a processor to apply to the message before it is sent
@@ -283,15 +282,15 @@ Object convertSendAndReceive(Object message, MessagePostProcessor messagePostPro
 	 * @throws AmqpException if there is a problem
 	 */
 	@Nullable
-	Object convertSendAndReceive(String routingKey, Object message,
-			MessagePostProcessor messagePostProcessor, @Nullable CorrelationData correlationData) throws AmqpException;
+	Object convertSendAndReceive(@Nullable String routingKey, Object message,
+			MessagePostProcessor messagePostProcessor, @Nullable CorrelationData correlationData)
+			throws AmqpException;
 
 	/**
 	 * Basic RPC pattern with conversion. Send a Java object converted to a message to a
 	 * specific exchange with a specific routing key and attempt to receive a response,
 	 * converting that to a Java object. Implementations will normally set the reply-to
 	 * header to an exclusive queue and wait up for some time limited by a timeout.
-	 *
 	 * @param exchange the name of the exchange
 	 * @param routingKey the routing key
 	 * @param message a message to send
@@ -301,7 +300,7 @@ Object convertSendAndReceive(String routingKey, Object message,
 	 * @throws AmqpException if there is a problem
 	 */
 	@Nullable
-	Object convertSendAndReceive(String exchange, String routingKey, Object message,
+	Object convertSendAndReceive(@Nullable String exchange, @Nullable String routingKey, Object message,
 			@Nullable MessagePostProcessor messagePostProcessor, @Nullable CorrelationData correlationData)
 			throws AmqpException;
 
@@ -339,7 +338,7 @@ Object convertSendAndReceive(String exchange, String routingKey, Object message,
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
-	<T> @Nullable T convertSendAndReceiveAsType(String routingKey, Object message,
+	<T> @Nullable T convertSendAndReceiveAsType(@Nullable String routingKey, Object message,
 			@Nullable CorrelationData correlationData, ParameterizedTypeReference<T> responseType) throws AmqpException;
 
 	/**
@@ -359,7 +358,7 @@ Object convertSendAndReceive(String exchange, String routingKey, Object message,
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
-	default <T> @Nullable T convertSendAndReceiveAsType(String exchange, String routingKey, Object message,
+	default <T> @Nullable T convertSendAndReceiveAsType(@Nullable String exchange, @Nullable String routingKey, Object message,
 			@Nullable CorrelationData correlationData, ParameterizedTypeReference<T> responseType)
 			throws AmqpException {
 
@@ -402,7 +401,7 @@ Object convertSendAndReceive(String exchange, String routingKey, Object message,
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
-	<T> @Nullable T convertSendAndReceiveAsType(String routingKey, Object message,
+	<T> @Nullable T convertSendAndReceiveAsType(@Nullable String routingKey, Object message,
 			@Nullable MessagePostProcessor messagePostProcessor, @Nullable CorrelationData correlationData,
 			ParameterizedTypeReference<T> responseType) throws AmqpException;
 
@@ -424,7 +423,7 @@ Object convertSendAndReceive(String exchange, String routingKey, Object message,
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
-	<T> @Nullable T convertSendAndReceiveAsType(String exchange, String routingKey, Object message,
+	<T> @Nullable T convertSendAndReceiveAsType(@Nullable String exchange, @Nullable String routingKey, Object message,
 			@Nullable MessagePostProcessor messagePostProcessor,
 			@Nullable CorrelationData correlationData,
 			ParameterizedTypeReference<T> responseType) throws AmqpException;