From d0f1fdde1067c62f74db334ac60fc70ba6b44107 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 22 Nov 2010 18:28:02 -0500 Subject: [PATCH] fixing typos in comments and tests --- .../handler/AbstractReplyProducingMessageHandler.java | 2 +- .../integration/core/MessagingTemplateTests.java | 2 +- .../integration/mail/AbstractMailReceiver.java | 2 +- .../mail/MailSendingMessageHandlerContextTests.java | 2 +- .../integration/mail/config/failed-adapter-config.xml | 4 ++-- .../integration/mail/config/failed-imap-config.xml | 4 ++-- .../mail/config/imap-google-sample-config.xml | 10 +++++----- .../security/channel/DefaultChannelAccessPolicy.java | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index 5f6cf856ca..5d2f54356f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -180,7 +180,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa } else { throw new MessageDeliveryException(message, - "a non-null reply channel value of type MesssageChannel or String is required"); + "a non-null reply channel value of type MessageChannel or String is required"); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java index f39d092f64..d521637b9d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java @@ -470,7 +470,7 @@ public class MessagingTemplateTests { } @Test - public void recieveAndConvertFromDefaultChannel() { + public void receiveAndConvertFromDefaultChannel() { QueueChannel channel = new QueueChannel(); channel.send(new GenericMessage("test")); MessagingTemplate template = new MessagingTemplate(); diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java index 6908833e84..463af76210 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java @@ -289,7 +289,7 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl } /** * Optional method allowing you to set additional flags. - * Currently only implemented in IMapMailReceiever. + * Currently only implemented in IMapMailReceiver. * * @param message * @throws MessagingException diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java index c3e152a507..12bdc273ee 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java @@ -58,7 +58,7 @@ public class MailSendingMessageHandlerContextTests { } @Test - public void stringMesssagesWithConfiguration() { + public void stringMessagesWithConfiguration() { this.handler.handleMessage(MailTestsHelper.createIntegrationMessage()); SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage(); assertEquals("no mime message should have been sent", diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml index 83f76ce46a..b8b792e8ef 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-adapter-config.xml @@ -7,10 +7,10 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mail="http://www.springframework.org/schema/integration/mail"> - + + channel="receiveChannel"> diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml index a47cddc3e1..806ef377ec 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/failed-imap-config.xml @@ -7,9 +7,9 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mail="http://www.springframework.org/schema/integration/mail"> - + + channel="receiveChannel"/> diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml index 1350643ded..202de646a5 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/imap-google-sample-config.xml @@ -20,7 +20,7 @@ @@ -28,7 +28,7 @@ @@ -36,10 +36,10 @@ - + - - + + diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/DefaultChannelAccessPolicy.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/DefaultChannelAccessPolicy.java index dcef1f619e..0f53cc5956 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/DefaultChannelAccessPolicy.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/DefaultChannelAccessPolicy.java @@ -48,8 +48,8 @@ public class DefaultChannelAccessPolicy implements ChannelAccessPolicy { @SuppressWarnings("unchecked") public DefaultChannelAccessPolicy(String sendAccess, String receiveAccess) { boolean sendAccessDefined = StringUtils.hasText(sendAccess); - boolean recieveAccessDefined = StringUtils.hasText(receiveAccess); - Assert.isTrue(sendAccessDefined || recieveAccessDefined, + boolean receiveAccessDefined = StringUtils.hasText(receiveAccess); + Assert.isTrue(sendAccessDefined || receiveAccessDefined, "At least one of 'sendAccess' and 'receiveAccess' must not be null."); if (sendAccessDefined) { String[] sendAccessValues = StringUtils.commaDelimitedListToStringArray(sendAccess); @@ -61,7 +61,7 @@ public class DefaultChannelAccessPolicy implements ChannelAccessPolicy { else { configAttributeDefinitionForSend = Collections.EMPTY_SET; } - if (recieveAccessDefined) { + if (receiveAccessDefined) { String[] receiveAccessValues = StringUtils.commaDelimitedListToStringArray(receiveAccess); configAttributeDefinitionForReceive = new HashSet(); for (String receiveAccessValue : receiveAccessValues) {