Update to Spring Framework 7.0.0-RC1

This commit updates to Spring Framework and replaces deprecated
API usages.

Signed-off-by: onobc <[email protected]>

Author: onobc

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ micrometer-docs-gen = "1.0.4"
 micrometer-tracing = "1.6.0-RC1"
 protobuf = "3.25.8"
 pulsar = "4.1.1"
-spring = "7.0.0-M9"
+spring = "7.0.0-RC1"
 # tests
 assertj = "3.27.6"
 awaitility = "4.3.0"

spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java

@@ -77,8 +77,6 @@
 import org.springframework.pulsar.transaction.PulsarTransactionUtils;
 import org.springframework.scheduling.SchedulingAwareRunnable;
 import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -604,14 +602,10 @@ private Observation newObservation(Message<T> message) {
 		private void dispatchMessageToListenerInTxn(Message<T> message, AtomicBoolean inRetryMode) {
 			try {
 				requireNonNull(this.transactionTemplate, "transactionTemplate must not be null")
-					.execute(new TransactionCallbackWithoutResult() {
-						@Override
-						protected void doInTransactionWithoutResult(TransactionStatus status) {
-							RuntimeException aborted = dispatchMessageToListener(message, inRetryMode,
-									getTransaction());
-							if (aborted != null) {
-								throw aborted;
-							}
+					.executeWithoutResult((status) -> {
+						RuntimeException aborted = dispatchMessageToListener(message, inRetryMode, getTransaction());
+						if (aborted != null) {
+							throw aborted;
 						}
 					});
 			}

spring-pulsar/src/main/java/org/springframework/pulsar/listener/adapter/AbstractPulsarMessageToSpringMessageAdapter.java

@@ -28,11 +28,11 @@
 import org.apache.pulsar.client.api.Reader;
 import org.jspecify.annotations.Nullable;
 
-import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.expression.BeanResolver;
 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.messaging.converter.MessageConversionException;