38 changes: 19 additions & 19 deletions src/main/java/org/apache/commons/mail/MultiPartEmail.java
Expand Up @@ -22,16 +22,16 @@
import java.io.UnsupportedEncodingException;
import java.net.URL;

import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.activation.URLDataSource;
import javax.mail.BodyPart;
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimePart;
import javax.mail.internet.MimeUtility;
import jakarta.activation.DataHandler;
import jakarta.activation.DataSource;
import jakarta.activation.FileDataSource;
import jakarta.activation.URLDataSource;
import jakarta.mail.BodyPart;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeBodyPart;
import jakarta.mail.internet.MimeMultipart;
import jakarta.mail.internet.MimePart;
import jakarta.mail.internet.MimeUtility;

/**
* A multipart email.
Expand Down Expand Up @@ -90,7 +90,7 @@ public String getSubType()
* @param partContent The content.
* @param partContentType The content type.
* @return An Email.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand All @@ -116,7 +116,7 @@ public Email addPart(final String partContent, final String partContentType)
*
* @param multipart The MimeMultipart.
* @return An Email.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down Expand Up @@ -179,7 +179,7 @@ protected void init()
*
* @param msg A String.
* @return An Email.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down Expand Up @@ -263,7 +263,7 @@ public void buildMimeMessage() throws EmailException
*
* @param file A file attachment
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.3
*/
Expand Down Expand Up @@ -294,7 +294,7 @@ public MultiPartEmail attach(final File file)
*
* @param attachment An EmailAttachment.
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down Expand Up @@ -354,7 +354,7 @@ public MultiPartEmail attach(final EmailAttachment attachment)
* @param name The name field for the attachment.
* @param description A description for the attachment.
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand All @@ -372,7 +372,7 @@ public MultiPartEmail attach(final URL url, final String name, final String desc
* @param description A description for the attachment.
* @param disposition Either mixed or inline.
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down Expand Up @@ -404,7 +404,7 @@ public MultiPartEmail attach(
* @param name The name field for the attachment.
* @param description A description for the attachment.
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down Expand Up @@ -445,7 +445,7 @@ public MultiPartEmail attach(
* @param description A description for the attachment.
* @param disposition Either mixed or inline.
* @return A MultiPartEmail.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/mail/SimpleEmail.java
Expand Up @@ -29,7 +29,7 @@ public class SimpleEmail extends Email
*
* @param msg A String.
* @return An Email.
* @throws EmailException see javax.mail.internet.MimeBodyPart
* @throws EmailException see jakarta.mail.internet.MimeBodyPart
* for definitions
* @since 1.0
*/
Expand Down
Expand Up @@ -16,9 +16,9 @@
*/
package org.apache.commons.mail.resolver;

import javax.activation.DataSource;
import javax.activation.FileTypeMap;
import javax.mail.util.ByteArrayDataSource;
import jakarta.activation.DataSource;
import jakarta.activation.FileTypeMap;
import jakarta.mail.util.ByteArrayDataSource;

import java.io.IOException;
import java.io.InputStream;
Expand Down
Expand Up @@ -18,7 +18,7 @@

import org.apache.commons.mail.DataSourceResolver;

import javax.activation.DataSource;
import jakarta.activation.DataSource;
import java.io.IOException;

/**
Expand Down
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.commons.mail.resolver;

import javax.activation.DataSource;
import javax.activation.FileDataSource;
import jakarta.activation.DataSource;
import jakarta.activation.FileDataSource;
import java.io.File;
import java.io.IOException;

Expand Down
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.commons.mail.resolver;

import javax.activation.DataSource;
import javax.activation.URLDataSource;
import jakarta.activation.DataSource;
import jakarta.activation.URLDataSource;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.commons.mail.util;

import javax.mail.internet.InternetAddress;
import jakarta.mail.internet.InternetAddress;
import java.net.IDN;

/**
Expand Down
50 changes: 25 additions & 25 deletions src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
Expand Up @@ -30,20 +30,20 @@
import java.util.List;
import java.util.Map;

import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.Part;
import javax.mail.internet.ContentType;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimePart;
import javax.mail.internet.MimeUtility;
import javax.mail.internet.ParseException;
import javax.mail.util.ByteArrayDataSource;
import jakarta.activation.DataHandler;
import jakarta.activation.DataSource;
import jakarta.mail.Message;
import jakarta.mail.MessagingException;
import jakarta.mail.Multipart;
import jakarta.mail.Part;
import jakarta.mail.internet.ContentType;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeBodyPart;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.internet.MimePart;
import jakarta.mail.internet.MimeUtility;
import jakarta.mail.internet.ParseException;
import jakarta.mail.util.ByteArrayDataSource;

/**
* Parses a MimeMessage and stores the individual parts such a plain text,
Expand Down Expand Up @@ -100,30 +100,30 @@ public MimeMessageParser parse() throws Exception
* @return the 'to' recipients of the message
* @throws Exception determining the recipients failed
*/
public List<javax.mail.Address> getTo() throws Exception
public List<jakarta.mail.Address> getTo() throws Exception
{
final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();
final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<jakarta.mail.Address>();
}

/**
* @return the 'cc' recipients of the message
* @throws Exception determining the recipients failed
*/
public List<javax.mail.Address> getCc() throws Exception
public List<jakarta.mail.Address> getCc() throws Exception
{
final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();
final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<jakarta.mail.Address>();
}

/**
* @return the 'bcc' recipients of the message
* @throws Exception determining the recipients failed
*/
public List<javax.mail.Address> getBcc() throws Exception
public List<jakarta.mail.Address> getBcc() throws Exception
{
final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();
final jakarta.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC);
return recipients != null ? Arrays.asList(recipients) : new ArrayList<jakarta.mail.Address>();
}

/**
Expand All @@ -132,7 +132,7 @@ public List<javax.mail.Address> getBcc() throws Exception
*/
public String getFrom() throws Exception
{
final javax.mail.Address[] addresses = this.mimeMessage.getFrom();
final jakarta.mail.Address[] addresses = this.mimeMessage.getFrom();
if (addresses == null || addresses.length == 0)
{
return null;
Expand All @@ -146,7 +146,7 @@ public String getFrom() throws Exception
*/
public String getReplyTo() throws Exception
{
final javax.mail.Address[] addresses = this.mimeMessage.getReplyTo();
final jakarta.mail.Address[] addresses = this.mimeMessage.getReplyTo();
if (addresses == null || addresses.length == 0)
{
return null;
Expand Down
Expand Up @@ -16,9 +16,9 @@
*/
package org.apache.commons.mail.util;

import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import jakarta.mail.MessagingException;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
Expand Down
2 changes: 1 addition & 1 deletion src/site/xdoc/userguide.xml
Expand Up @@ -242,7 +242,7 @@ import org.apache.commons.mail.HtmlEmail;
<p>
You can perform a more complex authentication method such as displaying
a dialog box to the user by creating a subclass of the
<code>javax.mail.Authenticator</code> object. You will need to
<code>jakarta.mail.Authenticator</code> object. You will need to
override the <code>getPasswordAuthentication()</code> method where
you will handle collecting the user's information. To make use of
your new <code>Authenticator</code> class, use the
Expand Down
26 changes: 15 additions & 11 deletions src/test/java/org/apache/commons/mail/AbstractEmailTest.java
Expand Up @@ -17,11 +17,17 @@
package org.apache.commons.mail;

import static org.easymock.EasyMock.expect;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.*;
import static org.powermock.api.easymock.PowerMock.createMock;
import static org.powermock.api.easymock.PowerMock.replay;

import static org.hamcrest.CoreMatchers.containsString;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
Expand All @@ -31,13 +37,12 @@
import java.util.Enumeration;
import java.util.List;

import javax.activation.DataHandler;
import javax.mail.Header;
import javax.mail.MessagingException;
import javax.mail.Multipart;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;

import jakarta.activation.DataHandler;
import jakarta.mail.Header;
import jakarta.mail.MessagingException;
import jakarta.mail.Multipart;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import org.apache.commons.mail.settings.EmailConfiguration;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -197,8 +202,7 @@ public void getMailServer()
{
mailServerPort++;

this.fakeMailServer = new Wiser();
this.fakeMailServer.setPort(getMailServerPort());
this.fakeMailServer = Wiser.port(getMailServerPort());
this.fakeMailServer.start();

assertFalse("fake mail server didn't start", isMailServerStopped(fakeMailServer));
Expand Down
Expand Up @@ -18,7 +18,7 @@

import static org.junit.Assert.*;

import javax.mail.PasswordAuthentication;
import jakarta.mail.PasswordAuthentication;

import org.junit.Test;

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/apache/commons/mail/EmailLiveTest.java
Expand Up @@ -22,11 +22,11 @@
import java.util.ArrayList;
import java.util.List;

import javax.activation.DataSource;
import javax.activation.URLDataSource;
import javax.mail.Session;
import javax.mail.Transport;
import javax.mail.internet.MimeMessage;
import jakarta.activation.DataSource;
import jakarta.activation.URLDataSource;
import jakarta.mail.Session;
import jakarta.mail.Transport;
import jakarta.mail.internet.MimeMessage;

import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
Expand Down Expand Up @@ -263,7 +263,7 @@ public void testCorrectCharacterEncoding() throws Exception
email.setMsg(textMsg);

// create a proper UTF-8 sequence for the text attachment (matching our default charset)
final DataSource attachment = new javax.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain");
final DataSource attachment = new jakarta.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain");
email.attach(attachment, attachmentName, "Attachment in Greek");

EmailUtils.writeMimeMessage( new File("./target/test-emails/correct-encoding.eml"), send(email).getMimeMessage());
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/apache/commons/mail/EmailTest.java
Expand Up @@ -31,12 +31,12 @@
import java.util.Map;
import java.util.Properties;

import javax.mail.Message;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
import jakarta.mail.Message;
import jakarta.mail.Session;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMultipart;
import jakarta.mail.internet.ParseException;

import org.apache.commons.mail.mocks.MockEmailConcrete;
import org.junit.Before;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/apache/commons/mail/HtmlEmailTest.java
Expand Up @@ -27,9 +27,9 @@
import java.net.URL;
import java.util.List;

import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.mail.internet.MimeMessage;
import jakarta.activation.DataSource;
import jakarta.activation.FileDataSource;
import jakarta.mail.internet.MimeMessage;

import org.apache.commons.mail.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail.settings.EmailConfiguration;
Expand Down
35 changes: 18 additions & 17 deletions src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
Expand Up @@ -16,21 +16,9 @@
*/
package org.apache.commons.mail;

import static org.junit.Assert.*;

import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
import org.apache.commons.mail.resolver.DataSourceCompositeResolver;
import org.apache.commons.mail.resolver.DataSourceUrlResolver;
import org.apache.commons.mail.mocks.MockImageHtmlEmailConcrete;
import org.apache.commons.mail.util.MimeMessageParser;
import org.apache.commons.mail.util.MimeMessageUtils;
import org.junit.Before;
import org.junit.Test;

import javax.activation.DataSource;
import javax.mail.internet.MimeMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.File;
import java.io.IOException;
Expand All @@ -42,6 +30,19 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import jakarta.activation.DataSource;
import jakarta.mail.internet.MimeMessage;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.mail.mocks.MockImageHtmlEmailConcrete;
import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
import org.apache.commons.mail.resolver.DataSourceCompositeResolver;
import org.apache.commons.mail.resolver.DataSourceUrlResolver;
import org.apache.commons.mail.util.MimeMessageParser;
import org.apache.commons.mail.util.MimeMessageUtils;
import org.junit.Before;
import org.junit.Test;

public class ImageHtmlEmailTest extends HtmlEmailTest {

private static final boolean TEST_IS_LENIENT = true;
Expand Down Expand Up @@ -499,8 +500,8 @@ public MockDataSourceClassPathResolver(final String classPathBase, final boolean

@Override
public DataSource resolve(final String resourceLocation, final boolean isLenient) throws IOException {
final javax.mail.util.ByteArrayDataSource ds =
(javax.mail.util.ByteArrayDataSource) super.resolve(resourceLocation, isLenient);
final jakarta.mail.util.ByteArrayDataSource ds = (jakarta.mail.util.ByteArrayDataSource) super.resolve(
resourceLocation, isLenient);
ds.setName(null);
return ds;
}
Expand Down
Expand Up @@ -21,7 +21,7 @@

import java.lang.reflect.Method;

import javax.mail.internet.InternetAddress;
import jakarta.mail.internet.InternetAddress;

import org.junit.Before;
import org.junit.Test;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
Expand Up @@ -25,9 +25,9 @@
import java.util.HashMap;
import java.util.Map;

import javax.activation.FileDataSource;
import javax.activation.URLDataSource;
import javax.mail.internet.MimeMultipart;
import jakarta.activation.FileDataSource;
import jakarta.activation.URLDataSource;
import jakarta.mail.internet.MimeMultipart;

import org.apache.commons.mail.mocks.MockMultiPartEmailConcrete;
import org.junit.Before;
Expand Down
Expand Up @@ -20,7 +20,7 @@
import java.io.IOException;
import java.net.URL;

import javax.mail.internet.MimeUtility;
import jakarta.mail.internet.MimeUtility;

import org.apache.commons.mail.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail.settings.EmailConfiguration;
Expand Down
Expand Up @@ -16,10 +16,10 @@
*/
package org.apache.commons.mail.mocks;

import javax.mail.Authenticator;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import jakarta.mail.Authenticator;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;
import jakarta.mail.internet.MimeMultipart;

import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
Expand Down
Expand Up @@ -17,8 +17,8 @@
package org.apache.commons.mail.mocks;

import java.io.IOException;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.InternetAddress;

import org.apache.commons.mail.HtmlEmail;

Expand Down
Expand Up @@ -19,7 +19,7 @@
import org.apache.commons.mail.ImageHtmlEmail;

import java.io.IOException;
import javax.mail.MessagingException;
import jakarta.mail.MessagingException;

/**
* Extension of the ImageHtmlEmail Class
Expand Down
Expand Up @@ -18,8 +18,8 @@

import java.io.IOException;

import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.InternetAddress;

import org.apache.commons.mail.MultiPartEmail;

Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
package org.apache.commons.mail.mocks;

import javax.mail.internet.InternetAddress;
import jakarta.mail.internet.InternetAddress;

import org.apache.commons.mail.SimpleEmail;

Expand Down
Expand Up @@ -19,7 +19,7 @@
import java.io.IOException;
import java.io.InputStream;

import javax.activation.DataSource;
import jakarta.activation.DataSource;

import org.apache.commons.io.IOUtils;

Expand Down
Expand Up @@ -18,7 +18,7 @@

import static org.junit.Assert.assertEquals;

import javax.mail.internet.InternetAddress;
import jakarta.mail.internet.InternetAddress;

import org.junit.Test;

Expand Down
Expand Up @@ -26,9 +26,9 @@
import java.util.List;
import java.util.Properties;

import javax.activation.DataSource;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import jakarta.activation.DataSource;
import jakarta.mail.Session;
import jakarta.mail.internet.MimeMessage;

import org.apache.commons.mail.HtmlEmail;
import org.junit.Test;
Expand Down