Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start 6.0 version

Browse Source 
* Upgrade to Java 17, SF-6.0, Gradle 7.2
* Upgrade to Jakarta dependencies and respective namespaces
* Fix some tests for Java 17 compatibility
* Fix wrong Javadocs
* Add some missed Javadocs
* Fix more `jakarta` namespace
* Fix WS & XML modules to use Jakarta EE
* `--add-opens` in some modules for their reflection-based tests
* Disable Kafka tests which does not work on Windows; see Apache Kafka `3.0.1`
* Upgrade to JUnit `5.8.1`
* Migrate JMS tests to Artemis
* Remove RMI module as it was deprecated before
* Fix `pr-build-workflow.yml` for Java 17
* Fix JavaDocs warnings using `Xdoclint:syntax` per module, not in the top-level `api` task
* Move docs for version `6.0`
This commit is contained in:
Artem Bilan
2021-11-03 09:38:10 -04:00
parent 4423e43cd8
commit a80b22638d
225 changed files with 2196 additions and 2628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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.
@@ -18,12 +18,12 @@ package org.springframework.integration.jms;
import java.util.Map;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.InvalidDestinationException;
import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Session;
import jakarta.jms.DeliveryMode;
import jakarta.jms.Destination;
import jakarta.jms.InvalidDestinationException;
import jakarta.jms.JMSException;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
* @author Gary Russell
*/
public class ChannelPublishingJmsMessageListener
implements SessionAwareMessageListener<javax.jms.Message>, InitializingBean,
implements SessionAwareMessageListener<jakarta.jms.Message>, InitializingBean,
TrackableComponent, BeanFactoryAware {
protected final LogAccessor logger = new LogAccessor(getClass()); // NOSONAR final
@@ -80,11 +80,11 @@ public class ChannelPublishingJmsMessageListener
private String correlationKey;
private long replyTimeToLive = javax.jms.Message.DEFAULT_TIME_TO_LIVE;
private long replyTimeToLive = jakarta.jms.Message.DEFAULT_TIME_TO_LIVE;
private int replyPriority = javax.jms.Message.DEFAULT_PRIORITY;
private int replyPriority = jakarta.jms.Message.DEFAULT_PRIORITY;
private int replyDeliveryMode = javax.jms.Message.DEFAULT_DELIVERY_MODE;
private int replyDeliveryMode = jakarta.jms.Message.DEFAULT_DELIVERY_MODE;
private boolean explicitQosEnabledForReplies;
@@ -176,7 +176,7 @@ public class ChannelPublishingJmsMessageListener
* <p>Alternatively, specify a JMS Destination object as "defaultReplyDestination".
* @param destinationName The default reply destination name.
* @see #setDestinationResolver
* @see #setDefaultReplyDestination(javax.jms.Destination)
* @see #setDefaultReplyDestination(jakarta.jms.Destination)
*/
public void setDefaultReplyQueueName(String destinationName) {
this.defaultReplyDestination = new DestinationNameHolder(destinationName, false);
@@ -189,7 +189,7 @@ public class ChannelPublishingJmsMessageListener
* <p>Alternatively, specify a JMS Destination object as "defaultReplyDestination".
* @param destinationName The default reply topic name.
* @see #setDestinationResolver
* @see #setDefaultReplyDestination(javax.jms.Destination)
* @see #setDefaultReplyDestination(jakarta.jms.Destination)
*/
public void setDefaultReplyTopicName(String destinationName) {
this.defaultReplyDestination = new DestinationNameHolder(destinationName, true);
@@ -198,7 +198,7 @@ public class ChannelPublishingJmsMessageListener
/**
* Specify the time-to-live property for JMS reply Messages.
* @param replyTimeToLive The reply time to live.
* @see javax.jms.MessageProducer#setTimeToLive(long)
* @see jakarta.jms.MessageProducer#setTimeToLive(long)
*/
public void setReplyTimeToLive(long replyTimeToLive) {
this.replyTimeToLive = replyTimeToLive;
@@ -207,7 +207,7 @@ public class ChannelPublishingJmsMessageListener
/**
* Specify the priority value for JMS reply Messages.
* @param replyPriority The reply priority.
* @see javax.jms.MessageProducer#setPriority(int)
* @see jakarta.jms.MessageProducer#setPriority(int)
*/
public void setReplyPriority(int replyPriority) {
this.replyPriority = replyPriority;
@@ -216,7 +216,7 @@ public class ChannelPublishingJmsMessageListener
/**
* Specify the delivery mode for JMS reply Messages.
* @param replyDeliveryPersistent true for a persistent reply message.
* @see javax.jms.MessageProducer#setDeliveryMode(int)
* @see jakarta.jms.MessageProducer#setDeliveryMode(int)
*/
public void setReplyDeliveryPersistent(boolean replyDeliveryPersistent) {
this.replyDeliveryMode = replyDeliveryPersistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT;
@@ -310,7 +310,7 @@ public class ChannelPublishingJmsMessageListener
}
@Override
public void onMessage(javax.jms.Message jmsMessage, Session session) throws JMSException {
public void onMessage(jakarta.jms.Message jmsMessage, Session session) throws JMSException {
Message<?> requestMessage;
try {
final Object result;
@@ -358,7 +358,7 @@ public class ChannelPublishingJmsMessageListener
replyResult = replyMessage;
}
try {
javax.jms.Message jmsReply = this.messageConverter.toMessage(replyResult, session);
jakarta.jms.Message jmsReply = this.messageConverter.toMessage(replyResult, session);
// map SI Message Headers to JMS Message Properties/Headers
this.headerMapper.fromHeaders(replyMessage.getHeaders(), jmsReply);
copyCorrelationIdFromRequestToReply(jmsMessage, jmsReply);
@@ -392,7 +392,7 @@ public class ChannelPublishingJmsMessageListener
this.gatewayDelegate.stop();
}
private void copyCorrelationIdFromRequestToReply(javax.jms.Message requestMessage, javax.jms.Message replyMessage)
private void copyCorrelationIdFromRequestToReply(jakarta.jms.Message requestMessage, jakarta.jms.Message replyMessage)
throws JMSException {
if (this.correlationKey != null) {
@@ -429,9 +429,9 @@ public class ChannelPublishingJmsMessageListener
* @throws JMSException if thrown by JMS API methods
* @throws InvalidDestinationException if no {@link Destination} can be determined
* @see #setDefaultReplyDestination
* @see javax.jms.Message#getJMSReplyTo()
* @see jakarta.jms.Message#getJMSReplyTo()
*/
private Destination getReplyDestination(javax.jms.Message request, Session session) throws JMSException {
private Destination getReplyDestination(jakarta.jms.Message request, Session session) throws JMSException {
Destination replyTo = request.getJMSReplyTo();
if (replyTo == null) {
replyTo = resolveDefaultReplyDestination(session);
@@ -448,7 +448,7 @@ public class ChannelPublishingJmsMessageListener
* listener's {@link DestinationResolver} in case of a destination name.
* @param session The session.
* @return the located {@link Destination}
* @throws javax.jms.JMSException if resolution failed
* @throws jakarta.jms.JMSException if resolution failed
* @see #setDefaultReplyDestination
* @see #setDefaultReplyQueueName
* @see #setDefaultReplyTopicName
@@ -465,7 +465,7 @@ public class ChannelPublishingJmsMessageListener
return null;
}
private void sendReply(javax.jms.Message replyMessage, Destination destination, Session session)
private void sendReply(jakarta.jms.Message replyMessage, Destination destination, Session session)
throws JMSException {
MessageProducer producer = session.createProducer(destination);

18
spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java
View File

@@ -23,9 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -130,7 +130,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
@Override
public void fromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
public void fromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
try {
populateCorrelationIdPropertyFromHeaders(headers, jmsMessage);
populateReplyToPropertyFromHeaders(headers, jmsMessage);
@@ -155,7 +155,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
}
private void populateCorrelationIdPropertyFromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
private void populateCorrelationIdPropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
Object jmsCorrelationId = headers.get(JmsHeaders.CORRELATION_ID);
if (jmsCorrelationId instanceof Number) {
jmsCorrelationId = jmsCorrelationId.toString();
@@ -170,7 +170,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
}
private void populateReplyToPropertyFromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
private void populateReplyToPropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
Object jmsReplyTo = headers.get(JmsHeaders.REPLY_TO);
if (jmsReplyTo instanceof Destination) {
try {
@@ -182,7 +182,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
}
private void populateTypePropertyFromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
private void populateTypePropertyFromHeaders(MessageHeaders headers, jakarta.jms.Message jmsMessage) {
Object jmsType = headers.get(JmsHeaders.TYPE);
if (jmsType instanceof String) {
try {
@@ -194,7 +194,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
}
private void populateArbitraryHeaderToProperty(javax.jms.Message jmsMessage, String headerName, Object value)
private void populateArbitraryHeaderToProperty(jakarta.jms.Message jmsMessage, String headerName, Object value)
throws JMSException {
if (SUPPORTED_PROPERTY_TYPES.contains(value.getClass())) {
@@ -222,7 +222,7 @@ public class DefaultJmsHeaderMapper extends JmsHeaderMapper {
}
@Override
public Map<String, Object> toHeaders(javax.jms.Message jmsMessage) {
public Map<String, Object> toHeaders(jakarta.jms.Message jmsMessage) {
Map<String, Object> headers = new HashMap<>();
try {
mapMessageIdProperty(jmsMessage, headers);

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/DynamicJmsTemplate.java
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,7 +16,7 @@
package org.springframework.integration.jms;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.springframework.jms.connection.CachingConnectionFactory;
import org.springframework.jms.core.JmsTemplate;

12
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
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.
@@ -18,7 +18,7 @@ package org.springframework.integration.jms;
import java.util.Map;
import javax.jms.Destination;
import jakarta.jms.Destination;
import org.springframework.integration.endpoint.AbstractMessageSource;
import org.springframework.integration.jms.util.JmsAdapterUtils;
@@ -117,13 +117,13 @@ public class JmsDestinationPollingSource extends AbstractMessageSource<Object> {
}
/**
* Will receive a JMS {@link javax.jms.Message} converting and returning it as
* Will receive a JMS {@link jakarta.jms.Message} converting and returning it as
* a Spring Integration {@link Message}. This method will also use the current
* {@link JmsHeaderMapper} instance to map JMS properties to the MessageHeaders.
*/
@Override
protected Object doReceive() {
javax.jms.Message jmsMessage = doReceiveJmsMessage();
jakarta.jms.Message jmsMessage = doReceiveJmsMessage();
if (jmsMessage == null) {
return null;
}
@@ -148,8 +148,8 @@ public class JmsDestinationPollingSource extends AbstractMessageSource<Object> {
}
}
private javax.jms.Message doReceiveJmsMessage() {
javax.jms.Message jmsMessage = null;
private jakarta.jms.Message doReceiveJmsMessage() {
jakarta.jms.Message jmsMessage = null;
if (this.destination != null) {
jmsMessage = this.jmsTemplate.receiveSelected(this.destination, this.messageSelector);
}

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java
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,7 +16,7 @@
package org.springframework.integration.jms;
import javax.jms.Message;
import jakarta.jms.Message;
import org.springframework.integration.mapping.HeaderMapper;

106
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
View File

@@ -28,18 +28,18 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TemporaryTopic;
import javax.jms.Topic;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.DeliveryMode;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageListener;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.TemporaryQueue;
import jakarta.jms.TemporaryTopic;
import jakarta.jms.Topic;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -96,7 +96,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
private final String gatewayCorrelation = UUID.randomUUID().toString();
private final Map<String, LinkedBlockingQueue<javax.jms.Message>> replies = new ConcurrentHashMap<>();
private final Map<String, LinkedBlockingQueue<jakarta.jms.Message>> replies = new ConcurrentHashMap<>();
private final ConcurrentHashMap<String, TimedReply> earlyOrLateReplies = new ConcurrentHashMap<>();
@@ -125,11 +125,11 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
private long receiveTimeout = DEFAULT_RECEIVE_TIMEOUT;
private int deliveryMode = javax.jms.Message.DEFAULT_DELIVERY_MODE;
private int deliveryMode = jakarta.jms.Message.DEFAULT_DELIVERY_MODE;
private long timeToLive = javax.jms.Message.DEFAULT_TIME_TO_LIVE;
private long timeToLive = jakarta.jms.Message.DEFAULT_TIME_TO_LIVE;
private int defaultPriority = javax.jms.Message.DEFAULT_PRIORITY;
private int defaultPriority = jakarta.jms.Message.DEFAULT_PRIORITY;
private boolean explicitQosEnabled;
@@ -173,8 +173,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
* mode accordingly to either "PERSISTENT" (1) or "NON_PERSISTENT" (2).
* <p>The default is "true", i.e. delivery mode "PERSISTENT".
* @param deliveryPersistent true for a persistent delivery.
* @see javax.jms.DeliveryMode#PERSISTENT
* @see javax.jms.DeliveryMode#NON_PERSISTENT
* @see jakarta.jms.DeliveryMode#PERSISTENT
* @see jakarta.jms.DeliveryMode#NON_PERSISTENT
*/
public void setDeliveryPersistent(boolean deliveryPersistent) {
this.deliveryMode = (deliveryPersistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
@@ -749,8 +749,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
if (reply instanceof javax.jms.Message) {
return buildReply((javax.jms.Message) reply);
if (reply instanceof jakarta.jms.Message) {
return buildReply((jakarta.jms.Message) reply);
}
else {
return reply;
@@ -761,7 +761,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private AbstractIntegrationMessageBuilder<?> buildReply(javax.jms.Message jmsReply) throws JMSException {
private AbstractIntegrationMessageBuilder<?> buildReply(jakarta.jms.Message jmsReply) throws JMSException {
Object result;
if (this.extractReplyPayload) {
result = this.messageConverter.fromMessage(jmsReply);
@@ -797,7 +797,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
if (this.extractRequestPayload) {
objectToSend = requestMessage.getPayload();
}
javax.jms.Message jmsRequest = this.messageConverter.toMessage(objectToSend, session);
jakarta.jms.Message jmsRequest = this.messageConverter.toMessage(objectToSend, session);
// map headers
this.headerMapper.fromHeaders(requestMessage.getHeaders(), jmsRequest);
@@ -828,8 +828,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
* Remove the gateway's internal correlation Id to avoid conflicts with an upstream
* gateway.
*/
if (reply instanceof javax.jms.Message) {
((javax.jms.Message) reply).setJMSCorrelationID(null);
if (reply instanceof jakarta.jms.Message) {
((jakarta.jms.Message) reply).setJMSCorrelationID(null);
}
return reply;
}
@@ -839,7 +839,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private javax.jms.Message sendAndReceiveWithoutContainer(Message<?> requestMessage) throws JMSException {
private jakarta.jms.Message sendAndReceiveWithoutContainer(Message<?> requestMessage) throws JMSException {
Connection connection = createConnection(); // NOSONAR - closed in ConnectionFactoryUtils.
Session session = null;
Destination replyTo = null;
@@ -851,7 +851,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
if (this.extractRequestPayload) {
objectToSend = requestMessage.getPayload();
}
javax.jms.Message jmsRequest = this.messageConverter.toMessage(objectToSend, session);
jakarta.jms.Message jmsRequest = this.messageConverter.toMessage(objectToSend, session);
// map headers
this.headerMapper.fromHeaders(requestMessage.getHeaders(), jmsRequest);
@@ -866,7 +866,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
if (priority == null) {
priority = this.defaultPriority;
}
javax.jms.Message replyMessage;
jakarta.jms.Message replyMessage;
Destination destination = determineRequestDestination(requestMessage, session);
if (this.correlationKey != null) {
replyMessage = doSendAndReceiveWithGeneratedCorrelationId(destination, jmsRequest, replyTo,
@@ -893,8 +893,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
* Creates the MessageConsumer before sending the request Message since we are generating
* our own correlationId value for the MessageSelector.
*/
private javax.jms.Message doSendAndReceiveWithGeneratedCorrelationId(Destination reqDestination,
javax.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
private jakarta.jms.Message doSendAndReceiveWithGeneratedCorrelationId(Destination reqDestination,
jakarta.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
MessageProducer messageProducer = null;
try {
messageProducer = session.createProducer(reqDestination);
@@ -927,8 +927,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
/**
* Creates the MessageConsumer before sending the request Message since we do not need any correlation.
*/
private javax.jms.Message doSendAndReceiveWithTemporaryReplyToDestination(Destination reqDestination,
javax.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
private jakarta.jms.Message doSendAndReceiveWithTemporaryReplyToDestination(Destination reqDestination,
jakarta.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
MessageProducer messageProducer = null;
MessageConsumer messageConsumer = null;
@@ -948,8 +948,8 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
* Creates the MessageConsumer after sending the request Message since we need
* the MessageID for correlation with a MessageSelector.
*/
private javax.jms.Message doSendAndReceiveWithMessageIdCorrelation(Destination reqDestination,
javax.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
private jakarta.jms.Message doSendAndReceiveWithMessageIdCorrelation(Destination reqDestination,
jakarta.jms.Message jmsRequest, Destination replyTo, Session session, int priority) throws JMSException {
if (replyTo instanceof Topic) {
logger.warn("Relying on the MessageID for correlation is not recommended when using a Topic as the " +
@@ -986,7 +986,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
* If the replyTo is not temporary, and the connection is lost while waiting for a reply, reconnect for
* up to receiveTimeout.
*/
private javax.jms.Message retryableReceiveReply(Session session, Destination replyTo, // NOSONAR
private jakarta.jms.Message retryableReceiveReply(Session session, Destination replyTo, // NOSONAR
String messageSelector) throws JMSException {
Connection consumerConnection = null; //NOSONAR
@@ -1003,7 +1003,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
do {
try {
messageConsumer = consumerSession.createConsumer(replyTo, messageSelector);
javax.jms.Message reply = receiveReplyMessage(messageConsumer);
jakarta.jms.Message reply = receiveReplyMessage(messageConsumer);
if (reply == null && replyTimeout > System.currentTimeMillis()) {
throw new JMSException("Consumer closed before timeout");
}
@@ -1050,7 +1050,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private Object doSendAndReceiveAsync(Destination reqDestination, javax.jms.Message jmsRequest, Session session,
private Object doSendAndReceiveAsync(Destination reqDestination, jakarta.jms.Message jmsRequest, Session session,
int priority) throws JMSException {
String correlation = null;
@@ -1069,7 +1069,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
*/
jmsRequest.setJMSCorrelationID(null);
}
LinkedBlockingQueue<javax.jms.Message> replyQueue = null;
LinkedBlockingQueue<jakarta.jms.Message> replyQueue = null;
String correlationToLog = correlation;
logger.debug(() -> getComponentName() + " Sending message with correlationId " + correlationToLog);
SettableListenableFuture<AbstractIntegrationMessageBuilder<?>> future = null;
@@ -1099,15 +1099,15 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private javax.jms.Message doSendAndReceiveAsyncDefaultCorrelation(Destination reqDestination,
javax.jms.Message jmsRequest, Session session, int priority) throws JMSException {
private jakarta.jms.Message doSendAndReceiveAsyncDefaultCorrelation(Destination reqDestination,
jakarta.jms.Message jmsRequest, Session session, int priority) throws JMSException {
String correlation = null;
MessageProducer messageProducer = null;
try {
messageProducer = session.createProducer(reqDestination);
LinkedBlockingQueue<javax.jms.Message> replyQueue = new LinkedBlockingQueue<>(1);
LinkedBlockingQueue<jakarta.jms.Message> replyQueue = new LinkedBlockingQueue<>(1);
this.sendRequestMessage(jmsRequest, messageProducer, priority);
@@ -1137,10 +1137,10 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private javax.jms.Message obtainReplyFromContainer(String correlationId,
LinkedBlockingQueue<javax.jms.Message> replyQueue) {
private jakarta.jms.Message obtainReplyFromContainer(String correlationId,
LinkedBlockingQueue<jakarta.jms.Message> replyQueue) {
javax.jms.Message reply = null;
jakarta.jms.Message reply = null;
if (this.receiveTimeout < 0) {
reply = replyQueue.poll();
@@ -1154,7 +1154,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
logger.error(ex, "Interrupted while awaiting reply; treated as a timeout");
}
}
javax.jms.Message replyToLog = reply;
jakarta.jms.Message replyToLog = reply;
logger.debug(() -> {
if (replyToLog == null) {
return getComponentName() + " Timed out waiting for reply with CorrelationId " + correlationId;
@@ -1193,7 +1193,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private void sendRequestMessage(javax.jms.Message jmsRequest, MessageProducer messageProducer, int priority)
private void sendRequestMessage(jakarta.jms.Message jmsRequest, MessageProducer messageProducer, int priority)
throws JMSException {
if (this.explicitQosEnabled) {
@@ -1204,7 +1204,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private javax.jms.Message receiveReplyMessage(MessageConsumer messageConsumer) throws JMSException {
private jakarta.jms.Message receiveReplyMessage(MessageConsumer messageConsumer) throws JMSException {
return (this.receiveTimeout >= 0) ? messageConsumer.receive(this.receiveTimeout) : messageConsumer.receive();
}
@@ -1247,7 +1247,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
@Override
public void onMessage(javax.jms.Message message) {
public void onMessage(jakarta.jms.Message message) {
String correlation = null;
try {
logger.trace(() -> getComponentName() + " Received " + message);
@@ -1273,7 +1273,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private void onMessageAsync(javax.jms.Message message, String correlationId) throws JMSException {
private void onMessageAsync(jakarta.jms.Message message, String correlationId) throws JMSException {
SettableListenableFuture<AbstractIntegrationMessageBuilder<?>> future = this.futures.remove(correlationId);
if (future != null) {
message.setJMSCorrelationID(null);
@@ -1284,9 +1284,9 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
}
}
private void onMessageSync(javax.jms.Message message, String correlationId) {
private void onMessageSync(jakarta.jms.Message message, String correlationId) {
try {
LinkedBlockingQueue<javax.jms.Message> queue = this.replies.get(correlationId);
LinkedBlockingQueue<jakarta.jms.Message> queue = this.replies.get(correlationId);
if (queue == null) {
if (this.correlationKey != null) {
Log debugLogger = LogFactory.getLog("si.jmsgateway.debug");
@@ -1411,9 +1411,9 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
private final long timeStamp = System.currentTimeMillis();
private final javax.jms.Message reply;
private final jakarta.jms.Message reply;
TimedReply(javax.jms.Message reply) {
TimedReply(jakarta.jms.Message reply) {
this.reply = reply;
}
@@ -1421,7 +1421,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler
return this.timeStamp;
}
private javax.jms.Message getReply() {
private jakarta.jms.Message getReply() {
return this.reply;
}

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
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,7 +16,7 @@
package org.springframework.integration.jms;
import javax.jms.Destination;
import jakarta.jms.Destination;
import org.springframework.core.convert.ConversionService;
import org.springframework.expression.EvaluationContext;
@@ -233,7 +233,7 @@ public class JmsSendingMessageHandler extends AbstractMessageHandler {
}
@Override
public javax.jms.Message postProcessMessage(javax.jms.Message jmsMessage) {
public jakarta.jms.Message postProcessMessage(jakarta.jms.Message jmsMessage) {
this.headerMapper.fromHeaders(this.integrationMessage.getHeaders(), jmsMessage);
return jmsMessage;
}

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 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,7 +16,7 @@
package org.springframework.integration.jms;
import javax.jms.MessageListener;
import jakarta.jms.MessageListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -213,7 +213,7 @@ public class SubscribableJmsChannel extends AbstractJmsChannel
@Override
public void onMessage(javax.jms.Message message) {
public void onMessage(jakarta.jms.Message message) {
Message<?> messageToSend = null;
try {
MessageConverter converter = this.jmsTemplate.getMessageConverter();

8
spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java
View File

@@ -19,10 +19,10 @@ package org.springframework.integration.jms.config;
import java.util.List;
import java.util.concurrent.Executor;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.ExceptionListener;
import javax.jms.Session;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import jakarta.jms.ExceptionListener;
import jakarta.jms.Session;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanFactory;

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.jms.config;
import javax.jms.Session;
import jakarta.jms.Session;
import org.w3c.dom.Element;

10
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/Jms.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2020 the original author or authors.
* Copyright 2014-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,8 +16,8 @@
package org.springframework.integration.jms.dsl;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import org.springframework.integration.jms.PollableJmsChannel;
import org.springframework.jms.core.JmsTemplate;
@@ -41,7 +41,9 @@ public final class Jms {
* @param connectionFactory the JMS ConnectionFactory to build on
* @return the {@link JmsPollableMessageChannelSpec} instance
*/
public static JmsPollableMessageChannelSpec<?, PollableJmsChannel> pollableChannel(ConnectionFactory connectionFactory) {
public static JmsPollableMessageChannelSpec<?, PollableJmsChannel> pollableChannel(
ConnectionFactory connectionFactory) {
return pollableChannel(null, connectionFactory);
}

8
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsDestinationAccessorSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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,7 +16,7 @@
package org.springframework.integration.jms.dsl;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.springframework.integration.dsl.IntegrationComponentSpec;
import org.springframework.jms.support.destination.DestinationResolver;
@@ -75,7 +75,7 @@ public abstract class JmsDestinationAccessorSpec<S extends JmsDestinationAccesso
* A session acknowledgement mode.
* @param sessionAcknowledgeMode the acknowledgement mode constant
* @return the spec
* @see javax.jms.Session#AUTO_ACKNOWLEDGE etc.
* @see jakarta.jms.Session#AUTO_ACKNOWLEDGE etc.
* @see JmsDestinationAccessor#setSessionAcknowledgeMode
*/
public S sessionAcknowledgeMode(int sessionAcknowledgeMode) {
@@ -85,7 +85,7 @@ public abstract class JmsDestinationAccessorSpec<S extends JmsDestinationAccesso
/**
* A session acknowledgement mode name.
* @param constantName the name of the {@link javax.jms.Session} acknowledge mode constant.
* @param constantName the name of the {@link jakarta.jms.Session} acknowledge mode constant.
* @return the spec.
* @see JmsDestinationAccessor#setSessionAcknowledgeModeName
*/

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundChannelAdapterSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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.
@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.Map;
import java.util.function.Consumer;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import org.springframework.integration.dsl.ComponentsRegistration;
import org.springframework.integration.dsl.MessageSourceSpec;

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsInboundGatewaySpec.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.jms.dsl;
import java.util.function.Consumer;
import javax.jms.Destination;
import jakarta.jms.Destination;
import org.springframework.integration.dsl.MessagingGatewaySpec;
import org.springframework.integration.jms.ChannelPublishingJmsMessageListener;

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsListenerContainerSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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,8 +16,8 @@
package org.springframework.integration.jms.dsl;
import javax.jms.Destination;
import javax.jms.ExceptionListener;
import jakarta.jms.Destination;
import jakarta.jms.ExceptionListener;
import org.springframework.beans.BeanUtils;
import org.springframework.jms.listener.AbstractMessageListenerContainer;

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageChannelSpec.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.jms.dsl;
import java.util.concurrent.Executor;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.springframework.integration.jms.AbstractJmsChannel;
import org.springframework.integration.jms.config.JmsChannelFactoryBean;

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsMessageDrivenChannelAdapterSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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.
@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.function.Consumer;
import javax.jms.Destination;
import jakarta.jms.Destination;
import org.springframework.integration.dsl.ComponentsRegistration;
import org.springframework.integration.dsl.MessageProducerSpec;

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundChannelAdapterSpec.java
View File

@@ -21,8 +21,8 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import org.springframework.integration.dsl.ComponentsRegistration;
import org.springframework.integration.dsl.MessageHandlerSpec;

8
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsOutboundGatewaySpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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.
@@ -20,8 +20,8 @@ import java.util.concurrent.Executor;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import org.springframework.integration.dsl.IntegrationComponentSpec;
import org.springframework.integration.dsl.MessageHandlerSpec;
@@ -325,7 +325,7 @@ public class JmsOutboundGatewaySpec extends MessageHandlerSpec<JmsOutboundGatewa
/**
* @param sessionAcknowledgeMode the acknowledgement mode constant
* @return the current {@link ReplyContainerSpec}.
* @see javax.jms.Session#AUTO_ACKNOWLEDGE etc.
* @see jakarta.jms.Session#AUTO_ACKNOWLEDGE etc.
*/
public ReplyContainerSpec sessionAcknowledgeMode(Integer sessionAcknowledgeMode) {
this.target.setSessionAcknowledgeMode(sessionAcknowledgeMode);

6
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPollableMessageChannelSpec.java
View File

@@ -16,8 +16,8 @@
package org.springframework.integration.jms.dsl;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -199,7 +199,7 @@ public class JmsPollableMessageChannelSpec<S extends JmsPollableMessageChannelSp
/**
* @param sessionAcknowledgeMode the acknowledgement mode constant
* @return the current {@link MessageChannelSpec}.
* @see javax.jms.Session#AUTO_ACKNOWLEDGE etc.
* @see jakarta.jms.Session#AUTO_ACKNOWLEDGE etc.
*/
public S sessionAcknowledgeMode(int sessionAcknowledgeMode) {
this.jmsChannelFactoryBean.setSessionAcknowledgeMode(sessionAcknowledgeMode);

4
spring-integration-jms/src/main/java/org/springframework/integration/jms/dsl/JmsPublishSubscribeMessageChannelSpec.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016-2020 the original author or authors.
* Copyright 2016-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,7 +16,7 @@
package org.springframework.integration.jms.dsl;
import javax.jms.ConnectionFactory;
import jakarta.jms.ConnectionFactory;
import org.springframework.integration.jms.SubscribableJmsChannel;

34
spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms.xsd
View File

@@ -156,7 +156,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.ConnectionFactory"/>
<tool:expected-type type="jakarta.jms.ConnectionFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -377,13 +377,13 @@
<xsd:attribute name="destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the
DestinationResolver strategy (DynamicDestinationResolver by default).
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -544,13 +544,13 @@
<xsd:attribute name="destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the
DestinationResolver strategy (DynamicDestinationResolver by default).
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -620,13 +620,13 @@
<xsd:attribute name="request-destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'request-destination-name' and 'request-pub-sub-domain' which will rely
upon the DestinationResolver strategy (DynamicDestinationResolver by default).
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -636,13 +636,13 @@
<xsd:attribute name="default-reply-destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use either 'default-reply-queue-name' or 'default-reply-topic-name' which
will rely upon the DestinationResolver strategy (DynamicDestinationResolver by default).
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -900,7 +900,7 @@
<xsd:attribute name="request-destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'request-destination-name' and 'request-pub-sub-domain' which will rely
upon the DestinationResolver strategy (DynamicDestinationResolver by default). This
attribute is mutually exclusive with 'request-destination-name' and
@@ -908,7 +908,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -947,7 +947,7 @@
<xsd:attribute name="reply-destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'reply-destination-name' and 'reply-pub-sub-domain' which will rely
upon the DestinationResolver strategy (DynamicDestinationResolver by default).
This attribute is mutually exclusive with
@@ -955,7 +955,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1032,7 +1032,7 @@
]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.ConnectionFactory"/>
<tool:expected-type type="jakarta.jms.ConnectionFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1178,14 +1178,14 @@
<xsd:attribute name="destination" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
A reference to a javax.jms.Destination by bean name. As an alternative to a bean
A reference to a jakarta.jms.Destination by bean name. As an alternative to a bean
reference, use 'destination-name' and 'pub-sub-domain' which will rely upon the
DestinationResolver strategy (DynamicDestinationResolver by default). This attribute
is mutually exclusive with 'destination-name' and 'destination-expression'.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.Destination"/>
<tool:expected-type type="jakarta.jms.Destination"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -1491,7 +1491,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="javax.jms.ConnectionFactory"/>
<tool:expected-type type="jakarta.jms.ConnectionFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>