From 77b52b993bf6709913c12ae3c7872e25fc01bbb2 Mon Sep 17 00:00:00 2001 From: Dmytro Nosan Date: Thu, 11 Jul 2019 11:58:56 +0300 Subject: [PATCH 1/2] Configure ActiveMQConnectionFactory properly without spring-jms See gh-17531 --- ...ctiveMQConnectionFactoryConfiguration.java | 66 +++++++++---------- ...sWithoutCachingConnectionFactoryTests.java | 53 +++++++++++++++ 2 files changed, 84 insertions(+), 35 deletions(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index 630823f081..aec135bc4a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -48,47 +48,45 @@ import org.springframework.jms.connection.CachingConnectionFactory; @ConditionalOnMissingBean(ConnectionFactory.class) class ActiveMQConnectionFactoryConfiguration { + private static ActiveMQConnectionFactory createConnectionFactory(ActiveMQProperties properties, + List connectionFactoryCustomizers) { + return new ActiveMQConnectionFactoryFactory(properties, connectionFactoryCustomizers) + .createConnectionFactory(ActiveMQConnectionFactory.class); + } + @Configuration - @ConditionalOnClass(CachingConnectionFactory.class) @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false", matchIfMissing = true) static class SimpleConnectionFactoryConfiguration { - private final JmsProperties jmsProperties; - - private final ActiveMQProperties properties; - - private final List connectionFactoryCustomizers; - - SimpleConnectionFactoryConfiguration(JmsProperties jmsProperties, ActiveMQProperties properties, + @Bean + @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false") + public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties, ObjectProvider connectionFactoryCustomizers) { - this.jmsProperties = jmsProperties; - this.properties = properties; - this.connectionFactoryCustomizers = connectionFactoryCustomizers.orderedStream() - .collect(Collectors.toList()); + return createConnectionFactory(properties, + connectionFactoryCustomizers.orderedStream().collect(Collectors.toList())); } - @Bean + @ConditionalOnClass(CachingConnectionFactory.class) @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true", matchIfMissing = true) - public CachingConnectionFactory cachingJmsConnectionFactory() { - JmsProperties.Cache cacheProperties = this.jmsProperties.getCache(); - CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory()); - connectionFactory.setCacheConsumers(cacheProperties.isConsumers()); - connectionFactory.setCacheProducers(cacheProperties.isProducers()); - connectionFactory.setSessionCacheSize(cacheProperties.getSessionCacheSize()); - return connectionFactory; - } - - @Bean - @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "false") - public ActiveMQConnectionFactory jmsConnectionFactory() { - return createConnectionFactory(); - } + static class CachingConnectionFactoryConfiguration { + + @Bean + @ConditionalOnProperty(prefix = "spring.jms.cache", name = "enabled", havingValue = "true", + matchIfMissing = true) + public CachingConnectionFactory cachingJmsConnectionFactory(JmsProperties jmsProperties, + ActiveMQProperties properties, + ObjectProvider 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; + } - private ActiveMQConnectionFactory createConnectionFactory() { - return new ActiveMQConnectionFactoryFactory(this.properties, this.connectionFactoryCustomizers) - .createConnectionFactory(ActiveMQConnectionFactory.class); } } @@ -98,13 +96,11 @@ class ActiveMQConnectionFactoryConfiguration { static class PooledConnectionFactoryConfiguration { @Bean(destroyMethod = "stop") - @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true", - matchIfMissing = false) + @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true") public JmsPoolConnectionFactory pooledJmsConnectionFactory(ActiveMQProperties properties, ObjectProvider factoryCustomizers) { - ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties, - factoryCustomizers.orderedStream().collect(Collectors.toList())) - .createConnectionFactory(ActiveMQConnectionFactory.class); + ActiveMQConnectionFactory connectionFactory = createConnectionFactory(properties, + factoryCustomizers.orderedStream().collect(Collectors.toList())); return new JmsPoolConnectionFactoryFactory(properties.getPool()) .createPooledConnectionFactory(connectionFactory); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java new file mode 100644 index 0000000000..11600df164 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java @@ -0,0 +1,53 @@ +/* + * 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)); + } + +} From 1661da87744543bd525d3ba96fe00cb1ec458bad Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 22 Jul 2019 13:09:31 +0200 Subject: [PATCH 2/2] Polish "Configure ActiveMQConnectionFactory properly without spring-jms" See gh-17531 --- ...ctiveMQConnectionFactoryConfiguration.java | 27 +++++----- .../ActiveMQAutoConfigurationTests.java | 15 ++++++ ...sWithoutCachingConnectionFactoryTests.java | 53 ------------------- 3 files changed, 27 insertions(+), 68 deletions(-) delete mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index aec135bc4a..bad6a76370 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/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 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 connectionFactoryCustomizers) { - return createConnectionFactory(properties, - connectionFactoryCustomizers.orderedStream().collect(Collectors.toList())); + ObjectProvider factoryCustomizers) { + return new ActiveMQConnectionFactoryFactory(properties, + 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 connectionFactoryCustomizers) { + ObjectProvider factoryCustomizers) { JmsProperties.Cache cacheProperties = jmsProperties.getCache(); - CachingConnectionFactory connectionFactory = new CachingConnectionFactory(createConnectionFactory( - properties, connectionFactoryCustomizers.orderedStream().collect(Collectors.toList()))); + CachingConnectionFactory connectionFactory = new CachingConnectionFactory( + 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 factoryCustomizers) { - ActiveMQConnectionFactory connectionFactory = createConnectionFactory(properties, - factoryCustomizers.orderedStream().collect(Collectors.toList())); + ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(properties, + factoryCustomizers.orderedStream().collect(Collectors.toList())) + .createConnectionFactory(ActiveMQConnectionFactory.class); return new JmsPoolConnectionFactoryFactory(properties.getPool()) .createPooledConnectionFactory(connectionFactory); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index d060ebf176..4d27e164bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/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 { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java deleted file mode 100644 index 11600df164..0000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTestsWithoutCachingConnectionFactoryTests.java +++ /dev/null @@ -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)); - } - -}