From 4aace564a26fad2652e4d069011613af95a70045 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 16 Jul 2015 15:28:24 +0200 Subject: [PATCH] Fix typo Closes gh-3519 --- .../jms/JmsAnnotationDrivenConfiguration.java | 4 ++-- .../boot/autoconfigure/jms/JmsProperties.java | 18 +++++++++--------- .../jms/JmsAutoConfigurationTests.java | 2 +- .../appendix-application-properties.adoc | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java index 69cb1ac86c..07d3c4a0e7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java @@ -68,8 +68,8 @@ class JmsAnnotationDrivenConfiguration { factory.setDestinationResolver(this.destinationResolver); } JmsProperties.Listener listener = this.properties.getListener(); - if (listener.getAcknowledgmentMode() != null) { - factory.setSessionAcknowledgeMode(listener.getAcknowledgmentMode().getMode()); + if (listener.getAcknowledgeMode() != null) { + factory.setSessionAcknowledgeMode(listener.getAcknowledgeMode().getMode()); } String concurrency = listener.formatConcurrency(); if (concurrency != null) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index e8702a1b4b..bc7e36305a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -63,10 +63,10 @@ public class JmsProperties { public static class Listener { /** - * Acknowledgment mode of the container. By default, the listener is + * Acknowledge mode of the container. By default, the listener is * transacted with automatic acknowledgment. */ - private AcknowledgmentMode acknowledgmentMode; + private AcknowledgeMode acknowledgeMode; /** * Minimum number of concurrent consumers. @@ -78,12 +78,12 @@ public class JmsProperties { */ private Integer maxConcurrency; - public AcknowledgmentMode getAcknowledgmentMode() { - return acknowledgmentMode; + public AcknowledgeMode getAcknowledgeMode() { + return acknowledgeMode; } - public void setAcknowledgmentMode(AcknowledgmentMode acknowledgmentMode) { - this.acknowledgmentMode = acknowledgmentMode; + public void setAcknowledgeMode(AcknowledgeMode acknowledgeMode) { + this.acknowledgeMode = acknowledgeMode; } public Integer getConcurrency() { @@ -112,12 +112,12 @@ public class JmsProperties { } /** - * Translate the acknowledgment modes defined on the {@link javax.jms.Session}. + * Translate the acknowledge modes defined on the {@link javax.jms.Session}. * *

{@link javax.jms.Session#SESSION_TRANSACTED} is not defined as we take * care of this already via a call to {@code setSessionTransacted}. */ - public enum AcknowledgmentMode { + public enum AcknowledgeMode { /** * Messages sent or received from the session are automatically acknowledged. This @@ -141,7 +141,7 @@ public class JmsProperties { private final int mode; - AcknowledgmentMode(int mode) { + AcknowledgeMode(int mode) { this.mode = mode; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 4d2f98cc88..e243b5e5fc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -147,7 +147,7 @@ public class JmsAutoConfigurationTests { @Test public void testJmsListenerContainerFactoryWithCustomSettings() { load(EnableJmsConfiguration.class, - "spring.jms.listener.acknowledgmentMode=client", + "spring.jms.listener.acknowledgeMode=client", "spring.jms.listener.concurrency=2", "spring.jms.listener.maxConcurrency=10"); JmsListenerContainerFactory jmsListenerContainerFactory = this.context 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 d9163e1778..65a6b3e4fc 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -528,9 +528,9 @@ content into your application; rather pick only the properties that you need. # JMS ({sc-spring-boot-autoconfigure}/jms/JmsProperties.{sc-ext}[JmsProperties]) spring.jms.jndi-name= # JNDI location of a JMS ConnectionFactory - spring.jms.listener.acknowledgment-mode= # session acknowledgment mode + spring.jms.listener.acknowledge-mode= # session acknowledgment mode spring.jms.listener.concurrency= # minimum number of concurrent consumers - spring.jms.listener.maxConcurrency= # maximum number of concurrent consumers + spring.jms.listener.max-concurrency= # maximum number of concurrent consumers spring.jms.pub-sub-domain= # false for queue (default), true for topic # Email ({sc-spring-boot-autoconfigure}/mail/MailProperties.{sc-ext}[MailProperties])