Jakarta EE 9 migration

Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).

Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
This commit is contained in:
Juergen Hoeller
2021-09-17 09:14:07 +02:00
parent 5822f1bf85
commit d84ca2ba90
1291 changed files with 4992 additions and 25322 deletions

View File

@@ -16,10 +16,10 @@
package org.springframework.jca;
import javax.resource.ResourceException;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.InvalidPropertyException;
import javax.resource.spi.ResourceAdapter;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ActivationSpec;
import jakarta.resource.spi.InvalidPropertyException;
import jakarta.resource.spi.ResourceAdapter;
/**
* @author Juergen Hoeller

View File

@@ -16,14 +16,15 @@
package org.springframework.jca;
import javax.resource.ResourceException;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.BootstrapContext;
import javax.resource.spi.ResourceAdapter;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.transaction.xa.XAResource;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ActivationSpec;
import jakarta.resource.spi.BootstrapContext;
import jakarta.resource.spi.ResourceAdapter;
import jakarta.resource.spi.ResourceAdapterInternalException;
import jakarta.resource.spi.endpoint.MessageEndpointFactory;
/**
* @author Juergen Hoeller
*/

View File

@@ -16,10 +16,10 @@
package org.springframework.jms;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.JMSContext;
import javax.jms.JMSException;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.JMSContext;
import jakarta.jms.JMSException;
/**
* A stub implementation of the JMS ConnectionFactory for testing.

View File

@@ -16,10 +16,10 @@
package org.springframework.jms;
import javax.jms.Queue;
import jakarta.jms.Queue;
/**
* Stub implementation of the {@link javax.jms.Queue} interface.
* Stub implementation of the {@link jakarta.jms.Queue} interface.
*
* @author Rick Evans
*/

View File

@@ -19,9 +19,9 @@ package org.springframework.jms;
import java.util.Enumeration;
import java.util.concurrent.ConcurrentHashMap;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.TextMessage;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.TextMessage;
/**
* Stub JMS Message implementation intended for testing purposes only.

View File

@@ -16,7 +16,7 @@
package org.springframework.jms;
import javax.jms.Topic;
import jakarta.jms.Topic;
/**
* Stub implementation of the {@link Topic} interface.

View File

@@ -18,9 +18,8 @@ package org.springframework.jms.annotation;
import java.lang.reflect.Method;
import javax.jms.JMSException;
import javax.jms.Session;
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationContext;

View File

@@ -16,9 +16,8 @@
package org.springframework.jms.annotation;
import javax.jms.JMSException;
import javax.jms.MessageListener;
import jakarta.jms.JMSException;
import jakarta.jms.MessageListener;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationContext;

View File

@@ -19,9 +19,8 @@ package org.springframework.jms.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import javax.jms.JMSException;
import javax.jms.MessageListener;
import jakarta.jms.JMSException;
import jakarta.jms.MessageListener;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanCreationException;

View File

@@ -20,12 +20,11 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageListener;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -16,11 +16,10 @@
package org.springframework.jms.config;
import javax.jms.ConnectionFactory;
import javax.jms.MessageListener;
import javax.jms.Session;
import javax.transaction.TransactionManager;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.MessageListener;
import jakarta.jms.Session;
import jakarta.transaction.TransactionManager;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;

View File

@@ -16,8 +16,7 @@
package org.springframework.jms.config;
import javax.jms.MessageListener;
import jakarta.jms.MessageListener;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;

View File

@@ -21,11 +21,10 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.jms.ConnectionFactory;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.TextMessage;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Message;
import jakarta.jms.MessageListener;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -22,14 +22,13 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import javax.jms.Destination;
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.jms.QueueSender;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.Destination;
import jakarta.jms.InvalidDestinationException;
import jakarta.jms.JMSException;
import jakarta.jms.ObjectMessage;
import jakarta.jms.QueueSender;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
@@ -127,7 +126,7 @@ class MethodJmsListenerEndpointTests {
@Test
void resolveMessageAndSession() throws JMSException {
MessagingMessageListenerAdapter listener = createDefaultInstance(javax.jms.Message.class, Session.class);
MessagingMessageListenerAdapter listener = createDefaultInstance(jakarta.jms.Message.class, Session.class);
Session session = mock(Session.class);
listener.onMessage(createSimpleJmsTextMessage("test"), session);
@@ -521,7 +520,7 @@ class MethodJmsListenerEndpointTests {
private final Map<String, Boolean> invocations = new HashMap<>();
public void resolveMessageAndSession(javax.jms.Message message, Session session) {
public void resolveMessageAndSession(jakarta.jms.Message message, Session session) {
this.invocations.put("resolveMessageAndSession", true);
assertThat(message).as("Message not injected").isNotNull();
assertThat(session).as("Session not injected").isNotNull();

View File

@@ -16,8 +16,7 @@
package org.springframework.jms.config;
import javax.jms.MessageListener;
import jakarta.jms.MessageListener;
import org.junit.jupiter.api.Test;
import org.springframework.jms.listener.SimpleMessageListenerContainer;

View File

@@ -16,14 +16,13 @@
package org.springframework.jms.connection;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

View File

@@ -16,18 +16,17 @@
package org.springframework.jms.connection;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
import javax.jms.TopicSession;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
import jakarta.jms.QueueConnection;
import jakarta.jms.QueueConnectionFactory;
import jakarta.jms.QueueSession;
import jakarta.jms.Session;
import jakarta.jms.TopicConnection;
import jakarta.jms.TopicConnectionFactory;
import jakarta.jms.TopicSession;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -16,15 +16,15 @@
package org.springframework.jms.connection;
import javax.jms.Connection;
import javax.jms.ConnectionConsumer;
import javax.jms.ConnectionMetaData;
import javax.jms.Destination;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.ServerSessionPool;
import javax.jms.Session;
import javax.jms.Topic;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionConsumer;
import jakarta.jms.ConnectionMetaData;
import jakarta.jms.Destination;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
import jakarta.jms.ServerSessionPool;
import jakarta.jms.Session;
import jakarta.jms.Topic;
/**
* @author Juergen Hoeller

View File

@@ -16,8 +16,8 @@
package org.springframework.jms.connection;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
/**
* @author Juergen Hoeller

View File

@@ -20,13 +20,12 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageFormatException;
import javax.jms.MessageNotWriteableException;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.MessageFormatException;
import jakarta.jms.MessageNotWriteableException;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -237,7 +236,7 @@ public class JmsMessagingTemplateTests {
public void convertAndSendCustomJmsMessageConverter() throws JMSException {
this.messagingTemplate.setJmsMessageConverter(new SimpleMessageConverter() {
@Override
public javax.jms.Message toMessage(Object object, Session session)
public jakarta.jms.Message toMessage(Object object, Session session)
throws JMSException, org.springframework.jms.support.converter.MessageConversionException {
throw new org.springframework.jms.support.converter.MessageConversionException("Test exception");
}
@@ -275,7 +274,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receive() {
Destination destination = new Destination() {};
javax.jms.Message jmsMessage = createJmsTextMessage();
jakarta.jms.Message jmsMessage = createJmsTextMessage();
given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
Message<?> message = this.messagingTemplate.receive(destination);
@@ -285,7 +284,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveName() {
javax.jms.Message jmsMessage = createJmsTextMessage();
jakarta.jms.Message jmsMessage = createJmsTextMessage();
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
Message<?> message = this.messagingTemplate.receive("myQueue");
@@ -297,7 +296,7 @@ public class JmsMessagingTemplateTests {
public void receiveDefaultDestination() {
Destination destination = new Destination() {};
this.messagingTemplate.setDefaultDestination(destination);
javax.jms.Message jmsMessage = createJmsTextMessage();
jakarta.jms.Message jmsMessage = createJmsTextMessage();
given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
Message<?> message = this.messagingTemplate.receive();
@@ -308,7 +307,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveDefaultDestinationName() {
this.messagingTemplate.setDefaultDestinationName("myQueue");
javax.jms.Message jmsMessage = createJmsTextMessage();
jakarta.jms.Message jmsMessage = createJmsTextMessage();
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
Message<?> message = this.messagingTemplate.receive();
@@ -325,7 +324,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveAndConvert() {
Destination destination = new Destination() {};
javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
String payload = this.messagingTemplate.receiveAndConvert(destination, String.class);
@@ -335,7 +334,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveAndConvertName() {
javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
String payload = this.messagingTemplate.receiveAndConvert("myQueue", String.class);
@@ -347,7 +346,7 @@ public class JmsMessagingTemplateTests {
public void receiveAndConvertDefaultDestination() {
Destination destination = new Destination() {};
this.messagingTemplate.setDefaultDestination(destination);
javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
given(this.jmsTemplate.receive(destination)).willReturn(jmsMessage);
String payload = this.messagingTemplate.receiveAndConvert(String.class);
@@ -358,7 +357,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveAndConvertDefaultDestinationName() {
this.messagingTemplate.setDefaultDestinationName("myQueue");
javax.jms.Message jmsMessage = createJmsTextMessage("my Payload");
jakarta.jms.Message jmsMessage = createJmsTextMessage("my Payload");
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
String payload = this.messagingTemplate.receiveAndConvert(String.class);
@@ -368,7 +367,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveAndConvertWithConversion() {
javax.jms.Message jmsMessage = createJmsTextMessage("123");
jakarta.jms.Message jmsMessage = createJmsTextMessage("123");
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
this.messagingTemplate.setMessageConverter(new GenericMessageConverter());
@@ -380,7 +379,7 @@ public class JmsMessagingTemplateTests {
@Test
public void receiveAndConvertNoConverter() {
javax.jms.Message jmsMessage = createJmsTextMessage("Hello");
jakarta.jms.Message jmsMessage = createJmsTextMessage("Hello");
given(this.jmsTemplate.receive("myQueue")).willReturn(jmsMessage);
assertThatExceptionOfType(org.springframework.messaging.converter.MessageConversionException.class).isThrownBy(() ->
@@ -398,7 +397,7 @@ public class JmsMessagingTemplateTests {
public void sendAndReceive() {
Destination destination = new Destination() {};
Message<String> request = createTextMessage();
javax.jms.Message replyJmsMessage = createJmsTextMessage();
jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
Message<?> actual = this.messagingTemplate.sendAndReceive(destination, request);
@@ -409,7 +408,7 @@ public class JmsMessagingTemplateTests {
@Test
public void sendAndReceiveName() {
Message<String> request = createTextMessage();
javax.jms.Message replyJmsMessage = createJmsTextMessage();
jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
Message<?> actual = this.messagingTemplate.sendAndReceive("myQueue", request);
@@ -422,7 +421,7 @@ public class JmsMessagingTemplateTests {
Destination destination = new Destination() {};
this.messagingTemplate.setDefaultDestination(destination);
Message<String> request = createTextMessage();
javax.jms.Message replyJmsMessage = createJmsTextMessage();
jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
Message<?> actual = this.messagingTemplate.sendAndReceive(request);
@@ -434,7 +433,7 @@ public class JmsMessagingTemplateTests {
public void sendAndReceiveDefaultDestinationName() {
this.messagingTemplate.setDefaultDestinationName("myQueue");
Message<String> request = createTextMessage();
javax.jms.Message replyJmsMessage = createJmsTextMessage();
jakarta.jms.Message replyJmsMessage = createJmsTextMessage();
given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
Message<?> actual = this.messagingTemplate.sendAndReceive(request);
@@ -453,7 +452,7 @@ public class JmsMessagingTemplateTests {
@Test
public void convertSendAndReceivePayload() throws JMSException {
Destination destination = new Destination() {};
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
String reply = this.messagingTemplate.convertSendAndReceive(destination, "my Payload", String.class);
@@ -463,7 +462,7 @@ public class JmsMessagingTemplateTests {
@Test
public void convertSendAndReceivePayloadName() throws JMSException {
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
String reply = this.messagingTemplate.convertSendAndReceive("myQueue", "my Payload", String.class);
@@ -475,7 +474,7 @@ public class JmsMessagingTemplateTests {
public void convertSendAndReceiveDefaultDestination() throws JMSException {
Destination destination = new Destination() {};
this.messagingTemplate.setDefaultDestination(destination);
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
given(this.jmsTemplate.sendAndReceive(eq(destination), any())).willReturn(replyJmsMessage);
String reply = this.messagingTemplate.convertSendAndReceive("my Payload", String.class);
@@ -486,7 +485,7 @@ public class JmsMessagingTemplateTests {
@Test
public void convertSendAndReceiveDefaultDestinationName() throws JMSException {
this.messagingTemplate.setDefaultDestinationName("myQueue");
javax.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
jakarta.jms.Message replyJmsMessage = createJmsTextMessage("My reply");
given(this.jmsTemplate.sendAndReceive(eq("myQueue"), any())).willReturn(replyJmsMessage);
String reply = this.messagingTemplate.convertSendAndReceive("my Payload", String.class);
@@ -515,7 +514,7 @@ public class JmsMessagingTemplateTests {
@Test
public void convertMessageConversionExceptionOnReceive() throws JMSException {
javax.jms.Message message = createJmsTextMessage();
jakarta.jms.Message message = createJmsTextMessage();
MessageConverter messageConverter = mock(MessageConverter.class);
willThrow(org.springframework.jms.support.converter.MessageConversionException.class)
.given(messageConverter).fromMessage(message);
@@ -611,7 +610,7 @@ public class JmsMessagingTemplateTests {
return createTextMessage("Hello");
}
private javax.jms.Message createJmsTextMessage(String payload) {
private jakarta.jms.Message createJmsTextMessage(String payload) {
try {
StubTextMessage jmsMessage = new StubTextMessage(payload);
jmsMessage.setStringProperty("foo", "bar");
@@ -622,7 +621,7 @@ public class JmsMessagingTemplateTests {
}
}
private javax.jms.Message createJmsTextMessage() {
private jakarta.jms.Message createJmsTextMessage() {
return createJmsTextMessage("Hello");
}
@@ -650,7 +649,7 @@ public class JmsMessagingTemplateTests {
given(mock.createTextMessage(any())).willAnswer(
(Answer<TextMessage>) invocation ->
new StubTextMessage((String) invocation.getArguments()[0]));
javax.jms.Message message = creator.createMessage(mock);
jakarta.jms.Message message = creator.createMessage(mock);
verify(mock).createTextMessage(any());
return (TextMessage) message;
}

View File

@@ -20,20 +20,20 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TextMessage;
import javax.naming.Context;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.DeliveryMode;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import jakarta.jms.TemporaryQueue;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -721,67 +721,67 @@ class JmsTemplateTests {
@Test
void testIllegalStateException() throws Exception {
doTestJmsException(new javax.jms.IllegalStateException(""), org.springframework.jms.IllegalStateException.class);
doTestJmsException(new jakarta.jms.IllegalStateException(""), org.springframework.jms.IllegalStateException.class);
}
@Test
void testInvalidClientIDException() throws Exception {
doTestJmsException(new javax.jms.InvalidClientIDException(""), InvalidClientIDException.class);
doTestJmsException(new jakarta.jms.InvalidClientIDException(""), InvalidClientIDException.class);
}
@Test
void testInvalidDestinationException() throws Exception {
doTestJmsException(new javax.jms.InvalidDestinationException(""), InvalidDestinationException.class);
doTestJmsException(new jakarta.jms.InvalidDestinationException(""), InvalidDestinationException.class);
}
@Test
void testInvalidSelectorException() throws Exception {
doTestJmsException(new javax.jms.InvalidSelectorException(""), InvalidSelectorException.class);
doTestJmsException(new jakarta.jms.InvalidSelectorException(""), InvalidSelectorException.class);
}
@Test
void testJmsSecurityException() throws Exception {
doTestJmsException(new javax.jms.JMSSecurityException(""), JmsSecurityException.class);
doTestJmsException(new jakarta.jms.JMSSecurityException(""), JmsSecurityException.class);
}
@Test
void testMessageEOFException() throws Exception {
doTestJmsException(new javax.jms.MessageEOFException(""), MessageEOFException.class);
doTestJmsException(new jakarta.jms.MessageEOFException(""), MessageEOFException.class);
}
@Test
void testMessageFormatException() throws Exception {
doTestJmsException(new javax.jms.MessageFormatException(""), MessageFormatException.class);
doTestJmsException(new jakarta.jms.MessageFormatException(""), MessageFormatException.class);
}
@Test
void testMessageNotReadableException() throws Exception {
doTestJmsException(new javax.jms.MessageNotReadableException(""), MessageNotReadableException.class);
doTestJmsException(new jakarta.jms.MessageNotReadableException(""), MessageNotReadableException.class);
}
@Test
void testMessageNotWriteableException() throws Exception {
doTestJmsException(new javax.jms.MessageNotWriteableException(""), MessageNotWriteableException.class);
doTestJmsException(new jakarta.jms.MessageNotWriteableException(""), MessageNotWriteableException.class);
}
@Test
void testResourceAllocationException() throws Exception {
doTestJmsException(new javax.jms.ResourceAllocationException(""), ResourceAllocationException.class);
doTestJmsException(new jakarta.jms.ResourceAllocationException(""), ResourceAllocationException.class);
}
@Test
void testTransactionInProgressException() throws Exception {
doTestJmsException(new javax.jms.TransactionInProgressException(""), TransactionInProgressException.class);
doTestJmsException(new jakarta.jms.TransactionInProgressException(""), TransactionInProgressException.class);
}
@Test
void testTransactionRolledBackException() throws Exception {
doTestJmsException(new javax.jms.TransactionRolledBackException(""), TransactionRolledBackException.class);
doTestJmsException(new jakarta.jms.TransactionRolledBackException(""), TransactionRolledBackException.class);
}
@Test
void testUncategorizedJmsException() throws Exception {
doTestJmsException(new javax.jms.JMSException(""), UncategorizedJmsException.class);
doTestJmsException(new jakarta.jms.JMSException(""), UncategorizedJmsException.class);
}
protected void doTestJmsException(JMSException original, Class<? extends JmsException> thrownExceptionClass) throws Exception {

View File

@@ -16,8 +16,7 @@
package org.springframework.jms.core;
import javax.jms.Session;
import jakarta.jms.Session;
import org.junit.jupiter.api.BeforeEach;
import static org.mockito.BDDMockito.given;

View File

@@ -18,8 +18,7 @@ package org.springframework.jms.core.support;
import java.util.ArrayList;
import java.util.List;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.junit.jupiter.api.Test;
import org.springframework.jms.core.JmsTemplate;

View File

@@ -19,11 +19,10 @@ package org.springframework.jms.listener;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import org.junit.jupiter.api.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;

View File

@@ -1,119 +0,0 @@
/*
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.jms.listener;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.jms.JMSException;
import javax.jms.Session;
import javax.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.junit.jupiter.api.Test;
import org.springframework.jms.core.JmsTemplate;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Juergen Hoeller
* @since 5.3.5
*/
public class MessageListenerContainerIntegrationTests {
@Test
public void simpleMessageListenerContainer() throws InterruptedException {
SimpleMessageListenerContainer mlc = new SimpleMessageListenerContainer();
testMessageListenerContainer(mlc);
}
@Test
public void defaultMessageListenerContainer() throws InterruptedException {
DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
testMessageListenerContainer(mlc);
}
@Test
public void defaultMessageListenerContainerWithMaxMessagesPerTask() throws InterruptedException {
DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
mlc.setConcurrentConsumers(1);
mlc.setMaxConcurrentConsumers(2);
mlc.setMaxMessagesPerTask(1);
testMessageListenerContainer(mlc);
}
@Test
public void defaultMessageListenerContainerWithIdleReceivesPerTaskLimit() throws InterruptedException {
DefaultMessageListenerContainer mlc = new DefaultMessageListenerContainer();
mlc.setConcurrentConsumers(1);
mlc.setMaxConcurrentConsumers(2);
mlc.setIdleReceivesPerTaskLimit(1);
testMessageListenerContainer(mlc);
}
private void testMessageListenerContainer(AbstractMessageListenerContainer mlc) throws InterruptedException {
ActiveMQConnectionFactory aqcf = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
TestMessageListener tml = new TestMessageListener();
mlc.setConnectionFactory(aqcf);
mlc.setMessageListener(tml);
mlc.setDestinationName("test");
mlc.afterPropertiesSet();
mlc.start();
JmsTemplate jt = new JmsTemplate(aqcf);
jt.setDefaultDestinationName("test");
Set<String> messages = new HashSet<>();
messages.add("text1");
messages.add("text2");
for (String message : messages) {
jt.convertAndSend(message);
}
assertThat(tml.result()).isEqualTo(messages);
mlc.destroy();
}
private static class TestMessageListener implements SessionAwareMessageListener<TextMessage> {
private final CountDownLatch latch = new CountDownLatch(2);
private final Set<String> messages = new CopyOnWriteArraySet<>();
@Override
public void onMessage(TextMessage message, Session session) throws JMSException {
this.messages.add(message.getText());
this.latch.countDown();
}
public Set<String> result() throws InterruptedException {
assertThat(this.latch.await(5, TimeUnit.SECONDS)).isTrue();
return this.messages;
}
}
}

View File

@@ -19,15 +19,14 @@ package org.springframework.jms.listener;
import java.util.HashSet;
import java.util.Set;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.Session;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageListener;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.GenericApplicationContext;

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
package org.springframework.jms.listener.adapter;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Session;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import org.springframework.jms.support.destination.DestinationResolver;
@@ -54,7 +53,7 @@ public class JmsResponseTests {
}
@Test
public void createWithNulResponse() {
public void createWithNullResponse() {
assertThatIllegalArgumentException().isThrownBy(() ->
JmsResponse.forQueue(null, "myQueue"));
}

View File

@@ -16,10 +16,10 @@
package org.springframework.jms.listener.adapter;
import javax.jms.BytesMessage;
import javax.jms.MapMessage;
import javax.jms.ObjectMessage;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.MapMessage;
import jakarta.jms.ObjectMessage;
import jakarta.jms.TextMessage;
/**
* See the MessageListenerAdapterTests class for usage.

View File

@@ -19,18 +19,17 @@ package org.springframework.jms.listener.adapter;
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import javax.jms.BytesMessage;
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.InvalidDestinationException;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.MessageProducer;
import jakarta.jms.ObjectMessage;
import jakarta.jms.Queue;
import jakarta.jms.QueueSender;
import jakarta.jms.QueueSession;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;

View File

@@ -20,16 +20,15 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
import com.fasterxml.jackson.annotation.JsonView;
import jakarta.jms.DeliveryMode;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import jakarta.jms.Topic;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -85,7 +84,7 @@ public class MessagingMessageListenerAdapterTests {
Session session = mock(Session.class);
given(session.createTextMessage("Response")).willReturn(new StubTextMessage("Response"));
MessagingMessageListenerAdapter listener = getSimpleInstance("echo", Message.class);
javax.jms.Message replyMessage = listener.buildMessage(session, result);
jakarta.jms.Message replyMessage = listener.buildMessage(session, result);
verify(session).createTextMessage("Response");
assertThat(replyMessage).as("reply should never be null").isNotNull();
@@ -97,7 +96,7 @@ public class MessagingMessageListenerAdapterTests {
@Test
public void exceptionInListener() {
javax.jms.Message message = new StubTextMessage("foo");
jakarta.jms.Message message = new StubTextMessage("foo");
Session session = mock(Session.class);
MessagingMessageListenerAdapter listener = getSimpleInstance("fail", String.class);
assertThatExceptionOfType(ListenerExecutionFailedException.class)
@@ -109,7 +108,7 @@ public class MessagingMessageListenerAdapterTests {
@Test
public void exceptionInInvocation() {
javax.jms.Message message = new StubTextMessage("foo");
jakarta.jms.Message message = new StubTextMessage("foo");
Session session = mock(Session.class);
MessagingMessageListenerAdapter listener = getSimpleInstance("wrongParam", Integer.class);
@@ -120,7 +119,7 @@ public class MessagingMessageListenerAdapterTests {
@Test
public void payloadConversionLazilyInvoked() throws JMSException {
javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
MessageConverter messageConverter = mock(MessageConverter.class);
given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar");
MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class);
@@ -133,7 +132,7 @@ public class MessagingMessageListenerAdapterTests {
@Test
public void headerConversionLazilyInvoked() throws JMSException {
javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
given(jmsMessage.getPropertyNames()).willThrow(new IllegalArgumentException("Header failure"));
MessagingMessageListenerAdapter listener = getSimpleInstance("simple", Message.class);
Message<?> message = listener.toMessagingMessage(jmsMessage);
@@ -146,7 +145,7 @@ public class MessagingMessageListenerAdapterTests {
@Test
public void incomingMessageUsesMessageConverter() throws JMSException {
javax.jms.Message jmsMessage = mock(javax.jms.Message.class);
jakarta.jms.Message jmsMessage = mock(jakarta.jms.Message.class);
Session session = mock(Session.class);
MessageConverter messageConverter = mock(MessageConverter.class);
given(messageConverter.fromMessage(jmsMessage)).willReturn("FooBar");
@@ -167,7 +166,7 @@ public class MessagingMessageListenerAdapterTests {
Message<String> result = MessageBuilder.withPayload("Response").build();
MessagingMessageListenerAdapter listener = getSimpleInstance("echo", Message.class);
listener.setMessageConverter(messageConverter);
javax.jms.Message replyMessage = listener.buildMessage(session, result);
jakarta.jms.Message replyMessage = listener.buildMessage(session, result);
verify(messageConverter, times(1)).toMessage("Response", session);
assertThat(replyMessage).as("reply should never be null").isNotNull();
@@ -186,7 +185,7 @@ public class MessagingMessageListenerAdapterTests {
given(session.createProducer(replyDestination)).willReturn(messageProducer);
MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session).createQueue("queueOut");
verify(session).createTextMessage("Response");
@@ -209,11 +208,11 @@ public class MessagingMessageListenerAdapterTests {
QosSettings settings = new QosSettings();
settings.setTimeToLive(6000);
listener.setResponseQosSettings(settings);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session).createQueue("queueOut");
verify(session).createTextMessage("Response");
verify(messageProducer).send(responseMessage, javax.jms.Message.DEFAULT_DELIVERY_MODE,
javax.jms.Message.DEFAULT_PRIORITY, 6000);
verify(messageProducer).send(responseMessage, jakarta.jms.Message.DEFAULT_DELIVERY_MODE,
jakarta.jms.Message.DEFAULT_PRIORITY, 6000);
verify(messageProducer).close();
}
@@ -231,7 +230,7 @@ public class MessagingMessageListenerAdapterTests {
MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToQueue", Message.class);
QosSettings settings = new QosSettings(DeliveryMode.NON_PERSISTENT, 6, 6000);
listener.setResponseQosSettings(settings);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session).createQueue("queueOut");
verify(session).createTextMessage("Response");
verify(messageProducer).send(responseMessage, DeliveryMode.NON_PERSISTENT, 6, 6000);
@@ -250,7 +249,7 @@ public class MessagingMessageListenerAdapterTests {
given(session.createProducer(replyDestination)).willReturn(messageProducer);
MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToTopic", Message.class);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session).createTopic("topicOut");
verify(session).createTextMessage("Response");
@@ -267,7 +266,7 @@ public class MessagingMessageListenerAdapterTests {
given(session.createProducer(sharedReplyDestination)).willReturn(messageProducer);
MessagingMessageListenerAdapter listener = getPayloadInstance("Response", "replyPayloadToDestination", Message.class);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session, times(0)).createQueue(anyString());
verify(session).createTextMessage("Response");
@@ -288,7 +287,7 @@ public class MessagingMessageListenerAdapterTests {
MessagingMessageListenerAdapter listener =
getPayloadInstance("Response", "replyPayloadNoDestination", Message.class);
listener.setDefaultResponseDestination(replyDestination);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session, times(0)).createQueue(anyString());
verify(session).createTextMessage("Response");
@@ -331,7 +330,7 @@ public class MessagingMessageListenerAdapterTests {
messageConverter.setTargetType(MessageType.TEXT);
listener.setMessageConverter(messageConverter);
listener.setDefaultResponseDestination(replyDestination);
listener.onMessage(mock(javax.jms.Message.class), session);
listener.onMessage(mock(jakarta.jms.Message.class), session);
verify(session, times(0)).createQueue(anyString());
verify(session).createTextMessage(replyContent);
@@ -358,7 +357,7 @@ public class MessagingMessageListenerAdapterTests {
Method method = ReflectionUtils.findMethod(SampleBean.class, methodName, parameterTypes);
MessagingMessageListenerAdapter adapter = new MessagingMessageListenerAdapter() {
@Override
protected Object extractMessage(javax.jms.Message message) {
protected Object extractMessage(jakarta.jms.Message message) {
return payload;
}
};

View File

@@ -16,7 +16,7 @@
package org.springframework.jms.listener.adapter;
import javax.jms.TextMessage;
import jakarta.jms.TextMessage;
/**
* See the MessageListenerAdapterTests class for usage.

View File

@@ -19,10 +19,10 @@ package org.springframework.jms.listener.adapter;
import java.io.Serializable;
import java.util.Map;
import javax.jms.BytesMessage;
import javax.jms.MapMessage;
import javax.jms.ObjectMessage;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.MapMessage;
import jakarta.jms.ObjectMessage;
import jakarta.jms.TextMessage;
/**
* See the MessageListenerAdapterTests class for usage.

View File

@@ -16,9 +16,8 @@
package org.springframework.jms.listener.endpoint;
import javax.jms.Destination;
import javax.jms.Session;
import jakarta.jms.Destination;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import org.springframework.jca.StubResourceAdapter;

View File

@@ -16,7 +16,7 @@
package org.springframework.jms.listener.endpoint;
import javax.jms.Destination;
import jakarta.jms.Destination;
import org.springframework.jca.StubActivationSpec;

View File

@@ -16,8 +16,8 @@
package org.springframework.jms.listener.endpoint;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.ResourceAdapter;
import jakarta.resource.spi.ActivationSpec;
import jakarta.resource.spi.ResourceAdapter;
import org.springframework.jca.StubActivationSpec;

View File

@@ -16,8 +16,7 @@
package org.springframework.jms.support;
import javax.jms.Session;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -18,9 +18,8 @@ package org.springframework.jms.support;
import java.util.Map;
import javax.jms.Destination;
import javax.jms.JMSException;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import org.junit.jupiter.api.Test;
import org.springframework.jms.StubTextMessage;

View File

@@ -19,10 +19,9 @@ package org.springframework.jms.support;
import java.util.Date;
import java.util.Map;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import jakarta.jms.DeliveryMode;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import org.junit.jupiter.api.Test;
import org.springframework.jms.StubTextMessage;
@@ -51,7 +50,7 @@ public class SimpleJmsHeaderMapperTests {
Message<String> message = initBuilder()
.setHeader(JmsHeaders.REPLY_TO, replyTo).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSReplyTo()).isNotNull();
assertThat(jmsMessage.getJMSReplyTo()).isSameAs(replyTo);
@@ -61,7 +60,7 @@ public class SimpleJmsHeaderMapperTests {
public void JmsReplyToIgnoredIfIncorrectType() throws JMSException {
Message<String> message = initBuilder()
.setHeader(JmsHeaders.REPLY_TO, "not-a-destination").build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSReplyTo()).isNull();
}
@@ -71,7 +70,7 @@ public class SimpleJmsHeaderMapperTests {
String jmsCorrelationId = "ABC-123";
Message<String> message = initBuilder()
.setHeader(JmsHeaders.CORRELATION_ID, jmsCorrelationId).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSCorrelationID()).isNotNull();
assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo(jmsCorrelationId);
@@ -81,7 +80,7 @@ public class SimpleJmsHeaderMapperTests {
public void jmsCorrelationIdNumberConvertsToString() throws JMSException {
Message<String> message = initBuilder()
.setHeader(JmsHeaders.CORRELATION_ID, 123).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSCorrelationID()).isEqualTo("123");
}
@@ -90,7 +89,7 @@ public class SimpleJmsHeaderMapperTests {
public void jmsCorrelationIdIgnoredIfIncorrectType() throws JMSException {
Message<String> message = initBuilder()
.setHeader(JmsHeaders.CORRELATION_ID, new Date()).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSCorrelationID()).isNull();
}
@@ -100,7 +99,7 @@ public class SimpleJmsHeaderMapperTests {
String jmsType = "testing";
Message<String> message = initBuilder()
.setHeader(JmsHeaders.TYPE, jmsType).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSType()).isNotNull();
assertThat(jmsMessage.getJMSType()).isEqualTo(jmsType);
@@ -110,7 +109,7 @@ public class SimpleJmsHeaderMapperTests {
public void jmsTypeIgnoredIfIncorrectType() throws JMSException {
Message<String> message = initBuilder()
.setHeader(JmsHeaders.TYPE, 123).build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSType()).isNull();
}
@@ -126,13 +125,13 @@ public class SimpleJmsHeaderMapperTests {
.setHeader(JmsHeaders.REDELIVERED, true)
.setHeader(JmsHeaders.TIMESTAMP, System.currentTimeMillis())
.build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
assertThat(jmsMessage.getJMSDestination()).isNull();
assertThat(jmsMessage.getJMSDeliveryMode()).isEqualTo(DeliveryMode.PERSISTENT);
assertThat(jmsMessage.getJMSExpiration()).isEqualTo(0);
assertThat(jmsMessage.getJMSMessageID()).isNull();
assertThat(jmsMessage.getJMSPriority()).isEqualTo(javax.jms.Message.DEFAULT_PRIORITY);
assertThat(jmsMessage.getJMSPriority()).isEqualTo(jakarta.jms.Message.DEFAULT_PRIORITY);
assertThat(jmsMessage.getJMSRedelivered()).isFalse();
assertThat(jmsMessage.getJMSTimestamp()).isEqualTo(0);
}
@@ -142,7 +141,7 @@ public class SimpleJmsHeaderMapperTests {
Message<String> message = initBuilder()
.setHeader(MessageHeaders.CONTENT_TYPE, "foo")
.build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
Object value = jmsMessage.getObjectProperty(JmsHeaderMapper.CONTENT_TYPE_PROPERTY);
assertThat(value).isNotNull();
@@ -154,7 +153,7 @@ public class SimpleJmsHeaderMapperTests {
Message<String> message = initBuilder()
.setHeader("foo", 123)
.build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
Object value = jmsMessage.getObjectProperty("foo");
assertThat(value).isNotNull();
@@ -168,7 +167,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader("foo", 123)
.build();
mapper.setOutboundPrefix("custom_");
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
Object value = jmsMessage.getObjectProperty("custom_foo");
assertThat(value).isNotNull();
@@ -182,7 +181,7 @@ public class SimpleJmsHeaderMapperTests {
Message<String> message = initBuilder()
.setHeader("destination", destination)
.build();
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
mapper.fromHeaders(message.getHeaders(), jmsMessage);
Object value = jmsMessage.getObjectProperty("destination");
assertThat(value).isNull();
@@ -190,7 +189,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedCorrelationIdPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public String getJMSCorrelationID() throws JMSException {
throw new JMSException("illegal property");
@@ -201,7 +200,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedDestinationPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public Destination getJMSDestination() throws JMSException {
throw new JMSException("illegal property");
@@ -212,7 +211,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedDeliveryModePropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public int getJMSDeliveryMode() throws JMSException {
throw new JMSException("illegal property");
@@ -223,7 +222,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedExpirationPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public long getJMSExpiration() throws JMSException {
throw new JMSException("illegal property");
@@ -234,7 +233,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedMessageIdPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public String getJMSMessageID() throws JMSException {
throw new JMSException("illegal property");
@@ -245,7 +244,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedPriorityPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public int getJMSPriority() throws JMSException {
throw new JMSException("illegal property");
@@ -256,7 +255,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedReplyToPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public Destination getJMSReplyTo() throws JMSException {
throw new JMSException("illegal property");
@@ -267,7 +266,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedRedeliveredPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public boolean getJMSRedelivered() throws JMSException {
throw new JMSException("illegal property");
@@ -278,7 +277,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedTypePropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public String getJMSType() throws JMSException {
throw new JMSException("illegal property");
@@ -289,7 +288,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedTimestampPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public long getJMSTimestamp() throws JMSException {
throw new JMSException("illegal property");
@@ -300,7 +299,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void attemptToReadDisallowedUserPropertyIsNotFatal() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public Object getObjectProperty(String name) throws JMSException {
if (name.equals("fail")) {
@@ -321,7 +320,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsCorrelationIdMappedToHeader() throws JMSException {
String correlationId = "ABC-123";
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSCorrelationID(correlationId);
assertInboundHeader(jmsMessage, JmsHeaders.CORRELATION_ID, correlationId);
}
@@ -329,7 +328,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void destinationMappedToHeader() throws JMSException {
Destination destination = new Destination() {};
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSDestination(destination);
assertInboundHeader(jmsMessage, JmsHeaders.DESTINATION, destination);
}
@@ -337,7 +336,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsDeliveryModeMappedToHeader() throws JMSException {
int deliveryMode = 1;
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSDeliveryMode(deliveryMode);
assertInboundHeader(jmsMessage, JmsHeaders.DELIVERY_MODE, deliveryMode);
}
@@ -345,7 +344,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsExpirationMappedToHeader() throws JMSException {
long expiration = 1000L;
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSExpiration(expiration);
assertInboundHeader(jmsMessage, JmsHeaders.EXPIRATION, expiration);
}
@@ -353,7 +352,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsMessageIdMappedToHeader() throws JMSException {
String messageId = "ID:ABC-123";
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSMessageID(messageId);
assertInboundHeader(jmsMessage, JmsHeaders.MESSAGE_ID, messageId);
}
@@ -361,7 +360,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsPriorityMappedToHeader() throws JMSException {
int priority = 8;
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSPriority(priority);
assertInboundHeader(jmsMessage, JmsHeaders.PRIORITY, priority);
}
@@ -369,7 +368,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsReplyToMappedToHeader() throws JMSException {
Destination replyTo = new Destination() {};
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSReplyTo(replyTo);
assertInboundHeader(jmsMessage, JmsHeaders.REPLY_TO, replyTo);
}
@@ -377,7 +376,7 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsTypeMappedToHeader() throws JMSException {
String type = "testing";
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSType(type);
assertInboundHeader(jmsMessage, JmsHeaders.TYPE, type);
}
@@ -385,28 +384,28 @@ public class SimpleJmsHeaderMapperTests {
@Test
public void jmsTimestampMappedToHeader() throws JMSException {
long timestamp = 123L;
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setJMSTimestamp(timestamp);
assertInboundHeader(jmsMessage, JmsHeaders.TIMESTAMP, timestamp);
}
@Test
public void contentTypePropertyMappedToHeader() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setStringProperty("content_type", "foo");
assertInboundHeader(jmsMessage, MessageHeaders.CONTENT_TYPE, "foo");
}
@Test
public void userDefinedPropertyMappedToHeader() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setIntProperty("foo", 123);
assertInboundHeader(jmsMessage, "foo", 123);
}
@Test
public void userDefinedPropertyMappedToHeaderWithCustomPrefix() throws JMSException {
javax.jms.Message jmsMessage = new StubTextMessage();
jakarta.jms.Message jmsMessage = new StubTextMessage();
jmsMessage.setIntProperty("foo", 123);
mapper.setInboundPrefix("custom_");
assertInboundHeader(jmsMessage, "custom_foo", 123);
@@ -419,7 +418,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader("bad", 456)
.setHeader("bar", 789)
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setObjectProperty(String name, Object value) throws JMSException {
if (name.equals("bad")) {
@@ -444,7 +443,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader("bad", 456)
.setHeader("bar", 789)
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setObjectProperty(String name, Object value) throws JMSException {
if (name.equals("bad")) {
@@ -468,7 +467,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader(JmsHeaders.REPLY_TO, new Destination() {})
.setHeader("foo", "bar")
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setJMSReplyTo(Destination replyTo) throws JMSException {
throw new JMSException("illegal property");
@@ -486,7 +485,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader(JmsHeaders.TYPE, "someType")
.setHeader("foo", "bar")
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setJMSType(String type) throws JMSException {
throw new JMSException("illegal property");
@@ -504,7 +503,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader(JmsHeaders.CORRELATION_ID, "abc")
.setHeader("foo", "bar")
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setJMSCorrelationID(String correlationId) throws JMSException {
throw new JMSException("illegal property");
@@ -522,7 +521,7 @@ public class SimpleJmsHeaderMapperTests {
.setHeader(JmsHeaders.CORRELATION_ID, 123)
.setHeader("foo", "bar")
.build();
javax.jms.Message jmsMessage = new StubTextMessage() {
jakarta.jms.Message jmsMessage = new StubTextMessage() {
@Override
public void setJMSCorrelationID(String correlationId) throws JMSException {
throw new JMSException("illegal property");
@@ -535,7 +534,7 @@ public class SimpleJmsHeaderMapperTests {
}
private void assertInboundHeader(javax.jms.Message jmsMessage, String headerId, Object value) {
private void assertInboundHeader(jakarta.jms.Message jmsMessage, String headerId, Object value) {
Map<String, Object> headers = mapper.toHeaders(jmsMessage);
Object headerValue = headers.get(headerId);
if (value == null) {
@@ -548,7 +547,7 @@ public class SimpleJmsHeaderMapperTests {
}
}
private void assertAttemptReadDisallowedPropertyIsNotFatal(javax.jms.Message jmsMessage, String headerId)
private void assertAttemptReadDisallowedPropertyIsNotFatal(jakarta.jms.Message jmsMessage, String headerId)
throws JMSException {
jmsMessage.setStringProperty("foo", "bar");
Map<String, Object> headers = mapper.toHeaders(jmsMessage);

View File

@@ -21,14 +21,13 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.JMSException;
import jakarta.jms.MapMessage;
import jakarta.jms.Message;
import jakarta.jms.ObjectMessage;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;

View File

@@ -23,12 +23,11 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.Session;
import javax.jms.TextMessage;
import com.fasterxml.jackson.annotation.JsonView;
import jakarta.jms.BytesMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;

View File

@@ -16,12 +16,12 @@
package org.springframework.jms.support.converter;
import javax.jms.BytesMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import jakarta.jms.BytesMessage;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

View File

@@ -18,11 +18,10 @@ package org.springframework.jms.support.converter;
import java.io.Serializable;
import javax.jms.JMSException;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.JMSException;
import jakarta.jms.ObjectMessage;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.junit.jupiter.api.Test;
import org.springframework.jms.StubTextMessage;
@@ -75,7 +74,7 @@ public class MessagingMessageConverterTests {
private boolean called;
@Override
public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {
public Object fromMessage(jakarta.jms.Message message) throws JMSException, MessageConversionException {
if (this.called) {
throw new java.lang.IllegalStateException("Converter called twice");
}

View File

@@ -16,14 +16,13 @@
package org.springframework.jms.support.destination;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Queue;
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicSession;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Queue;
import jakarta.jms.QueueSession;
import jakarta.jms.Session;
import jakarta.jms.Topic;
import jakarta.jms.TopicSession;
import org.junit.jupiter.api.Test;
import org.springframework.jms.StubQueue;

View File

@@ -16,8 +16,7 @@
package org.springframework.jms.support.destination;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

View File

@@ -16,10 +16,10 @@
package org.springframework.jms.support.destination;
import javax.jms.Destination;
import javax.jms.Session;
import javax.naming.NamingException;
import jakarta.jms.Destination;
import jakarta.jms.Session;
import org.junit.jupiter.api.Test;
import org.springframework.jms.StubTopic;