ActiveMQConnectionFactory is not configured when CachingConnectionFactory is missing and enabled properties are false

[nosan]

When both properties spring.activemq.pool.enabled and spring.jms.cache.enabled set to false and CachingConnectionFactory is not on the classpath then ActiveMQAutoConfiguration will not register ActiveMQConnectionFactory bean.

@RunWith(ModifiedClassPathRunner.class)
@ClassPathExclusions("spring-jms-*.jar")
public class ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests {

	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
			.withConfiguration(AutoConfigurations.of(ActiveMQAutoConfiguration.class));

	@Test
	public void whenThereIsNoCachingConnectionFactoryOnTheClasspathThenSimpleConnectionFactoryAutoConfigured() {
		this.contextRunner.withPropertyValues("spring.activemq.pool.enabled=false", "spring.jms.cache.enabled=false")
				.run((context) -> assertThat(context).hasSingleBean(ActiveMQConnectionFactory.class));
	}

}

It happens because @ConditionalOnClass(CachingConnectionFactory.class) is present on ActiveMQConnectionFactoryConfiguration$SimpleConnectionFactoryConfiguration configuration class.

[nosan]

Here is a possible fix:

Click to expand

@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(ConnectionFactory.class)
class ActiveMQConnectionFactoryConfiguration {

	private static ActiveMQConnectionFactory createConnectionFactory(ActiveMQProperties properties,
			List<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
		return new ActiveMQConnectionFactoryFactory(properties, connectionFactoryCustomizers)
				.createConnectionFactory(ActiveMQConnectionFactory.class);
	}

	@Configuration(proxyBeanMethods = false)
	@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false",
			matchIfMissing = true)
	static class SimpleConnectionFactoryConfiguration {

		@ConditionalOnClass(CachingConnectionFactory.class)
		@ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true",
				matchIfMissing = true)
		static class CachingConnectionFactoryConfiguration {

			@Bean
			@ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true",
					matchIfMissing = true)
			CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties,
					ActiveMQProperties properties,
					ObjectProvider<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
				JmsProperties.Cache cacheProperties = jmsProperties.getCache();
				CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory(
						properties, connectionFactoryCustomizers.orderedStream().collect(Collectors.toList())));
				connectionFactory.setCacheConsumers(cacheProperties.isConsumers());
				connectionFactory.setCacheProducers(cacheProperties.isProducers());
				connectionFactory.setSessionCacheSize(cacheProperties.getSessionCacheSize());
				return connectionFactory;
			}

		}

		@Bean
		@ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false")
		ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
				ObjectProvider<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
			return createConnectionFactory(properties,
					connectionFactoryCustomizers.orderedStream().collect(Collectors.toList()));
		}

	}

	@Configuration(proxyBeanMethods = false)
	@ConditionalOnClass({ JmsPoolConnectionFactory.class, PooledObject.class })
	static class PooledConnectionFactoryConfiguration {

		@Bean(destroyMethod = "stop")
		@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true",
				matchIfMissing = false)
		JmsPoolConnectionFactory pooledJmsConnectionFactory(ActiveMQProperties properties,
				ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
			ActiveMQConnectionFactory connectionFactory = createConnectionFactory(properties,
					factoryCustomizers.orderedStream().collect(Collectors.toList()));
			return new JmsPoolConnectionFactoryFactory(properties.getPool())
					.createPooledConnectionFactory(connectionFactory);
		}

	}

}

[snicoll]

Closing in favour of PR #17531