Fix Nullability according to SF changes

* Migrate from deprecated `org.springframework.context.expression.MapAccessor`
to a new `org.springframework.expression.spel.support.MapAccessor`

Author: artembilan

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/StatelessRetryOperationsInterceptor.java

@@ -54,7 +54,7 @@ public final class StatelessRetryOperationsInterceptor implements MethodIntercep
 	@Override
 	public @Nullable Object invoke(final MethodInvocation invocation) throws Throwable {
 		try {
-			return this.retryOperations.execute(invocation::proceed);
+			return this.retryOperations.<@Nullable Object>execute(invocation::proceed);
 		}
 		catch (RetryException ex) {
 			if (this.recoverer != null) {

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

@@ -27,7 +27,7 @@
  * @author Gary Russell
  */
 @FunctionalInterface
-public interface ChannelCallback<T> {
+public interface ChannelCallback<T extends @Nullable Object> {
 
 	/**
 	 * Execute any number of operations against the supplied RabbitMQ
@@ -37,7 +37,6 @@ public interface ChannelCallback<T> {
 	 * @return The result.
 	 * @throws Exception Not sure what else Rabbit Throws
 	 */
-	@Nullable
 	T doInRabbit(Channel channel) throws Exception; // NOSONAR user code might throw anything; cannot change
 
 }

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

@@ -234,7 +234,7 @@ public RabbitTemplate getRabbitTemplate() {
 	@Override
 	public void declareExchange(final Exchange exchange) {
 		try {
-			this.rabbitTemplate.execute(channel -> {
+			this.rabbitTemplate.<@Nullable Object>execute(channel -> {
 				declareExchanges(channel, exchange);
 				if (this.redeclareManualDeclarations) {
 					this.manualDeclarables.add(exchange);
@@ -301,7 +301,7 @@ private void removeExchangeBindings(final String exchangeName) {
 	@ManagedOperation(description = "Declare a queue on the broker (this operation is not available remotely)")
 	public @Nullable String declareQueue(final Queue queue) {
 		try {
-			return this.rabbitTemplate.execute(channel -> {
+			return this.rabbitTemplate.<@Nullable String>execute(channel -> {
 				DeclareOk[] declared = declareQueues(channel, queue);
 				String result = declared.length > 0 ? declared[0].getQueue() : null;
 				if (this.redeclareManualDeclarations) {
@@ -358,7 +358,7 @@ public boolean deleteQueue(final String queueName) {
 	@ManagedOperation(description =
 			"Delete a queue from the broker if unused and empty (when corresponding arguments are true")
 	public void deleteQueue(final String queueName, final boolean unused, final boolean empty) {
-		this.rabbitTemplate.execute(channel -> {
+		this.rabbitTemplate.<@Nullable Object>execute(channel -> {
 			channel.queueDelete(queueName, unused, empty);
 			removeQueueBindings(queueName);
 			return null;
@@ -412,7 +412,7 @@ public int purgeQueue(final String queueName) {
 	@ManagedOperation(description = "Declare a binding on the broker (this operation is not available remotely)")
 	public void declareBinding(final Binding binding) {
 		try {
-			this.rabbitTemplate.execute(channel -> {
+			this.rabbitTemplate.<@Nullable Object>execute(channel -> {
 				declareBindings(channel, binding);
 				if (this.redeclareManualDeclarations) {
 					this.manualDeclarables.add(binding);
@@ -428,7 +428,7 @@ public void declareBinding(final Binding binding) {
 	@Override
 	@ManagedOperation(description = "Remove a binding from the broker (this operation is not available remotely)")
 	public void removeBinding(final Binding binding) {
-		this.rabbitTemplate.execute(channel -> {
+		this.rabbitTemplate.<@Nullable Object>execute(channel -> {
 			if (binding.isDestinationQueue()) {
 				if (isRemovingImplicitQueueBinding(binding)) {
 					return null;
@@ -469,7 +469,7 @@ public void removeBinding(final Binding binding) {
 	@Override
 	public @Nullable QueueInformation getQueueInfo(String queueName) {
 		Assert.hasText(queueName, "'queueName' cannot be null or empty");
-		return this.rabbitTemplate.execute(channel -> {
+		return this.rabbitTemplate.<@Nullable QueueInformation>execute(channel -> {
 			try {
 				DeclareOk declareOk = channel.queueDeclarePassive(queueName);
 				return new QueueInformation(declareOk.getQueue(), declareOk.getMessageCount(),
@@ -627,7 +627,7 @@ public void afterPropertiesSet() {
 					 * declared for every connection. If anyone has a problem with it: use auto-startup="false".
 					 */
 					if (this.retryTemplate != null) {
-						this.retryTemplate.execute(() -> {
+						this.retryTemplate.<@Nullable Object>execute(() -> {
 							initialize();
 							return null;
 						});
@@ -712,7 +712,7 @@ private void redeclareBeanDeclarables() {
 			this.logger.debug("Nothing to declare");
 			return;
 		}
-		this.rabbitTemplate.execute(channel -> {
+		this.rabbitTemplate.<@Nullable Object>execute(channel -> {
 			declareExchanges(channel, exchanges.toArray(new Exchange[0]));
 			declareQueues(channel, queues.toArray(new Queue[0]));
 			declareBindings(channel, bindings.toArray(new Binding[0]));

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

@@ -45,7 +45,7 @@ public interface RabbitOperations extends AmqpTemplate, Lifecycle {
 	 * {@link ChannelCallback#doInRabbit(com.rabbitmq.client.Channel)}.
 	 * @throws AmqpException if one occurs.
 	 */
-	<T> @Nullable T execute(ChannelCallback<? extends @Nullable T> action) throws AmqpException;
+	<T extends @Nullable Object> T execute(ChannelCallback<T> action) throws AmqpException;
 
 	/**
 	 * Invoke the callback and run all operations on the template argument in a dedicated
@@ -57,7 +57,7 @@ public interface RabbitOperations extends AmqpTemplate, Lifecycle {
 	 * @throws AmqpException if one occurs.
 	 * @since 2.0
 	 */
-	default <T> @Nullable T invoke(OperationsCallback<? extends @Nullable T> action) throws AmqpException {
+	default <T extends @Nullable Object> T invoke(OperationsCallback<T> action) throws AmqpException {
 		return invoke(action, null, null);
 	}
 
@@ -71,7 +71,7 @@ public interface RabbitOperations extends AmqpTemplate, Lifecycle {
 	 * @return the result of the action method.
 	 * @since 2.1
 	 */
-	<T> @Nullable T invoke(OperationsCallback<? extends @Nullable T> action,
+	<T extends @Nullable Object> T invoke(OperationsCallback<T> action,
 			com.rabbitmq.client.@Nullable ConfirmCallback acks, com.rabbitmq.client.@Nullable ConfirmCallback nacks);
 
 	/**
@@ -358,8 +358,8 @@ Object convertSendAndReceive(@Nullable String exchange, @Nullable String routing
 	 * @return the response if there is one
 	 * @throws AmqpException if there is a problem
 	 */
-	default <T> @Nullable T convertSendAndReceiveAsType(@Nullable String exchange, @Nullable String routingKey, Object message,
-			@Nullable CorrelationData correlationData, ParameterizedTypeReference<T> responseType)
+	default <T> @Nullable T convertSendAndReceiveAsType(@Nullable String exchange, @Nullable String routingKey,
+			Object message, @Nullable CorrelationData correlationData, ParameterizedTypeReference<T> responseType)
 			throws AmqpException {
 
 		return convertSendAndReceiveAsType(exchange, routingKey, message, null, correlationData, responseType);
@@ -451,7 +451,7 @@ default boolean isRunning() {
 	 * @since 2.0
 	 */
 	@FunctionalInterface
-	interface OperationsCallback<T> {
+	interface OperationsCallback<T extends @Nullable Object> {
 
 		/**
 		 * Execute any number of operations using a dedicated
@@ -462,7 +462,6 @@ interface OperationsCallback<T> {
 		 * @param operations The operations.
 		 * @return The result.
 		 */
-		@Nullable
 		T doInRabbit(RabbitOperations operations);
 
 	}

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

@@ -107,13 +107,13 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.retry.RetryException;
 import org.springframework.core.retry.RetryTemplate;
 import org.springframework.core.retry.Retryable;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.MapAccessor;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.ErrorHandler;
@@ -1140,7 +1140,7 @@ public void send(@Nullable String exchange, @Nullable String routingKey,
 			final Message message, @Nullable CorrelationData correlationData)
 			throws AmqpException {
 
-		execute(channel -> {
+		this.<@Nullable Object>execute(channel -> {
 			doSend(channel, exchange, routingKey, message,
 					(RabbitTemplate.this.returnsCallback != null
 							|| (correlationData != null && StringUtils.hasText(correlationData.getId())))
@@ -1280,7 +1280,7 @@ public void convertAndSend(@Nullable String exchange, @Nullable String routingKe
 	 * @since 1.5
 	 */
 	protected @Nullable Message doReceiveNoWait(final String queueName) {
-		Message message = execute(channel -> {
+		Message message = this.<@Nullable Message>execute(channel -> {
 			GetResponse response = channel.basicGet(queueName, !isChannelTransacted());
 			// Response can be null is the case that there is no message on the queue.
 			if (response != null) {
@@ -1316,7 +1316,7 @@ else if (isChannelTransacted()) {
 
 	@Override
 	public @Nullable Message receive(final String queueName, final long timeoutMillis) {
-		Message message = execute(channel -> {
+		Message message = this.<@Nullable Message>execute(channel -> {
 			Delivery delivery = consumeDelivery(channel, queueName, timeoutMillis);
 			if (delivery == null) {
 				return null;
@@ -1918,7 +1918,7 @@ else if (this.replyAddress == null || this.usingFastReplyTo) {
 	protected @Nullable Message doSendAndReceiveWithTemporary(@Nullable String exchange, @Nullable String routingKey,
 			final Message message, @Nullable CorrelationData correlationData) {
 
-		return execute(channel -> {
+		return this.<@Nullable Message>execute(channel -> {
 			final PendingReply pendingReply = new PendingReply();
 			String messageTag = String.valueOf(RabbitTemplate.this.messageTagProvider.incrementAndGet());
 			RabbitTemplate.this.replyHolder.putIfAbsent(messageTag, pendingReply);
@@ -1995,7 +1995,7 @@ private void cancelConsumerQuietly(Channel channel, DefaultConsumer consumer) {
 
 		Assert.state(this.isListener, () -> "RabbitTemplate is not configured as MessageListener - "
 				+ "cannot use a 'replyAddress': " + this.replyAddress);
-		return execute(channel ->
+		return this.<@Nullable Message>execute(channel ->
 						doSendAndReceiveAsListener(exchange, routingKey, message, correlationData, channel, false),
 				obtainTargetConnectionFactory(this.sendConnectionFactorySelectorExpression, message));
 	}
@@ -2189,12 +2189,12 @@ public Boolean isMandatoryFor(final Message message) {
 	}
 
 	@Override
-	public <T> @Nullable T execute(ChannelCallback<? extends @Nullable T> action) {
+	public <T extends @Nullable Object> T execute(ChannelCallback<T> action) {
 		return execute(action, getConnectionFactory());
 	}
 
-	@SuppressWarnings(UNCHECKED)
-	private <T> @Nullable T execute(ChannelCallback<? extends @Nullable T> action,
+	@SuppressWarnings({UNCHECKED, "NullAway"})
+	private <T extends @Nullable Object> T execute(ChannelCallback<T> action,
 			ConnectionFactory connectionFactory) {
 
 		if (this.retryTemplate != null) {
@@ -2214,7 +2214,7 @@ public Boolean isMandatoryFor(final Message message) {
 		}
 	}
 
-	private <T> @Nullable T doExecute(ChannelCallback<? extends @Nullable T> action,
+	private <T extends @Nullable Object> T doExecute(ChannelCallback<T> action,
 			ConnectionFactory connectionFactory) {
 
 		Assert.notNull(action, "Callback object must not be null");
@@ -2279,7 +2279,7 @@ private void cleanUpAfterAction(@Nullable Channel channel, boolean invokeScope,
 		}
 	}
 
-	private <T> @Nullable T invokeAction(ChannelCallback<? extends @Nullable T> action,
+	private <T extends @Nullable Object> T invokeAction(ChannelCallback<T> action,
 			ConnectionFactory connectionFactory, Channel channel) throws Exception {
 
 		if (isPublisherConfirmsOrReturns(connectionFactory)) {
@@ -2294,7 +2294,7 @@ private void cleanUpAfterAction(@Nullable Channel channel, boolean invokeScope,
 	}
 
 	@Override
-	public <T> @Nullable T invoke(OperationsCallback<? extends @Nullable T> action,
+	public <T extends @Nullable Object> T invoke(OperationsCallback<T> action,
 			com.rabbitmq.client.@Nullable ConfirmCallback acks, com.rabbitmq.client.@Nullable ConfirmCallback nacks) {
 
 		final Channel currentChannel = this.dedicatedChannels.get();
@@ -2906,7 +2906,7 @@ public interface RecoveryCallback {
 
 		/**
 		 * Recover the exception that was thrown during the last attempt.
-		 * @param lastException the exception of the last attempt
+		 * @param lastException the exception from the last attempt
 		 * @return Object that can be used to replace the result {@link RabbitTemplate#execute(ChannelCallback)}
 		 */
 		@Nullable

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java

@@ -43,14 +43,14 @@
 import org.springframework.amqp.support.converter.MessageConversionException;
 import org.springframework.amqp.support.converter.MessageConverter;
 import org.springframework.amqp.support.converter.SimpleMessageConverter;
-import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.retry.RetryException;
 import org.springframework.core.retry.RetryTemplate;
 import org.springframework.expression.BeanResolver;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ParserContext;
 import org.springframework.expression.common.TemplateParserContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.MapAccessor;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.expression.spel.support.StandardTypeConverter;
 import org.springframework.util.Assert;
@@ -655,7 +655,7 @@ protected void sendResponse(@Nullable Channel channel, Address replyTo, Message
 			else {
 				final Message messageToSend = message;
 				try {
-					this.retryTemplate.execute(() -> {
+					this.retryTemplate.<@Nullable Object>execute(() -> {
 						doPublish(channel, replyTo, messageToSend);
 						return null;
 					});

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/RepublishMessageRecovererWithConfirms.java

@@ -159,7 +159,7 @@ private void doSendCorrelated(@Nullable String exchange, String routingKey, Mess
 	}
 
 	private void doSendSimple(@Nullable String exchange, String routingKey, Message message) {
-		this.template.invoke(sender -> {
+		this.template.<@Nullable Object>invoke(sender -> {
 			if (exchange != null) {
 				sender.send(exchange, routingKey, message);
 			}