You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2009/08/28 00:17:48 UTC
svn commit: r808664 - in
/servicemix/components/bindings/servicemix-mail/trunk/src:
main/java/org/apache/servicemix/mail/
main/java/org/apache/servicemix/mail/marshaler/
main/java/org/apache/servicemix/mail/security/
main/java/org/apache/servicemix/mai...
Author: lhein
Date: Thu Aug 27 22:17:48 2009
New Revision: 808664
URL: http://svn.apache.org/viewvc?rev=808664&view=rev
Log:
minor improvements to be more rules compliant (see SMXCOMP-520)
Modified:
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailComponent.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/AbstractMailMarshaler.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailConnectionConfiguration.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailContentType.java
servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java
servicemix/components/bindings/servicemix-mail/trunk/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailComponent.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailComponent.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailComponent.java Thu Aug 27 22:17:48 2009
@@ -16,10 +16,10 @@
*/
package org.apache.servicemix.mail;
-import java.util.List;
-
import org.apache.servicemix.common.DefaultComponent;
+import java.util.List;
+
/**
* @org.apache.xbean.XBean element="component" description="Mail Component"
*
@@ -30,7 +30,7 @@
/**
*
- * @return
+ * @return all available endpoint classes
*/
public MailEndpointType[] getEndpoints() {
return endpoints;
@@ -38,7 +38,7 @@
/**
*
- * @param endpoints
+ * @param endpoints the endpoints
*/
public void setEndpoints(MailEndpointType[] endpoints) {
this.endpoints = endpoints;
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailPollerEndpoint.java Thu Aug 27 22:17:48 2009
@@ -16,34 +16,25 @@
*/
package org.apache.servicemix.mail;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.common.endpoints.PollingEndpoint;
+import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
+import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
+import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
+import org.apache.servicemix.mail.utils.MailUtils;
import javax.jbi.JBIException;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
-import javax.mail.Flags;
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Store;
+import javax.mail.*;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
import javax.mail.search.FlagTerm;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.common.endpoints.PollingEndpoint;
-import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
-import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
-import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
-import org.apache.servicemix.mail.utils.MailUtils;
+import java.io.IOException;
+import java.util.*;
/**
* This is the polling endpoint for the mail component.
@@ -181,7 +172,7 @@
Store store = null;
Folder folder = null;
- Session session = null;
+ Session session;
try {
Properties props = MailUtils.getPropertiesForProtocol(this.config, this.customTrustManagers);
props.put("mail.debug", isDebugMode() ? "true" : "false");
@@ -203,7 +194,7 @@
}
folder.open(Folder.READ_WRITE);
- Message[] messages = null;
+ Message[] messages;
if (isProcessOnlyUnseenMessages() && !isPopProtocol) {
messages = folder.search(new FlagTerm(new Flags(Flags.Flag.SEEN), false));
} else {
@@ -213,19 +204,19 @@
int fetchSize = getMaxFetchSize() == -1 ? messages.length : Math.min(getMaxFetchSize(),
messages.length);
int fetchedMessages = 0;
- String uid = null;
+ String uid;
- for (int cnt = 0; cnt < messages.length; cnt++) {
+ for (Message msg : messages) {
uid = null;
// get the message
- MimeMessage mailMsg = (MimeMessage)messages[cnt];
+ MimeMessage mailMsg = (MimeMessage)msg;
if (isProcessOnlyUnseenMessages() && isPopProtocol) {
// POP3 doesn't support flags, so we need to check manually
// if message is new or not
try {
- Object ouid = folder.getClass().getMethod("getUID", new Class[] { Message.class }).invoke(folder, new Object[] { mailMsg });
+ Object ouid = folder.getClass().getMethod("getUID", Message.class).invoke(folder, mailMsg);
// remember each found message
if (ouid != null) {
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/MailSenderEndpoint.java Thu Aug 27 22:17:48 2009
@@ -16,9 +16,14 @@
*/
package org.apache.servicemix.mail;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.common.endpoints.ProviderEndpoint;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
+import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
+import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
+import org.apache.servicemix.mail.utils.MailUtils;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.ExchangeStatus;
@@ -29,15 +34,9 @@
import javax.mail.Transport;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.common.endpoints.ProviderEndpoint;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
-import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
-import org.apache.servicemix.mail.utils.MailConnectionConfiguration;
-import org.apache.servicemix.mail.utils.MailUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
* this is the sending endpoint for the mail component
@@ -81,16 +80,16 @@
protected void processInOnly(MessageExchange exchange, NormalizedMessage in) throws Exception {
// Exchange is finished
if (exchange.getStatus() == ExchangeStatus.DONE) {
- return;
+ //return;
} else if (exchange.getStatus() == ExchangeStatus.ERROR) {
// Exchange has been aborted with an exception
- return;
+ //return;
} else if (exchange.getFault() != null) {
// Fault message
exchange.setStatus(ExchangeStatus.DONE);
getChannel().send(exchange);
} else {
- Session session = null;
+ Session session;
try {
Properties props = MailUtils.getPropertiesForProtocol(this.config, this.customTrustManagers);
props.put("mail.debug", isDebugMode() ? "true" : "false");
@@ -150,16 +149,16 @@
throws Exception {
// Exchange is finished
if (exchange.getStatus() == ExchangeStatus.DONE) {
- return;
+ //return;
} else if (exchange.getStatus() == ExchangeStatus.ERROR) {
// Exchange has been aborted with an exception
- return;
+ //return;
} else if (exchange.getFault() != null) {
// Fault message
exchange.setStatus(ExchangeStatus.DONE);
getChannel().send(exchange);
} else {
- Session session = null;
+ Session session;
try {
Properties props = MailUtils.getPropertiesForProtocol(this.config, this.customTrustManagers);
props.put("mail.debug", isDebugMode() ? "true" : "false");
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/AbstractMailMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/AbstractMailMarshaler.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/AbstractMailMarshaler.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/AbstractMailMarshaler.java Thu Aug 27 22:17:48 2009
@@ -16,21 +16,14 @@
*/
package org.apache.servicemix.mail.marshaler;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.servicemix.components.util.MarshalerSupport;
import javax.activation.DataSource;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
import javax.mail.internet.MimeMessage;
-
-import org.apache.servicemix.components.util.MarshalerSupport;
+import java.io.File;
+import java.util.*;
/**
* this is the abstract super class of all marshalers which want to convert
@@ -232,13 +225,12 @@
NormalizedMessage normalizedMessage) {
// get attachment from Normalize Message (used for sending)
Map<String, DataSource> attachments = new HashMap<String, DataSource>();
- String oneAttachmentName = "";
+ String oneAttachmentName;
Set attNames = normalizedMessage.getAttachmentNames();
- Iterator itAttNames = attNames.iterator();
- while (itAttNames.hasNext()) {
- oneAttachmentName = (String)itAttNames.next();
+ for (Object attName : attNames) {
+ oneAttachmentName = (String) attName;
DataSource oneAttchmentInputString = normalizedMessage.getAttachment(oneAttachmentName)
- .getDataSource();
+ .getDataSource();
attachments.put(oneAttachmentName, oneAttchmentInputString);
}
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/marshaler/DefaultMailMarshaler.java Thu Aug 27 22:17:48 2009
@@ -16,13 +16,11 @@
*/
package org.apache.servicemix.mail.marshaler;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.mail.utils.MailContentType;
+import org.apache.servicemix.mail.utils.MailUtils;
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
@@ -33,17 +31,14 @@
import javax.mail.BodyPart;
import javax.mail.Message;
import javax.mail.Part;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimeUtility;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.mail.utils.MailContentType;
-import org.apache.servicemix.mail.utils.MailUtils;
+import javax.mail.internet.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Iterator;
/**
* this is the default marshaler for conversion between the normalized message
@@ -52,7 +47,7 @@
* @author lhein
*/
public class DefaultMailMarshaler extends AbstractMailMarshaler {
- private static Log log = LogFactory.getLog(DefaultMailMarshaler.class);
+ private static final Log log = LogFactory.getLog(DefaultMailMarshaler.class);
/*
* (non-Javadoc)
@@ -64,11 +59,11 @@
public void convertMailToJBI(MessageExchange exchange, NormalizedMessage nmsg, MimeMessage mailMsg)
throws javax.mail.MessagingException {
// extract the headers from the mail message
- MailUtils.extractHeadersFromMail(exchange, nmsg, mailMsg);
+ MailUtils.extractHeadersFromMail(nmsg, mailMsg);
// extract the body
try {
- MailUtils.extractBodyFromMail(exchange, nmsg, mailMsg);
+ MailUtils.extractBodyFromMail(nmsg, mailMsg);
if (nmsg.getContent() == null) {
nmsg.setContent(new StringSource(AbstractMailMarshaler.DUMMY_CONTENT));
}
@@ -78,7 +73,7 @@
}
// extract the attachments
- MailUtils.extractAttachmentsFromMail(exchange, nmsg, mailMsg);
+ MailUtils.extractAttachmentsFromMail(nmsg, mailMsg);
}
/*
@@ -93,7 +88,7 @@
throws javax.mail.MessagingException {
try {
// first fill the headers of the mail
- fillMailHeaders(mimeMessage, exchange, nmsg, configuredSender, configuredReceiver);
+ fillMailHeaders(mimeMessage, nmsg, configuredSender, configuredReceiver);
// fill the body and attachments
fillMailBodyAndAttachments(mimeMessage, exchange, nmsg);
@@ -126,29 +121,29 @@
// we need to guess what is best to use here
if (isHtml) {
// we got attachments or a html content...so it will be some multipart/* message
- prepareMixedMail(MailContentType.MULTIPART, mimeMessage, exchange, nmsg);
+ prepareMixedMail(mimeMessage, exchange, nmsg);
} else {
// we will use a text/plain message
- preparePlainTextMail(MailContentType.TEXT_PLAIN, mimeMessage, exchange, nmsg);
+ preparePlainTextMail(mimeMessage, nmsg);
}
} else {
MailContentType mct = MailContentType.getEnumForValue(contentType);
switch (mct) {
- case TEXT_PLAIN: preparePlainTextMail(mct, mimeMessage, exchange, nmsg);
+ case TEXT_PLAIN: preparePlainTextMail(mimeMessage, nmsg);
break;
case TEXT_HTML:
case TEXT_XML:
case MULTIPART:
- case MULTIPART_MIXED: prepareMixedMail(mct, mimeMessage, exchange, nmsg);
+ case MULTIPART_MIXED: prepareMixedMail(mimeMessage, exchange, nmsg);
break;
- case MULTIPART_ALTERNATIVE: prepareAlternativeMail(mct, mimeMessage, exchange, nmsg);
+ case MULTIPART_ALTERNATIVE: prepareAlternativeMail(mimeMessage, exchange, nmsg);
break;
default: if (isHtml && isText) {
- prepareAlternativeMail(mct, mimeMessage, exchange, nmsg);
+ prepareAlternativeMail(mimeMessage, exchange, nmsg);
} else if (isText && nmsg.getAttachmentNames().size() == 0) {
- preparePlainTextMail(mct, mimeMessage, exchange, nmsg);
+ preparePlainTextMail(mimeMessage, nmsg);
} else {
- prepareMixedMail(mct, mimeMessage, exchange, nmsg);
+ prepareMixedMail(mimeMessage, exchange, nmsg);
}
}
}
@@ -157,14 +152,11 @@
/**
* prepares a plain text mail message
*
- * @param mct the mail content type
* @param mimeMessage the mail message
- * @param exchange the message exchange
* @param nmsg the normalized message
* @throws Exception on errors
*/
- protected void preparePlainTextMail(MailContentType mct, MimeMessage mimeMessage, MessageExchange exchange,
- NormalizedMessage nmsg) throws Exception {
+ protected void preparePlainTextMail(MimeMessage mimeMessage, NormalizedMessage nmsg) throws Exception {
Object content = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_TEXT);
Object charset = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_CHARSET);
@@ -184,19 +176,18 @@
/**
* prepares a multipart mixed mail message
*
- * @param mct the mail content type
* @param mimeMessage the mail message
* @param exchange the message exchange
* @param nmsg the normalized message
* @throws Exception on errors
*/
- protected void prepareMixedMail(MailContentType mct, MimeMessage mimeMessage, MessageExchange exchange,
+ protected void prepareMixedMail(MimeMessage mimeMessage, MessageExchange exchange,
NormalizedMessage nmsg) throws Exception {
boolean isText = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_TEXT) != null;
boolean isHtml = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_HTML) != null;
- boolean useInline = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS) != null &&
- ((Boolean)nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS)).booleanValue();
+ boolean useInline = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS) != null &&
+ (Boolean) nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS);
Object content_text = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_TEXT);
Object content_html = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_HTML);
@@ -234,13 +225,12 @@
/**
* prepares a multipart alternative mail message (both html and text)
*
- * @param mct the mail content type
* @param mimeMessage the mail message
* @param exchange the message exchange
* @param nmsg the normalized message
* @throws Exception on errors
*/
- protected void prepareAlternativeMail(MailContentType mct, MimeMessage mimeMessage, MessageExchange exchange,
+ protected void prepareAlternativeMail(MimeMessage mimeMessage, MessageExchange exchange,
NormalizedMessage nmsg) throws Exception {
boolean isText = nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_TEXT) != null;
@@ -249,7 +239,7 @@
// only use attachments if it's definitive set so
if (nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS) != null &&
- ((Boolean)nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS)).booleanValue() == false) {
+ !(Boolean)nmsg.getProperty(AbstractMailMarshaler.MSG_TAG_MAIL_USE_INLINE_ATTACHMENTS)) {
useInline = false;
}
@@ -298,7 +288,7 @@
multipart.addBodyPart(htmlpart);
// put attachments in place
- appendAttachments(exchange, nmsg, mmp, useInline ? Part.INLINE : Part.ATTACHMENT);
+ appendAttachments(exchange, nmsg, mmp, Part.ATTACHMENT);
} else {
// use inline attachments
MimeMultipart multipartRelated = new MimeMultipart("related");
@@ -313,7 +303,7 @@
multipartRelated.addBodyPart(htmlBodyPart);
}
// put attachments in place
- appendAttachments(exchange, nmsg, multipartRelated, useInline ? Part.INLINE : Part.ATTACHMENT);
+ appendAttachments(exchange, nmsg, multipartRelated, Part.INLINE);
}
}
@@ -339,7 +329,7 @@
if (itAttNames.hasNext()) {
// there is at least one attachment
- MimeBodyPart messageBodyPart = null;
+ MimeBodyPart messageBodyPart;
// loop the existing attachments and put them to the mail
while (itAttNames.hasNext()) {
@@ -388,14 +378,12 @@
* fills the mail headers according to the normalized message headers
*
* @param mimeMessage the mail message to fill
- * @param exchange the exchange received
* @param nmsg the normalized message received
* @param configuredSender the configured sender from xbean
* @param configuredReceiver the configured receiver from xbean
* @throws Exception on errors
*/
- protected void fillMailHeaders(MimeMessage mimeMessage, MessageExchange exchange,
- NormalizedMessage nmsg, String configuredSender, String configuredReceiver)
+ protected void fillMailHeaders(MimeMessage mimeMessage, NormalizedMessage nmsg, String configuredSender, String configuredReceiver)
throws Exception {
// fill the "To" field of the mail
// if there is a TO property, this overrides the standard receiver
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/security/CustomSSLSocketFactory.java Thu Aug 27 22:17:48 2009
@@ -16,6 +16,13 @@
*/
package org.apache.servicemix.mail.security;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
@@ -23,14 +30,6 @@
import java.util.List;
import java.util.StringTokenizer;
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* CustomSSLSocketFactory providing no security at all
*/
@@ -66,7 +65,7 @@
// use defaults
sslcontext.init(null, null, null);
}
- factory = (SSLSocketFactory)sslcontext.getSocketFactory();
+ factory = sslcontext.getSocketFactory();
} catch (Exception ex) {
LOG.error("Failed to create the dummy ssl socket factory.", ex);
}
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailConnectionConfiguration.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailConnectionConfiguration.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailConnectionConfiguration.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailConnectionConfiguration.java Thu Aug 27 22:17:48 2009
@@ -141,8 +141,7 @@
*/
@Override
protected PasswordAuthentication getPasswordAuthentication() {
- PasswordAuthentication pa = new PasswordAuthentication(getUsername(), getPassword());
- return pa;
+ return new PasswordAuthentication(getUsername(), getPassword());
}
};
}
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailContentType.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailContentType.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailContentType.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailContentType.java Thu Aug 27 22:17:48 2009
@@ -30,8 +30,8 @@
MULTIPART_ALTERNATIVE ("multipart/alternative", "multipart/alternative"),
UNKNOWN ("unknown", "text/plain");
- private String key;
- private String mimeType;
+ private final String key;
+ private final String mimeType;
/**
* creates a mail content type enum object
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/main/java/org/apache/servicemix/mail/utils/MailUtils.java Thu Aug 27 22:17:48 2009
@@ -16,18 +16,13 @@
*/
package org.apache.servicemix.mail.utils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
+import org.apache.servicemix.mail.security.CustomSSLSocketFactory;
import javax.activation.DataHandler;
-import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.mail.Header;
@@ -39,12 +34,14 @@
import javax.mail.internet.MimeUtility;
import javax.mail.internet.ParseException;
import javax.mail.util.ByteArrayDataSource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.mail.marshaler.AbstractMailMarshaler;
-import org.apache.servicemix.mail.security.CustomSSLSocketFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
* utility class
@@ -52,7 +49,7 @@
* @author lhein
*/
public final class MailUtils {
- private static Log log = LogFactory.getLog(MailUtils.class);
+ private static final Log log = LogFactory.getLog(MailUtils.class);
public static final String KEY_BODY_TEXT = "text";
public static final String KEY_BODY_HTML = "html";
@@ -244,6 +241,9 @@
/**
* Extracts the body from the Mail message
+ *
+ * @param message the mail message
+ * @return the mail body
*/
public static Object extractBodyFromMail(Message message) {
try {
@@ -259,13 +259,12 @@
/**
* copy the headers of the mail message into the normalized message headers
*
- * @param exchange the exchange to use
* @param nmsg the message to use
* @param mailMsg the mail message
* @throws javax.mail.MessagingException on any errors
*/
@SuppressWarnings("unchecked")
- public static void extractHeadersFromMail(MessageExchange exchange, NormalizedMessage nmsg, MimeMessage mailMsg)
+ public static void extractHeadersFromMail(NormalizedMessage nmsg, MimeMessage mailMsg)
throws javax.mail.MessagingException {
// first convert the headers of the mail to properties of the message
Enumeration headers = mailMsg.getAllHeaders();
@@ -349,7 +348,7 @@
* extracts attachments from a multipart mail part
*
* @param mp the multipart
- * @param map the map to add the attachments to
+ * @param nmsg the normalized message
* @throws javax.mail.MessagingException on mail errors
* @throws MessagingException on jbi messaging errors
* @throws IOException on io errors
@@ -429,9 +428,11 @@
/**
* returns the body of the mail
*
- * @param mp
- * @param nmsg
- * @return
+ * @param mp the multipart
+ * @param nmsg the normalized message
+ * @return a map of mail bodies
+ * @throws javax.mail.MessagingException on mail message errors
+ * @throws IOException on io errors
*/
public static Map<String, String> extractBodyFromMultipart(Multipart mp, NormalizedMessage nmsg)
throws javax.mail.MessagingException, IOException {
@@ -447,9 +448,7 @@
try {
Multipart mup = (Multipart)part.getContent();
Map<String, String> res = extractBodyFromMultipart(mup, nmsg);
- Iterator<String> keyIt = res.keySet().iterator();
- while (keyIt.hasNext()) {
- String key = keyIt.next();
+ for (String key : res.keySet()) {
if (content.containsKey(key)) {
content.put(key, content.get(key) + '\n' + res.get(key));
} else {
@@ -494,9 +493,9 @@
*
* @param mbp the mime body part to parse
* @param nmsg the normalized message to fill
- * @throws MessagingException
- * @throws javax.mail.MessagingException
- * @throws IOException
+ * @throws MessagingException on messaging errors
+ * @throws javax.mail.MessagingException on mail message errors
+ * @throws IOException on io errors
*/
public static void parsePart(MimeBodyPart mbp, NormalizedMessage nmsg) throws MessagingException,
javax.mail.MessagingException, IOException {
@@ -536,11 +535,12 @@
/**
* extracts the body from the mail
*
- * @param exchange the message exchange
* @param nmsg the normalized message
* @param mailMsg the mail message
+ * @throws javax.jbi.messaging.MessagingException on messaging errors
+ * @throws javax.mail.MessagingException on mail message errors
*/
- public static void extractBodyFromMail(MessageExchange exchange, NormalizedMessage nmsg, MimeMessage mailMsg)
+ public static void extractBodyFromMail(NormalizedMessage nmsg, MimeMessage mailMsg)
throws javax.mail.MessagingException, MessagingException {
Object content = MailUtils.extractBodyFromMail(mailMsg);
@@ -595,11 +595,10 @@
/**
* extracts the attachments from the mail
*
- * @param exchange the message exchange
* @param nmsg the normalized message
* @param mailMsg the mail message
*/
- public static void extractAttachmentsFromMail(MessageExchange exchange, NormalizedMessage nmsg, MimeMessage mailMsg) {
+ public static void extractAttachmentsFromMail(NormalizedMessage nmsg, MimeMessage mailMsg) {
Object content = MailUtils.extractBodyFromMail(mailMsg);
if (content != null && content instanceof Multipart) {
// mail with attachment
Modified: servicemix/components/bindings/servicemix-mail/trunk/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-mail/trunk/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java?rev=808664&r1=808663&r2=808664&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-mail/trunk/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java (original)
+++ servicemix/components/bindings/servicemix-mail/trunk/src/test/java/org/apache/servicemix/mail/DefaultMailMarshalerTest.java Thu Aug 27 22:17:48 2009
@@ -16,26 +16,7 @@
*/
package org.apache.servicemix.mail;
-import java.io.File;
-import java.util.Iterator;
-
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.jbi.messaging.InOnly;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Part;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.MimeUtility;
-
import junit.framework.TestCase;
-
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.messaging.InOnlyImpl;
@@ -43,6 +24,15 @@
import org.apache.servicemix.mail.marshaler.DefaultMailMarshaler;
import org.apache.servicemix.mail.utils.MailContentType;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.mail.*;
+import javax.mail.internet.*;
+import java.io.File;
+import java.util.Iterator;
+
/**
* this is a collection of test which validate the marshaler conversion results
* to make sure the conversion always delivers the expected results
@@ -84,7 +74,6 @@
/**
* Test method for
- * {@link net.compart.jbi.mail.marshaler.AbstractMailMarshaler#getDefaultSenderForOutgoingMails()}.
*/
public void testGetDefaultSenderForOutgoingMails() {
assertEquals("Marshaler's default sender is not correct!", marshaler
@@ -272,9 +261,8 @@
fail("The HTML content is wrong! Expected: " + HTML + " Result: " + result);
}
- Iterator i = nmsg.getAttachmentNames().iterator();
- while (i.hasNext()) {
- System.err.println("ATT: " + i.next().toString());
+ for (Object o : nmsg.getAttachmentNames()) {
+ System.err.println("ATT: " + o.toString());
}
if (nmsg.getAttachmentNames().size() != 1) {
@@ -848,7 +836,7 @@
// Fetch the image and associate to part
FileDataSource fds = new FileDataSource(new File(PATH, FILE));
- MimeBodyPart messageBodyPart = null;
+ MimeBodyPart messageBodyPart;
// Create another body part
messageBodyPart = new MimeBodyPart();
// Set the data handler to the attachment