Polish "Configure ActiveMQConnectionFactory properly without spring-jms"

See gh-17531

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.autoconfigure.jms.activemq;
 
-import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.jms.ConnectionFactory;
@@ -48,12 +47,6 @@ import org.springframework.jms.connection.CachingConnectionFactory;
 @ConditionalOnMissingBean(ConnectionFactory.class)
 class ActiveMQConnectionFactoryConfiguration {
 
-	private static ActiveMQConnectionFactory createConnectionFactory(ActiveMQProperties properties,
-			List<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
-		return new ActiveMQConnectionFactoryFactory(properties, connectionFactoryCustomizers)
-				.createConnectionFactory(ActiveMQConnectionFactory.class);
-	}
-
 	@Configuration
 	@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false",
 			matchIfMissing = true)
@@ -62,9 +55,10 @@ class ActiveMQConnectionFactoryConfiguration {
 		@Bean
 		@ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false")
 		public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
-				ObjectProvider<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
+				ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
-			return createConnectionFactory(properties,
+			return new ActiveMQConnectionFactoryFactory(properties,
-					connectionFactoryCustomizers.orderedStream().collect(Collectors.toList()));
+					factoryCustomizers.orderedStream().collect(Collectors.toList()))
+							.createConnectionFactory(ActiveMQConnectionFactory.class);
 		}
 
 		@ConditionalOnClass(CachingConnectionFactory.class)
@@ -77,10 +71,12 @@ class ActiveMQConnectionFactoryConfiguration {
 					matchIfMissing = true)
 			public CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties,
 					ActiveMQProperties properties,
-					ObjectProvider<ActiveMQConnectionFactoryCustomizer> connectionFactoryCustomizers) {
+					ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
 				JmsProperties.Cache cacheProperties = jmsProperties.getCache();
-				CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory(
+				CachingConnectionFactory connectionFactory = new CachingConnectionFactory(
-						properties, connectionFactoryCustomizers.orderedStream().collect(Collectors.toList())));
+						new ActiveMQConnectionFactoryFactory(properties,
+								factoryCustomizers.orderedStream().collect(Collectors.toList()))
+										.createConnectionFactory(ActiveMQConnectionFactory.class));
 				connectionFactory.setCacheConsumers(cacheProperties.isConsumers());
 				connectionFactory.setCacheProducers(cacheProperties.isProducers());
 				connectionFactory.setSessionCacheSize(cacheProperties.getSessionCacheSize());
@@ -99,8 +95,9 @@ class ActiveMQConnectionFactoryConfiguration {
 		@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true")
 		public JmsPoolConnectionFactory pooledJmsConnectionFactory(ActiveMQProperties properties,
 				ObjectProvider<ActiveMQConnectionFactoryCustomizer> factoryCustomizers) {
-			ActiveMQConnectionFactory connectionFactory = createConnectionFactory(properties,
+			ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties,
-					factoryCustomizers.orderedStream().collect(Collectors.toList()));
+					factoryCustomizers.orderedStream().collect(Collectors.toList()))
+							.createConnectionFactory(ActiveMQConnectionFactory.class);
 			return new JmsPoolConnectionFactoryFactory(properties.getPool())
 					.createPooledConnectionFactory(connectionFactory);
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java

@@ -24,6 +24,7 @@ import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -202,6 +203,20 @@ public class ActiveMQAutoConfigurationTests {
 				});
 	}
 
+	@Test
+	public void cachingConnectionFactoryNotOnTheClasspathThenSimpleConnectionFactoryAutoConfigured() {
+		this.contextRunner.withClassLoader(new FilteredClassLoader(CachingConnectionFactory.class))
+				.withPropertyValues("spring.activemq.pool.enabled=false", "spring.jms.cache.enabled=false")
+				.run((context) -> assertThat(context).hasSingleBean(ActiveMQConnectionFactory.class));
+	}
+
+	@Test
+	public void cachingConnectionFactoryNotOnTheClasspathAndCacheEnabledThenSimpleConnectionFactoryNotConfigured() {
+		this.contextRunner.withClassLoader(new FilteredClassLoader(CachingConnectionFactory.class))
+				.withPropertyValues("spring.activemq.pool.enabled=false", "spring.jms.cache.enabled=true")
+				.run((context) -> assertThat(context).doesNotHaveBean(ActiveMQConnectionFactory.class));
+	}
+
 	@Configuration
 	static class EmptyConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2012-2019 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.boot.autoconfigure.jms.activemq;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.Test;
-
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.FilteredClassLoader;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.jms.connection.CachingConnectionFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link ActiveMQConnectionFactoryConfiguration} when
- * {@link CachingConnectionFactory} is not on the classpath.
- *
- * @author Dmytro Nosan
- */
-public class ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests {
-
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(ActiveMQAutoConfiguration.class))
-			.withClassLoader(new FilteredClassLoader(CachingConnectionFactory.class));
-
-	@Test
-	public void cachingConnectionFactoryNotOnTheClasspathThenSimpleConnectionFactoryAutoConfigured() {
-		this.contextRunner.withPropertyValues("spring.activemq.pool.enabled=false", "spring.jms.cache.enabled=false")
-				.run((context) -> assertThat(context).hasSingleBean(ActiveMQConnectionFactory.class));
-	}
-
-	@Test
-	public void cachingConnectionFactoryNotOnTheClasspathAndCacheEnabledThenSimpleConnectionFactoryNotConfigured() {
-		this.contextRunner.withPropertyValues("spring.activemq.pool.enabled=false", "spring.jms.cache.enabled=true")
-				.run((context) -> assertThat(context).doesNotHaveBean(ActiveMQConnectionFactory.class));
-	}
-
-}