From be1296dddaa61a2a8795eef2685da57d1c030496 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 5 Feb 2010 11:45:48 +0000 Subject: [PATCH] Generified support module --- .../ws/transport/jms/WebServiceMessageListener.java | 4 ++-- .../ws/transport/jms/support/JmsTransportUtils.java | 2 +- .../ws/transport/mail/MailMessageReceiver.java | 4 ++-- .../ws/transport/mail/MailReceiverConnection.java | 2 +- .../ws/transport/mail/MailSenderConnection.java | 2 +- .../mail/monitor/AbstractMonitoringStrategy.java | 6 +++--- .../mail/monitor/ImapIdleMonitoringStrategy.java | 7 ++++--- .../mail/monitor/Pop3PollingMonitoringStrategy.java | 4 ++-- .../ws/transport/mail/support/MailTransportUtils.java | 10 +++++----- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java b/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java index 86647fd2..6b98ac8b 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/WebServiceMessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2005-2010 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. @@ -38,7 +38,7 @@ import org.springframework.ws.transport.WebServiceMessageReceiver; * @see #setMessageReceiver(org.springframework.ws.transport.WebServiceMessageReceiver) * @since 1.5.0 */ -public class WebServiceMessageListener extends JmsMessageReceiver implements SessionAwareMessageListener { +public class WebServiceMessageListener extends JmsMessageReceiver implements SessionAwareMessageListener { public void onMessage(Message message, Session session) throws JMSException { try { diff --git a/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java b/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java index 20cd1772..df4a1c1d 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java @@ -131,7 +131,7 @@ public abstract class JmsTransportUtils { * #jmsPropertyToHeader(String)}. */ public static Iterator getHeaderNames(Message message) throws JMSException { - Enumeration properties = message.getPropertyNames(); + Enumeration properties = message.getPropertyNames(); List results = new ArrayList(); while (properties.hasMoreElements()) { String property = (String) properties.nextElement(); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java b/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java index 34a410a0..c4e84ba7 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailMessageReceiver.java @@ -220,8 +220,8 @@ public class MailMessageReceiver extends AbstractAsyncStandaloneMessageReceiver while (isRunning()) { try { Message[] messages = monitoringStrategy.monitor(folder); - for (int i = 0; i < messages.length; i++) { - MessageHandler handler = new MessageHandler(messages[i]); + for (Message message : messages) { + MessageHandler handler = new MessageHandler(message); execute(handler); } } diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java index bdceccef..2cf5a068 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java @@ -137,7 +137,7 @@ public class MailReceiverConnection extends AbstractReceiverConnection { protected Iterator getRequestHeaderNames() throws IOException { try { List headers = new ArrayList(); - Enumeration enumeration = requestMessage.getAllHeaders(); + Enumeration enumeration = requestMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); headers.add(header.getName()); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java index d2a53e12..1aa69294 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java @@ -258,7 +258,7 @@ public class MailSenderConnection extends AbstractSenderConnection { protected Iterator getResponseHeaderNames() throws IOException { try { List headers = new ArrayList(); - Enumeration enumeration = responseMessage.getAllHeaders(); + Enumeration enumeration = responseMessage.getAllHeaders(); while (enumeration.hasMoreElements()) { Header header = (Header) enumeration.nextElement(); headers.add(header.getName()); diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java index 257506fd..d152891f 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -157,8 +157,8 @@ public abstract class AbstractMonitoringStrategy implements MonitoringStrategy { * @throws MessagingException in case of JavaMail errors */ protected void deleteMessages(Folder folder, Message[] messages) throws MessagingException { - for (int i = 0; i < messages.length; i++) { - messages[i].setFlag(Flags.Flag.DELETED, true); + for (Message message : messages) { + message.setFlag(Flags.Flag.DELETED, true); } } } diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java index d2d6bad6..368f66ac 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/ImapIdleMonitoringStrategy.java @@ -23,9 +23,10 @@ import javax.mail.event.MessageCountAdapter; import javax.mail.event.MessageCountEvent; import javax.mail.event.MessageCountListener; -import com.sun.mail.imap.IMAPFolder; import org.springframework.util.Assert; +import com.sun.mail.imap.IMAPFolder; + /** * Implementation of the {@link MonitoringStrategy} interface that uses the IMAP IDLE command for asynchronous message * detection. @@ -65,10 +66,10 @@ public class ImapIdleMonitoringStrategy extends AbstractMonitoringStrategy { @Override public void messagesAdded(MessageCountEvent e) { Message[] messages = e.getMessages(); - for (int i = 0; i < messages.length; i++) { + for (Message message : messages) { try { // this will return the flow to the idle call, above - messages[i].getLineCount(); + message.getLineCount(); } catch (MessagingException ex) { // ignore diff --git a/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java b/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java index 3820a6ee..db4929b3 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/monitor/Pop3PollingMonitoringStrategy.java @@ -74,8 +74,8 @@ public class Pop3PollingMonitoringStrategy extends PollingMonitoringStrategy { protected void deleteMessages(Folder folder, Message[] messages) throws MessagingException { super.deleteMessages(folder, messages); // expunge deleted mails, and make sure we've retrieved them before closing the folder - for (int i = 0; i < messages.length; i++) { - new MimeMessage((MimeMessage) messages[i]); + for (Message message : messages) { + new MimeMessage((MimeMessage) message); } MailTransportUtils.closeFolder(folder, true); } diff --git a/support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java b/support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java index 78371938..d098606b 100644 --- a/support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java +++ b/support/src/main/java/org/springframework/ws/transport/mail/support/MailTransportUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2005-2010 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. @@ -29,12 +29,12 @@ import javax.mail.URLName; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.util.StringUtils; import org.springframework.ws.transport.mail.MailTransportConstants; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Collection of utility methods to work with Mail transports. * @@ -135,7 +135,7 @@ public abstract class MailTransportUtils { int port = name.getPort(); String file = name.getFile(); String ref = name.getRef(); - StringBuffer tempURL = new StringBuffer(); + StringBuilder tempURL = new StringBuilder(); if (protocol != null) { tempURL.append(protocol).append(':'); }