Skip to content

Commit 2c4eedc

Browse files
vpavicvpavic
committed
Add support for auto-configuring SimpleMessageListenerContainer
This commit introduces a new `spring.jms.listener.container-type` configuration property which can be used to auto-configure JMS listener support backend by `SimpleMessageListenerContainer` instead of `DefaultMessageListenerContainer`. Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
1 parent 207c8f5 commit 2c4eedc

File tree

6 files changed

+296
-118
lines changed

6 files changed

+296
-118
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/AbstractJmsListenerContainerFactoryConfigurer.java‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
/*
2+
* Copyright 2012-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.autoconfigure.jms;
18+
19+
import io.micrometer.observation.ObservationRegistry;
20+
import jakarta.jms.ConnectionFactory;
21+
import jakarta.jms.ExceptionListener;
22+
23+
import org.springframework.boot.autoconfigure.jms.JmsProperties.Listener.Session;
24+
import org.springframework.boot.context.properties.PropertyMapper;
25+
import org.springframework.jms.config.AbstractJmsListenerContainerFactory;
26+
import org.springframework.jms.support.converter.MessageConverter;
27+
import org.springframework.jms.support.destination.DestinationResolver;
28+
import org.springframework.util.Assert;
29+
30+
/**
31+
* Configures {@link AbstractJmsListenerContainerFactory} with sensible defaults.
32+
*
33+
* @param <T> the connection factory type.
34+
* @author Vedran Pavic
35+
* @since 3.5.0
36+
*/
37+
public abstract class AbstractJmsListenerContainerFactoryConfigurer<T extends AbstractJmsListenerContainerFactory<?>> {
38+
39+
private DestinationResolver destinationResolver;
40+
41+
private MessageConverter messageConverter;
42+
43+
private ExceptionListener exceptionListener;
44+
45+
private ObservationRegistry observationRegistry;
46+
47+
private JmsProperties jmsProperties;
48+
49+
/**
50+
* Set the {@link DestinationResolver} to use or {@code null} if no destination
51+
* resolver should be associated with the factory by default.
52+
* @param destinationResolver the {@link DestinationResolver}
53+
*/
54+
void setDestinationResolver(DestinationResolver destinationResolver) {
55+
this.destinationResolver = destinationResolver;
56+
}
57+
58+
/**
59+
* Set the {@link MessageConverter} to use or {@code null} if the out-of-the-box
60+
* converter should be used.
61+
* @param messageConverter the {@link MessageConverter}
62+
*/
63+
void setMessageConverter(MessageConverter messageConverter) {
64+
this.messageConverter = messageConverter;
65+
}
66+
67+
/**
68+
* Set the {@link ExceptionListener} to use or {@code null} if no exception listener
69+
* should be associated by default.
70+
* @param exceptionListener the {@link ExceptionListener}
71+
*/
72+
void setExceptionListener(ExceptionListener exceptionListener) {
73+
this.exceptionListener = exceptionListener;
74+
}
75+
76+
/**
77+
* Set the {@link ObservationRegistry} to use.
78+
* @param observationRegistry the {@link ObservationRegistry}
79+
*/
80+
void setObservationRegistry(ObservationRegistry observationRegistry) {
81+
this.observationRegistry = observationRegistry;
82+
}
83+
84+
/**
85+
* Set the {@link JmsProperties} to use.
86+
* @param jmsProperties the {@link JmsProperties}
87+
*/
88+
void setJmsProperties(JmsProperties jmsProperties) {
89+
this.jmsProperties = jmsProperties;
90+
}
91+
92+
/**
93+
* Configure the specified jms listener container factory. The factory can be further
94+
* tuned and default settings can be overridden.
95+
* @param factory the {@link AbstractJmsListenerContainerFactory} instance to
96+
* configure
97+
* @param connectionFactory the {@link ConnectionFactory} to use
98+
*/
99+
public void configure(T factory, ConnectionFactory connectionFactory) {
100+
Assert.notNull(factory, "'factory' must not be null");
101+
Assert.notNull(connectionFactory, "'connectionFactory' must not be null");
102+
JmsProperties.Listener listenerProperties = this.jmsProperties.getListener();
103+
Session sessionProperties = listenerProperties.getSession();
104+
factory.setConnectionFactory(connectionFactory);
105+
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
106+
map.from(this.jmsProperties::isPubSubDomain).to(factory::setPubSubDomain);
107+
map.from(this.jmsProperties::isSubscriptionDurable).to(factory::setSubscriptionDurable);
108+
map.from(this.jmsProperties::getClientId).to(factory::setClientId);
109+
map.from(this.destinationResolver).to(factory::setDestinationResolver);
110+
map.from(this.messageConverter).to(factory::setMessageConverter);
111+
map.from(this.exceptionListener).to(factory::setExceptionListener);
112+
map.from(sessionProperties.getAcknowledgeMode()::getMode).to(factory::setSessionAcknowledgeMode);
113+
map.from(this.observationRegistry).to(factory::setObservationRegistry);
114+
map.from(sessionProperties::getTransacted).to(factory::setSessionTransacted);
115+
map.from(listenerProperties::isAutoStartup).to(factory::setAutoStartup);
116+
configure(factory, connectionFactory, this.jmsProperties);
117+
}
118+
119+
/**
120+
* Configures the given {@code factory} using the given {@code connectionFactory} and
121+
* {@code jmsProperties}.
122+
* @param factory the {@link AbstractJmsListenerContainerFactory} instance to
123+
* configure
124+
* @param connectionFactory the {@link ConnectionFactory} to use
125+
* @param jmsProperties the {@link JmsProperties} to use
126+
*/
127+
protected abstract void configure(T factory, ConnectionFactory connectionFactory, JmsProperties jmsProperties);
128+
129+
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/DefaultJmsListenerContainerFactoryConfigurer.java‎

Lines changed: 10 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -20,66 +20,26 @@
2020

2121
import io.micrometer.observation.ObservationRegistry;
2222
import jakarta.jms.ConnectionFactory;
23-
import jakarta.jms.ExceptionListener;
2423

2524
import org.springframework.boot.autoconfigure.jms.JmsProperties.Listener.Session;
2625
import org.springframework.boot.context.properties.PropertyMapper;
2726
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
28-
import org.springframework.jms.support.converter.MessageConverter;
29-
import org.springframework.jms.support.destination.DestinationResolver;
3027
import org.springframework.transaction.jta.JtaTransactionManager;
31-
import org.springframework.util.Assert;
3228

3329
/**
34-
* Configure {@link DefaultJmsListenerContainerFactory} with sensible defaults.
30+
* Configures {@link DefaultJmsListenerContainerFactory} with sensible defaults.
3531
*
3632
* @author Stephane Nicoll
3733
* @author Eddú Meléndez
3834
* @author Vedran Pavic
3935
* @author Lasse Wulff
4036
* @since 1.3.3
4137
*/
42-
public final class DefaultJmsListenerContainerFactoryConfigurer {
43-
44-
private DestinationResolver destinationResolver;
45-
46-
private MessageConverter messageConverter;
47-
48-
private ExceptionListener exceptionListener;
38+
public final class DefaultJmsListenerContainerFactoryConfigurer
39+
extends AbstractJmsListenerContainerFactoryConfigurer<DefaultJmsListenerContainerFactory> {
4940

5041
private JtaTransactionManager transactionManager;
5142

52-
private JmsProperties jmsProperties;
53-
54-
private ObservationRegistry observationRegistry;
55-
56-
/**
57-
* Set the {@link DestinationResolver} to use or {@code null} if no destination
58-
* resolver should be associated with the factory by default.
59-
* @param destinationResolver the {@link DestinationResolver}
60-
*/
61-
void setDestinationResolver(DestinationResolver destinationResolver) {
62-
this.destinationResolver = destinationResolver;
63-
}
64-
65-
/**
66-
* Set the {@link MessageConverter} to use or {@code null} if the out-of-the-box
67-
* converter should be used.
68-
* @param messageConverter the {@link MessageConverter}
69-
*/
70-
void setMessageConverter(MessageConverter messageConverter) {
71-
this.messageConverter = messageConverter;
72-
}
73-
74-
/**
75-
* Set the {@link ExceptionListener} to use or {@code null} if no exception listener
76-
* should be associated by default.
77-
* @param exceptionListener the {@link ExceptionListener}
78-
*/
79-
void setExceptionListener(ExceptionListener exceptionListener) {
80-
this.exceptionListener = exceptionListener;
81-
}
82-
8343
/**
8444
* Set the {@link JtaTransactionManager} to use or {@code null} if the JTA support
8545
* should not be used.
@@ -89,53 +49,29 @@ void setTransactionManager(JtaTransactionManager transactionManager) {
8949
this.transactionManager = transactionManager;
9050
}
9151

92-
/**
93-
* Set the {@link JmsProperties} to use.
94-
* @param jmsProperties the {@link JmsProperties}
95-
*/
96-
void setJmsProperties(JmsProperties jmsProperties) {
97-
this.jmsProperties = jmsProperties;
98-
}
99-
10052
/**
10153
* Set the {@link ObservationRegistry} to use.
10254
* @param observationRegistry the {@link ObservationRegistry}
10355
* @since 3.2.1
10456
* @deprecated since 3.3.10 for removal in 3.6.0 as this should have been package
10557
* private
10658
*/
59+
@Override
10760
@Deprecated(since = "3.3.10", forRemoval = true)
10861
public void setObservationRegistry(ObservationRegistry observationRegistry) {
109-
this.observationRegistry = observationRegistry;
62+
super.setObservationRegistry(observationRegistry);
11063
}
11164

112-
/**
113-
* Configure the specified jms listener container factory. The factory can be further
114-
* tuned and default settings can be overridden.
115-
* @param factory the {@link DefaultJmsListenerContainerFactory} instance to configure
116-
* @param connectionFactory the {@link ConnectionFactory} to use
117-
*/
118-
public void configure(DefaultJmsListenerContainerFactory factory, ConnectionFactory connectionFactory) {
119-
Assert.notNull(factory, "'factory' must not be null");
120-
Assert.notNull(connectionFactory, "'connectionFactory' must not be null");
121-
JmsProperties.Listener listenerProperties = this.jmsProperties.getListener();
122-
Session sessionProperties = listenerProperties.getSession();
123-
factory.setConnectionFactory(connectionFactory);
65+
@Override
66+
protected void configure(DefaultJmsListenerContainerFactory factory, ConnectionFactory connectionFactory,
67+
JmsProperties jmsProperties) {
12468
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
125-
map.from(this.jmsProperties::isPubSubDomain).to(factory::setPubSubDomain);
126-
map.from(this.jmsProperties::isSubscriptionDurable).to(factory::setSubscriptionDurable);
127-
map.from(this.jmsProperties::getClientId).to(factory::setClientId);
69+
JmsProperties.Listener listenerProperties = jmsProperties.getListener();
70+
Session sessionProperties = listenerProperties.getSession();
12871
map.from(this.transactionManager).to(factory::setTransactionManager);
129-
map.from(this.destinationResolver).to(factory::setDestinationResolver);
130-
map.from(this.messageConverter).to(factory::setMessageConverter);
131-
map.from(this.exceptionListener).to(factory::setExceptionListener);
132-
map.from(sessionProperties.getAcknowledgeMode()::getMode).to(factory::setSessionAcknowledgeMode);
13372
if (this.transactionManager == null && sessionProperties.getTransacted() == null) {
13473
factory.setSessionTransacted(true);
13574
}
136-
map.from(this.observationRegistry).to(factory::setObservationRegistry);
137-
map.from(sessionProperties::getTransacted).to(factory::setSessionTransacted);
138-
map.from(listenerProperties::isAutoStartup).to(factory::setAutoStartup);
13975
map.from(listenerProperties::formatConcurrency).to(factory::setConcurrency);
14076
map.from(listenerProperties::getReceiveTimeout).as(Duration::toMillis).to(factory::setReceiveTimeout);
14177
map.from(listenerProperties::getMaxMessagesPerTask).to(factory::setMaxMessagesPerTask);

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java‎

Lines changed: 59 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnJndi;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
27+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
2829
import org.springframework.boot.jms.ConnectionFactoryUnwrapper;
2930
import org.springframework.context.annotation.Bean;
3031
import org.springframework.context.annotation.Configuration;
3132
import org.springframework.jms.annotation.EnableJms;
3233
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
3334
import org.springframework.jms.config.JmsListenerConfigUtils;
35+
import org.springframework.jms.config.SimpleJmsListenerContainerFactory;
3436
import org.springframework.jms.support.converter.MessageConverter;
3537
import org.springframework.jms.support.destination.DestinationResolver;
3638
import org.springframework.jms.support.destination.JndiDestinationResolver;
@@ -42,57 +44,75 @@
4244
* @author Phillip Webb
4345
* @author Stephane Nicoll
4446
* @author Eddú Meléndez
47+
* @author Vedran Pavic
4548
*/
4649
@Configuration(proxyBeanMethods = false)
4750
@ConditionalOnClass(EnableJms.class)
4851
class JmsAnnotationDrivenConfiguration {
4952

50-
private final ObjectProvider<DestinationResolver> destinationResolver;
51-
52-
private final ObjectProvider<JtaTransactionManager> transactionManager;
53+
@Configuration(proxyBeanMethods = false)
54+
@ConditionalOnProperty(name = "spring.jms.listener.container-type", havingValue = "default", matchIfMissing = true)
55+
static class DefaultJmsListenerContainerFactoryConfiguration {
5356

54-
private final ObjectProvider<MessageConverter> messageConverter;
57+
@Bean
58+
@ConditionalOnMissingBean
59+
@SuppressWarnings("removal")
60+
DefaultJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer(
61+
ObjectProvider<DestinationResolver> destinationResolver,
62+
ObjectProvider<JtaTransactionManager> transactionManager,
63+
ObjectProvider<MessageConverter> messageConverter, ObjectProvider<ExceptionListener> exceptionListener,
64+
ObjectProvider<ObservationRegistry> observationRegistry, JmsProperties properties) {
65+
DefaultJmsListenerContainerFactoryConfigurer configurer = new DefaultJmsListenerContainerFactoryConfigurer();
66+
configurer.setDestinationResolver(destinationResolver.getIfUnique());
67+
configurer.setTransactionManager(transactionManager.getIfUnique());
68+
configurer.setMessageConverter(messageConverter.getIfUnique());
69+
configurer.setExceptionListener(exceptionListener.getIfUnique());
70+
configurer.setObservationRegistry(observationRegistry.getIfUnique());
71+
configurer.setJmsProperties(properties);
72+
return configurer;
73+
}
5574

56-
private final ObjectProvider<ExceptionListener> exceptionListener;
75+
@Bean
76+
@ConditionalOnSingleCandidate(ConnectionFactory.class)
77+
@ConditionalOnMissingBean(name = "jmsListenerContainerFactory")
78+
DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
79+
DefaultJmsListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
80+
DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
81+
configurer.configure(factory, ConnectionFactoryUnwrapper.unwrapCaching(connectionFactory));
82+
return factory;
83+
}
5784

58-
private final ObjectProvider<ObservationRegistry> observationRegistry;
85+
}
5986

60-
private final JmsProperties properties;
87+
@Configuration(proxyBeanMethods = false)
88+
@ConditionalOnProperty(name = "spring.jms.listener.container-type", havingValue = "simple")
89+
static class SimpleJmsListenerContainerFactoryConfiguration {
6190

62-
JmsAnnotationDrivenConfiguration(ObjectProvider<DestinationResolver> destinationResolver,
63-
ObjectProvider<JtaTransactionManager> transactionManager, ObjectProvider<MessageConverter> messageConverter,
64-
ObjectProvider<ExceptionListener> exceptionListener,
65-
ObjectProvider<ObservationRegistry> observationRegistry, JmsProperties properties) {
66-
this.destinationResolver = destinationResolver;
67-
this.transactionManager = transactionManager;
68-
this.messageConverter = messageConverter;
69-
this.exceptionListener = exceptionListener;
70-
this.observationRegistry = observationRegistry;
71-
this.properties = properties;
72-
}
91+
@Bean
92+
@ConditionalOnMissingBean
93+
SimpleJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer(
94+
ObjectProvider<DestinationResolver> destinationResolver,
95+
ObjectProvider<MessageConverter> messageConverter, ObjectProvider<ExceptionListener> exceptionListener,
96+
ObjectProvider<ObservationRegistry> observationRegistry, JmsProperties properties) {
97+
SimpleJmsListenerContainerFactoryConfigurer configurer = new SimpleJmsListenerContainerFactoryConfigurer();
98+
configurer.setDestinationResolver(destinationResolver.getIfUnique());
99+
configurer.setMessageConverter(messageConverter.getIfUnique());
100+
configurer.setExceptionListener(exceptionListener.getIfUnique());
101+
configurer.setObservationRegistry(observationRegistry.getIfUnique());
102+
configurer.setJmsProperties(properties);
103+
return configurer;
104+
}
73105

74-
@Bean
75-
@ConditionalOnMissingBean
76-
@SuppressWarnings("removal")
77-
DefaultJmsListenerContainerFactoryConfigurer jmsListenerContainerFactoryConfigurer() {
78-
DefaultJmsListenerContainerFactoryConfigurer configurer = new DefaultJmsListenerContainerFactoryConfigurer();
79-
configurer.setDestinationResolver(this.destinationResolver.getIfUnique());
80-
configurer.setTransactionManager(this.transactionManager.getIfUnique());
81-
configurer.setMessageConverter(this.messageConverter.getIfUnique());
82-
configurer.setExceptionListener(this.exceptionListener.getIfUnique());
83-
configurer.setObservationRegistry(this.observationRegistry.getIfUnique());
84-
configurer.setJmsProperties(this.properties);
85-
return configurer;
86-
}
106+
@Bean
107+
@ConditionalOnSingleCandidate(ConnectionFactory.class)
108+
@ConditionalOnMissingBean(name = "jmsListenerContainerFactory")
109+
SimpleJmsListenerContainerFactory jmsListenerContainerFactory(
110+
SimpleJmsListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
111+
SimpleJmsListenerContainerFactory factory = new SimpleJmsListenerContainerFactory();
112+
configurer.configure(factory, ConnectionFactoryUnwrapper.unwrapCaching(connectionFactory));
113+
return factory;
114+
}
87115

88-
@Bean
89-
@ConditionalOnSingleCandidate(ConnectionFactory.class)
90-
@ConditionalOnMissingBean(name = "jmsListenerContainerFactory")
91-
DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
92-
DefaultJmsListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory) {
93-
DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
94-
configurer.configure(factory, ConnectionFactoryUnwrapper.unwrapCaching(connectionFactory));
95-
return factory;
96116
}
97117

98118
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)