spring-projects · ZaheerAhmadDev · Aug 16, 2026
diff --git a/...on-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java b/...on-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java
@@ -28,6 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.batch.BatchingStrategy;
 import org.springframework.amqp.rabbit.batch.SimpleBatchingStrategy;
@@ -195,7 +196,7 @@ public String getComponentType() {
 					resp.getEnvelope(), StandardCharsets.UTF_8.name());
 			messageProperties.setConsumerQueue(this.queue);
 			Map<String, @Nullable Object> headers = this.headerMapper.toHeadersFromRequest(messageProperties);
-			var amqpMessage = new org.springframework.amqp.core.Message(resp.getBody(), messageProperties);
+			var amqpMessage = new Message(resp.getBody(), messageProperties);
 			Object payload;
 			if (this.batchingStrategy.canDebatch(messageProperties)) {
 				List<Object> payloads = new ArrayList<>();

diff --git a/...va/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java b/...va/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java
@@ -43,6 +43,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.log.LogAccessor;
+import org.springframework.expression.Expression;
 import org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint;
 import org.springframework.integration.amqp.support.AmqpHeaderMapper;
 import org.springframework.integration.channel.DirectChannel;
@@ -118,7 +119,7 @@ public void withHeaderMapperCustomHeaders() {
 		AmqpOutboundEndpoint endpoint = TestUtils.getPropertyValue(eventDrivenConsumer, "handler");
 		assertThat(TestUtils.<Object>getPropertyValue(endpoint, "defaultDeliveryMode")).isNotNull();
 		assertThat(TestUtils.<Boolean>getPropertyValue(endpoint, "lazyConnect")).isFalse();
-		assertThat(TestUtils.<org.springframework.expression.Expression>getPropertyValue(endpoint, "delayExpression")
+		assertThat(TestUtils.<Expression>getPropertyValue(endpoint, "delayExpression")
 				.getExpressionString()).isEqualTo("42");
 		assertThat(TestUtils.<Boolean>getPropertyValue(endpoint, "headersMappedLast")).isFalse();
 

diff --git a/...test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java b/...test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java
@@ -32,6 +32,7 @@
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.expression.Expression;
 import org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint;
 import org.springframework.integration.amqp.outbound.AsyncAmqpOutboundGateway;
 import org.springframework.integration.channel.QueueChannel;
@@ -97,7 +98,7 @@ protected void checkGWProps(ApplicationContext context, Orderable gateway) {
 
 		assertThat(sendTimeout).isEqualTo(Long.valueOf(777));
 		assertThat(TestUtils.<Boolean>getPropertyValue(gateway, "lazyConnect")).isTrue();
-		assertThat(TestUtils.<org.springframework.expression.Expression>getPropertyValue(gateway, "delayExpression")
+		assertThat(TestUtils.<Expression>getPropertyValue(gateway, "delayExpression")
 				.getExpressionString()).isEqualTo("42");
 	}
 

diff --git a/...egration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpClientTests.java b/...egration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpClientTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.amqp.dsl;
 
+import com.rabbitmq.client.amqp.Environment;
 import com.rabbitmq.client.amqp.impl.AmqpEnvironmentBuilder;
 import org.junit.jupiter.api.Test;
 
@@ -94,7 +95,7 @@ void requestReplyOverAmqp() {
 	static class ContextConfiguration {
 
 		@Bean
-		com.rabbitmq.client.amqp.Environment environment() {
+		Environment environment() {
 			return new AmqpEnvironmentBuilder()
 					.connectionSettings()
 					.port(RabbitTestContainer.amqpPort())
@@ -103,7 +104,7 @@ com.rabbitmq.client.amqp.Environment environment() {
 		}
 
 		@Bean
-		AmqpConnectionFactory connectionFactory(com.rabbitmq.client.amqp.Environment environment) {
+		AmqpConnectionFactory connectionFactory(Environment environment) {
 			return new SingleAmqpConnectionFactory(environment);
 		}
 

diff --git a/...test/java/org/springframework/integration/amqp/inbound/AmqpClientInboundGatewayTests.java b/...test/java/org/springframework/integration/amqp/inbound/AmqpClientInboundGatewayTests.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.amqp.core.Declarables;
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbitmq.client.AmqpConnectionFactory;
@@ -72,7 +73,7 @@ void inboundGatewayExchange() {
 
 	@Test
 	void inboundGatewayExchangeWithAck() throws InterruptedException {
-		org.springframework.amqp.core.Message requestMessage =
+		Message requestMessage =
 				MessageBuilder.withBody("test data #2".getBytes())
 						.setMessageId("someMessageId")
 						.setContentType(MimeTypeUtils.TEXT_PLAIN_VALUE)

diff --git a/...-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java b/...-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java
@@ -37,7 +37,7 @@
  *
  * @since 6.0
  */
-public class CamelHeaderMapper implements HeaderMapper<org.apache.camel.Message> {
+public class CamelHeaderMapper implements HeaderMapper<Message> {
 
 	private static final LogAccessor LOGGER = new LogAccessor(CamelHeaderMapper.class);
 

diff --git a/...-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java b/...-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.util;
 
+import kotlin.coroutines.Continuation;
+import kotlinx.coroutines.reactor.MonoKt;
 import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Mono;
 
@@ -38,7 +40,7 @@ public static boolean isContinuation(Object candidate) {
 	}
 
 	public static boolean isContinuationType(Class<?> candidate) {
-		return KotlinDetector.isKotlinPresent() && kotlin.coroutines.Continuation.class.isAssignableFrom(candidate);
+		return KotlinDetector.isKotlinPresent() && Continuation.class.isAssignableFrom(candidate);
 	}
 
 	@Nullable
@@ -47,8 +49,8 @@ public static <T> T monoAwaitSingleOrNull(Mono<? extends T> source, Object conti
 		Assert.state(isContinuation(continuation), () ->
 				"The 'continuation' must be an instance of 'kotlin.coroutines.Continuation', but it is: "
 						+ continuation.getClass());
-		return (T) kotlinx.coroutines.reactor.MonoKt.awaitSingleOrNull(
-				source, (kotlin.coroutines.Continuation<T>) continuation);
+		return (T) MonoKt.awaitSingleOrNull(
+				source, (Continuation<T>) continuation);
 	}
 
 	private CoroutinesUtils() {

diff --git a/.../springframework/integration/grpc/outbound/GrpcClientOutboundGatewayMultiMethodTests.java b/.../springframework/integration/grpc/outbound/GrpcClientOutboundGatewayMultiMethodTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.grpc.outbound;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import io.grpc.ManagedChannel;
@@ -347,7 +348,7 @@ public void onCompleted() {
 			public StreamObserver<HelloRequest> helloToEveryOne(StreamObserver<HelloReply> responseObserver) {
 				return new StreamObserver<>() {
 
-					private final java.util.List<String> names = new java.util.ArrayList<>();
+					private final List<String> names = new ArrayList<>();
 
 					@Override
 					public void onNext(HelloRequest value) {

diff --git a/...amework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java b/...amework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java
@@ -32,6 +32,7 @@
 import com.hazelcast.multimap.MultiMap;
 import com.hazelcast.replicatedmap.ReplicatedMap;
 import com.hazelcast.topic.ITopic;
+import com.hazelcast.topic.Message;
 import com.hazelcast.topic.MessageListener;
 
 import org.springframework.integration.hazelcast.HazelcastIntegrationTestUser;
@@ -167,7 +168,7 @@ public static void testWriteToTopic(MessageChannel channel,
 				private int index = 1;
 
 				@Override
-				public void onMessage(com.hazelcast.topic.Message message) {
+				public void onMessage(Message message) {
 					HazelcastIntegrationTestUser user =
 							(HazelcastIntegrationTestUser) message.getMessageObject();
 					verifyHazelcastIntegrationTestUser(user, index);

diff --git a/...gration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/...gration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java
@@ -129,7 +129,7 @@ public void setOutboundPrefix(String outboundPrefix) {
 	}
 
 	@Override
-	public void fromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
+	public void fromHeaders(MessageHeaders headers, Message jmsMessage) {
 		try {
 			populateCorrelationIdPropertyFromHeaders(headers, jmsMessage);
 			populateReplyToPropertyFromHeaders(headers, jmsMessage);
@@ -154,7 +154,7 @@ public void fromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage)
 		}
 	}
 
-	private void populateCorrelationIdPropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
+	private void populateCorrelationIdPropertyFromHeaders(MessageHeaders headers, Message jmsMessage) {
 		Object jmsCorrelationId = headers.get(JmsHeaders.CORRELATION_ID);
 		if (jmsCorrelationId instanceof Number) {
 			jmsCorrelationId = jmsCorrelationId.toString();
@@ -169,7 +169,7 @@ private void populateCorrelationIdPropertyFromHeaders(MessageHeaders headers, ja
 		}
 	}
 
-	private void populateReplyToPropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
+	private void populateReplyToPropertyFromHeaders(MessageHeaders headers, Message jmsMessage) {
 		Object jmsReplyTo = headers.get(JmsHeaders.REPLY_TO);
 		if (jmsReplyTo instanceof Destination destination) {
 			try {
@@ -181,7 +181,7 @@ private void populateReplyToPropertyFromHeaders(MessageHeaders headers, jakarta.
 		}
 	}
 
-	private void populateTypePropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
+	private void populateTypePropertyFromHeaders(MessageHeaders headers, Message jmsMessage) {
 		Object jmsType = headers.get(JmsHeaders.TYPE);
 		if (jmsType instanceof String jmsTypeStr) {
 			try {
@@ -193,7 +193,7 @@ private void populateTypePropertyFromHeaders(MessageHeaders headers, jakarta.jms
 		}
 	}
 
-	private void populateArbitraryHeaderToProperty(jakarta.jms.Message jmsMessage, String headerName, Object value)
+	private void populateArbitraryHeaderToProperty(Message jmsMessage, String headerName, Object value)
 			throws JMSException {
 
 		if (SUPPORTED_PROPERTY_TYPES.contains(value.getClass())) {
@@ -221,7 +221,7 @@ else if (IntegrationMessageHeaderAccessor.CORRELATION_ID.equals(headerName)) {
 	}
 
 	@Override
-	public Map<String, Object> toHeaders(jakarta.jms.Message jmsMessage) {
+	public Map<String, Object> toHeaders(Message jmsMessage) {
 		Map<String, Object> headers = new HashMap<>();
 		try {
 			mapMessageIdProperty(jmsMessage, headers);

diff --git a/...test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java b/...test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java
@@ -19,6 +19,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import jakarta.jms.JMSException;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.TextMessage;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
@@ -240,7 +242,7 @@ private MessageHandler unwrapObjectMessageAndEchoHandler() {
 			template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			Message<?> origMessage = null;
 			try {
-				origMessage = (Message<?>) ((jakarta.jms.ObjectMessage) message.getPayload()).getObject();
+				origMessage = (Message<?>) ((ObjectMessage) message.getPayload()).getObject();
 			}
 			catch (JMSException e) {
 				fail("failed to deserialize message");
@@ -251,7 +253,7 @@ private MessageHandler unwrapObjectMessageAndEchoHandler() {
 
 	private MessageHandler unwrapTextMessageAndEchoHandler() {
 		return message -> {
-			assertThat(message.getPayload()).isInstanceOf(jakarta.jms.TextMessage.class);
+			assertThat(message.getPayload()).isInstanceOf(TextMessage.class);
 			MessagingTemplate template = new MessagingTemplate();
 			template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel());
 			String payload = null;

diff --git a/...on-jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java b/...on-jms/src/test/java/org/springframework/integration/jms/config/TestMessageConverter.java
@@ -34,7 +34,7 @@ public Object fromMessage(Message message) throws JMSException, MessageConversio
 		return "converted-" + original;
 	}
 
-	public jakarta.jms.Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
+	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		return null;
 	}
 

diff --git a/...est/java/org/springframework/integration/jms/outbound/OutboundGatewayConnectionTests.java b/...est/java/org/springframework/integration/jms/outbound/OutboundGatewayConnectionTests.java
@@ -24,6 +24,7 @@
 
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.Destination;
+import jakarta.jms.Message;
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
 import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
@@ -100,9 +101,9 @@ public void testContainerWithDestBrokenConnection() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(amqConnectionFactory);
 		template.setReceiveTimeout(5000);
-		jakarta.jms.Message request = template.receive(requestQueue1);
+		Message request = template.receive(requestQueue1);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
 		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(reply.get()).isNotNull();

diff --git a/.../test/java/org/springframework/integration/jms/outbound/OutboundGatewayFunctionTests.java b/.../test/java/org/springframework/integration/jms/outbound/OutboundGatewayFunctionTests.java
@@ -24,6 +24,7 @@
 
 import jakarta.jms.Destination;
 import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
 import org.junit.jupiter.api.Test;
 
@@ -104,9 +105,9 @@ public void testContainerWithDest() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue1);
+		Message request = template.receive(requestQueue1);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
 		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(reply.get()).isNotNull();
@@ -146,9 +147,9 @@ public void testContainerWithDestNoCorrelation() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue2);
+		Message request = template.receive(requestQueue2);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
@@ -192,9 +193,9 @@ public void testContainerWithDestName() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue3);
+		Message request = template.receive(requestQueue3);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
 		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(reply.get()).isNotNull();
@@ -234,9 +235,9 @@ public void testContainerWithDestNameNoCorrelation() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue4);
+		Message request = template.receive(requestQueue4);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
@@ -280,9 +281,9 @@ public void testContainerWithTemporary() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue5);
+		Message request = template.receive(requestQueue5);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> jmsReply);
 		assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue();
 		assertThat(reply.get()).isNotNull();
@@ -321,9 +322,9 @@ public void testContainerWithTemporaryNoCorrelation() throws Exception {
 		JmsTemplate template = new JmsTemplate();
 		template.setConnectionFactory(connectionFactory);
 		template.setReceiveTimeout(10000);
-		jakarta.jms.Message request = template.receive(requestQueue6);
+		Message request = template.receive(requestQueue6);
 		assertThat(request).isNotNull();
-		final jakarta.jms.Message jmsReply = request;
+		final Message jmsReply = request;
 		template.send(request.getJMSReplyTo(), session -> {
 			jmsReply.setJMSCorrelationID(jmsReply.getJMSMessageID());
 			return jmsReply;
@@ -379,8 +380,8 @@ public void testLazyContainerWithDest() throws Exception {
 	}
 
 	private static void receiveAndSend(JmsTemplate template) {
-		jakarta.jms.Message request = template.receive(requestQueue7);
-		final jakarta.jms.Message jmsReply = request;
+		Message request = template.receive(requestQueue7);
+		final Message jmsReply = request;
 		try {
 			template.send(request.getJMSReplyTo(), session -> jmsReply);
 		}

diff --git a/...gration-mail/src/main/java/org/springframework/integration/mail/inbound/MailReceiver.java b/...gration-mail/src/main/java/org/springframework/integration/mail/inbound/MailReceiver.java
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.mail.inbound;
 
+import jakarta.mail.MessagingException;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -29,6 +30,6 @@
  */
 public interface MailReceiver {
 
-	Object @Nullable [] receive() throws jakarta.mail.MessagingException;
+	Object @Nullable [] receive() throws MessagingException;
 
 }
diff --git a/...c/main/java/org/springframework/integration/mail/transformer/MailToStringTransformer.java b/...c/main/java/org/springframework/integration/mail/transformer/MailToStringTransformer.java
@@ -19,6 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.Charset;
 
+import jakarta.mail.Message;
 import jakarta.mail.Multipart;
 import jakarta.mail.Part;
 
@@ -52,7 +53,7 @@ public void setCharset(String charset) {
 	}
 
 	@Override
-	protected AbstractIntegrationMessageBuilder<String> doTransform(jakarta.mail.Message mailMessage) {
+	protected AbstractIntegrationMessageBuilder<String> doTransform(Message mailMessage) {
 		try {
 			String payload;
 			Object content = mailMessage.getContent();