From c4ffe721c786c54074a6913cb889d46e83bb32c1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 25 Apr 2014 11:29:52 +0300 Subject: [PATCH] Fix JmsTemplate default pubSubDomain setting Prior to this commit, a JmsTemplate bean created automatically by Boot had its "pubSubDomain" flag enabled. It's far more usual to fallback on queue rather than topic. This commit flips the default value of the configuration property. --- .../boot/autoconfigure/jms/JmsTemplateProperties.java | 2 +- .../jms/JmsTemplateAutoConfigurationTests.java | 10 +++++----- .../main/asciidoc/appendix-application-properties.adoc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java index 8da31178b6..2fe3eceefe 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java @@ -21,7 +21,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "spring.jms") public class JmsTemplateProperties { - private boolean pubSubDomain = true; + private boolean pubSubDomain = false; public boolean isPubSubDomain() { return this.pubSubDomain; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java index ea7ade86dc..b745c96ded 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfigurationTests.java @@ -94,23 +94,23 @@ public class JmsTemplateAutoConfigurationTests { } @Test - public void testPubSubEnabledByDefault() { + public void testPubSubDisabledByDefault() { this.context = new AnnotationConfigApplicationContext(); this.context .register(TestConfiguration.class, JmsTemplateAutoConfiguration.class); this.context.refresh(); JmsTemplate jmsTemplate = this.context.getBean(JmsTemplate.class); - assertTrue(jmsTemplate.isPubSubDomain()); + assertFalse(jmsTemplate.isPubSubDomain()); } @Test - public void testJmsTemplatePostProcessedSoThatPubSubIsFalse() { + public void testJmsTemplatePostProcessedSoThatPubSubIsTrue() { this.context = new AnnotationConfigApplicationContext(); this.context.register(TestConfiguration4.class, JmsTemplateAutoConfiguration.class); this.context.refresh(); JmsTemplate jmsTemplate = this.context.getBean(JmsTemplate.class); - assertFalse(jmsTemplate.isPubSubDomain()); + assertTrue(jmsTemplate.isPubSubDomain()); } @Test @@ -262,7 +262,7 @@ public class JmsTemplateAutoConfigurationTests { throws BeansException { if (bean.getClass().isAssignableFrom(JmsTemplate.class)) { JmsTemplate jmsTemplate = (JmsTemplate) bean; - jmsTemplate.setPubSubDomain(false); + jmsTemplate.setPubSubDomain(true); } return bean; } diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 7618780d83..9c2e5e1c60 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -171,7 +171,7 @@ content into your application; rather pick only the properties that you need. spring.activemq.pooled=false # JMS ({sc-spring-boot-autoconfigure}/jms/JmsTemplateProperties.{sc-ext}[JmsTemplateProperties]) - spring.jms.pub-sub-domain= + spring.jms.pub-sub-domain= # false for queue (default), true for topic # SPRING BATCH ({sc-spring-boot-autoconfigure}/batch/BatchDatabaseInitializer.{sc-ext}[BatchDatabaseInitializer]) spring.batch.job.names=job1,job2