You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/12/25 17:54:39 UTC
(commons-email) 02/03: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git
commit a9f3b724517c2986a1836a84a00fadde2140aca1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Dec 25 11:25:08 2023 -0500
Remove deprecated code
---
.../java/org/apache/commons/mail2/javax/Email.java | 325 ++-------------------
.../apache/commons/mail2/javax/EmailConstants.java | 49 +---
.../org/apache/commons/mail2/javax/HtmlEmail.java | 22 +-
.../commons/mail2/javax/AbstractEmailTest.java | 1 -
.../mail2/javax/DefaultAuthenticatorTest.java | 1 -
.../commons/mail2/javax/EmailAttachmentTest.java | 1 -
.../commons/mail2/javax/EmailConstantsTest.java | 13 +-
.../apache/commons/mail2/javax/EmailLiveTest.java | 9 -
.../org/apache/commons/mail2/javax/EmailTest.java | 9 -
.../apache/commons/mail2/javax/EmailUtilsTest.java | 1 -
.../apache/commons/mail2/javax/HtmlEmailTest.java | 5 -
.../commons/mail2/javax/ImageHtmlEmailTest.java | 3 -
.../commons/mail2/javax/InvalidAddressTest.java | 1 -
.../commons/mail2/javax/MultiPartEmailTest.java | 4 -
.../mail2/javax/SendWithAttachmentsTest.java | 3 -
.../commons/mail2/javax/SimpleEmailTest.java | 3 -
.../resolver/DataSourceClassPathResolverTest.java | 1 -
.../resolver/DataSourceCompositeResolverTest.java | 3 -
.../javax/resolver/DataSourceFileResolverTest.java | 1 -
.../javax/resolver/DataSourcePathResolverTest.java | 1 -
.../javax/resolver/DataSourceUrlResolverTest.java | 1 -
.../javax/util/IDNEmailAddressConverterTest.java | 1 -
.../mail2/javax/util/MimeMessageParserTest.java | 2 -
23 files changed, 33 insertions(+), 427 deletions(-)
diff --git a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/Email.java b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
index 88640aa..c8fee0c 100644
--- a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
+++ b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/Email.java
@@ -60,122 +60,6 @@ public abstract class Email {
*/
private static final InternetAddress[] EMPTY_INTERNET_ADDRESS_ARRAY = {};
- /** @deprecated since 1.3, use {@link EmailConstants#SENDER_EMAIL} instead */
- @Deprecated
- public static final String SENDER_EMAIL = EmailConstants.SENDER_EMAIL;
-
- /** @deprecated since 1.3, use {@link EmailConstants#SENDER_NAME} instead */
- @Deprecated
- public static final String SENDER_NAME = EmailConstants.SENDER_NAME;
-
- /** @deprecated since 1.3, use {@link EmailConstants#RECEIVER_EMAIL} instead */
- @Deprecated
- public static final String RECEIVER_EMAIL = EmailConstants.RECEIVER_EMAIL;
-
- /** @deprecated since 1.3, use {@link EmailConstants#RECEIVER_NAME} instead */
- @Deprecated
- public static final String RECEIVER_NAME = EmailConstants.RECEIVER_NAME;
-
- /** @deprecated since 1.3, use {@link EmailConstants#EMAIL_SUBJECT} instead */
- @Deprecated
- public static final String EMAIL_SUBJECT = EmailConstants.EMAIL_SUBJECT;
-
- /** @deprecated since 1.3, use {@link EmailConstants#EMAIL_BODY} instead */
- @Deprecated
- public static final String EMAIL_BODY = EmailConstants.EMAIL_BODY;
-
- /** @deprecated since 1.3, use {@link EmailConstants#CONTENT_TYPE} instead */
- @Deprecated
- public static final String CONTENT_TYPE = EmailConstants.CONTENT_TYPE;
-
- /** @deprecated since 1.3, use {@link EmailConstants#ATTACHMENTS} instead */
- @Deprecated
- public static final String ATTACHMENTS = EmailConstants.ATTACHMENTS;
-
- /** @deprecated since 1.3, use {@link EmailConstants#FILE_SERVER} instead */
- @Deprecated
- public static final String FILE_SERVER = EmailConstants.FILE_SERVER;
-
- /** @deprecated since 1.3, use {@link EmailConstants#KOI8_R} instead */
- @Deprecated
- public static final String KOI8_R = EmailConstants.KOI8_R;
-
- /** @deprecated since 1.3, use {@link EmailConstants#ISO_8859_1} instead */
- @Deprecated
- public static final String ISO_8859_1 = EmailConstants.ISO_8859_1;
-
- /** @deprecated since 1.3, use {@link EmailConstants#US_ASCII} instead */
- @Deprecated
- public static final String US_ASCII = EmailConstants.US_ASCII;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_DEBUG} instead */
- @Deprecated
- public static final String MAIL_DEBUG = EmailConstants.MAIL_DEBUG;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_HOST} instead */
- @Deprecated
- public static final String MAIL_HOST = EmailConstants.MAIL_HOST;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_PORT} instead */
- @Deprecated
- public static final String MAIL_PORT = EmailConstants.MAIL_PORT;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_FROM} instead */
- @Deprecated
- public static final String MAIL_SMTP_FROM = EmailConstants.MAIL_SMTP_FROM;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_AUTH} instead */
- @Deprecated
- public static final String MAIL_SMTP_AUTH = EmailConstants.MAIL_SMTP_AUTH;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_USER} instead */
- @Deprecated
- public static final String MAIL_SMTP_USER = EmailConstants.MAIL_SMTP_USER;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_PASSWORD} instead */
- @Deprecated
- public static final String MAIL_SMTP_PASSWORD = EmailConstants.MAIL_SMTP_PASSWORD;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_TRANSPORT_PROTOCOL} instead */
- @Deprecated
- public static final String MAIL_TRANSPORT_PROTOCOL = EmailConstants.MAIL_TRANSPORT_PROTOCOL;
-
- /** @deprecated since 1.3, use {@link EmailConstants#SMTP} instead */
- @Deprecated
- public static final String SMTP = EmailConstants.SMTP;
-
- /** @deprecated since 1.3, use {@link EmailConstants#TEXT_HTML} instead */
- @Deprecated
- public static final String TEXT_HTML = EmailConstants.TEXT_HTML;
-
- /** @deprecated since 1.3, use {@link EmailConstants#TEXT_PLAIN} instead */
- @Deprecated
- public static final String TEXT_PLAIN = EmailConstants.TEXT_PLAIN;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_TRANSPORT_TLS} instead */
- @Deprecated
- public static final String MAIL_TRANSPORT_TLS = EmailConstants.MAIL_TRANSPORT_TLS;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_SOCKET_FACTORY_FALLBACK} instead */
- @Deprecated
- public static final String MAIL_SMTP_SOCKET_FACTORY_FALLBACK = EmailConstants.MAIL_SMTP_SOCKET_FACTORY_FALLBACK;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_SOCKET_FACTORY_CLASS} instead */
- @Deprecated
- public static final String MAIL_SMTP_SOCKET_FACTORY_CLASS = EmailConstants.MAIL_SMTP_SOCKET_FACTORY_CLASS;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_SOCKET_FACTORY_PORT} instead */
- @Deprecated
- public static final String MAIL_SMTP_SOCKET_FACTORY_PORT = EmailConstants.MAIL_SMTP_SOCKET_FACTORY_PORT;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_CONNECTIONTIMEOUT} instead */
- @Deprecated
- public static final String MAIL_SMTP_CONNECTIONTIMEOUT = EmailConstants.MAIL_SMTP_CONNECTIONTIMEOUT;
-
- /** @deprecated since 1.3, use {@link EmailConstants#MAIL_SMTP_TIMEOUT} instead */
- @Deprecated
- public static final String MAIL_SMTP_TIMEOUT = EmailConstants.MAIL_SMTP_TIMEOUT;
-
/**
* Constructs a new instance.
*/
@@ -185,222 +69,141 @@ public abstract class Email {
/**
* The email message to send.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected MimeMessage message;
+ private MimeMessage message;
/**
* The charset to use for this message.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String charset;
+ private String charset;
/**
* The Address of the sending party, mandatory.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected InternetAddress fromAddress;
+ private InternetAddress fromAddress;
/**
* The Subject.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String subject;
+ private String subject;
/**
* An attachment.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected MimeMultipart emailBody;
+ private MimeMultipart emailBody;
/**
* The content.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected Object content;
+ private Object content;
/**
* The content type.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String contentType;
+ private String contentType;
/**
* Set session debugging on or off.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected boolean debug;
+ private boolean debug;
/**
* Sent date.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected Date sentDate;
+ private Date sentDate;
/**
* Instance of an {@code Authenticator} object that will be used when authentication is requested from the mail server.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected Authenticator authenticator;
+ private Authenticator authenticator;
/**
* The hostname of the mail server with which to connect. If null will try to get property from system.properties. If still null, quit.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String hostName;
+ private String hostName;
/**
* The port number of the mail server to connect to. Defaults to the standard port ( 25 ).
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String smtpPort = "25";
+ private String smtpPort = "25";
/**
* The port number of the SSL enabled SMTP server; defaults to the standard port, 465.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String sslSmtpPort = "465";
+ private String sslSmtpPort = "465";
/**
* List of "to" email addresses.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected List<InternetAddress> toList = new ArrayList<>();
+ private List<InternetAddress> toList = new ArrayList<>();
/**
* List of "cc" email addresses.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected List<InternetAddress> ccList = new ArrayList<>();
+ private List<InternetAddress> ccList = new ArrayList<>();
/**
* List of "bcc" email addresses.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected List<InternetAddress> bccList = new ArrayList<>();
+ private List<InternetAddress> bccList = new ArrayList<>();
/**
* List of "replyTo" email addresses.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected List<InternetAddress> replyList = new ArrayList<>();
+ private List<InternetAddress> replyList = new ArrayList<>();
/**
* Address to which undeliverable mail should be sent. Because this is handled by JavaMail as a String property in the mail session, this property is of
* type {@code String} rather than {@code InternetAddress}.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String bounceAddress;
+ private String bounceAddress;
/**
* Used to specify the mail headers. Example:
*
* X-Mailer: Sendmail, X-Priority: 1( highest ) or 2( high ) 3( normal ) 4( low ) and 5( lowest ) Disposition-Notification-To: user@domain.net
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected Map<String, String> headers = new HashMap<>();
+ private Map<String, String> headers = new HashMap<>();
/**
* Whether to use POP3 before SMTP, and if so the settings.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected boolean popBeforeSmtp;
+ private boolean popBeforeSmtp;
/**
* The host name of the POP3 server.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String popHost;
+ private String popHost;
/**
* The user name to log into the POP3 server.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String popUsername;
+ private String popUsername;
/**
* The password to log into the POP3 server.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String popPassword;
+ private String popPassword;
/**
* Does server require TLS encryption for authentication?
- *
- * @deprecated since 1.3, use setStartTLSEnabled() instead
*/
- @Deprecated
- protected boolean tls;
+ private boolean tls;
/**
* Does the current transport use SSL/TLS encryption upon connection?
- *
- * @deprecated since 1.3, use setSSLOnConnect() instead
*/
- @Deprecated
- protected boolean ssl;
+ private boolean ssl;
/**
* Socket I/O timeout value in milliseconds.
- *
- * @deprecated Use {@link #getSocketTimeout()} and {@link #setSocketTimeout(Duration)}.
*/
- @Deprecated
- protected int socketTimeout = Math.toIntExact(EmailConstants.SOCKET_TIMEOUT.toMillis());
+ private int socketTimeout = Math.toIntExact(EmailConstants.SOCKET_TIMEOUT.toMillis());
/**
* Socket connection timeout value in milliseconds.
- *
- * @deprecated Use {@link #getSocketConnectionTimeout()} and {@link #setSocketConnectionTimeout(Duration)}.
*/
- @Deprecated
- protected int socketConnectionTimeout = Math.toIntExact(EmailConstants.SOCKET_TIMEOUT.toMillis());
+ private int socketConnectionTimeout = Math.toIntExact(EmailConstants.SOCKET_TIMEOUT.toMillis());
/**
* If true, enables the use of the STARTTLS command (if supported by the server) to switch the connection to a TLS-protected connection before issuing any
@@ -1210,17 +1013,6 @@ public abstract class Email {
return sendPartial;
}
- /**
- * Tests whether SSL/TLS encryption for the transport is currently enabled (SMTPS/POPS). See EMAIL-105 for reason of deprecation.
- *
- * @return true if SSL enabled for the transport.
- * @deprecated since 1.3, use {@link #isSSLOnConnect()} instead.
- */
- @Deprecated
- public boolean isSSL() {
- return isSSLOnConnect();
- }
-
/**
* Tests whether the server identity checked as specified by RFC 2595
*
@@ -1261,18 +1053,6 @@ public abstract class Email {
return startTlsRequired;
}
- /**
- * Tests whether the client is configured to try to enable STARTTLS. See EMAIL-105 for reason of deprecation.
- *
- * @deprecated since 1.3, use {@link #isStartTLSEnabled()} instead.
- * @return true if using STARTTLS for authentication, false otherwise.
- * @since 1.1
- */
- @Deprecated
- public boolean isTLS() {
- return isStartTLSEnabled();
- }
-
/**
* Sends the email. Internally we build a MimeMessage which is afterwards sent to the SMTP server.
*
@@ -1762,20 +1542,6 @@ public abstract class Email {
this.socketConnectionTimeout = Math.toIntExact(socketConnectionTimeout.toMillis());
}
- /**
- * Sets the socket connection timeout value in milliseconds. Default is a 60 second timeout.
- *
- * @param socketConnectionTimeout the connection timeout
- * @throws IllegalStateException if the mail session is already initialized
- * @since 1.2
- * @deprecated Use {@link #setSocketConnectionTimeout(Duration)}.
- */
- @Deprecated
- public void setSocketConnectionTimeout(final int socketConnectionTimeout) {
- checkSessionAlreadyInitialized();
- this.socketConnectionTimeout = socketConnectionTimeout;
- }
-
/**
* Sets the socket I/O timeout value in milliseconds. Default is 60 second timeout.
*
@@ -1788,31 +1554,6 @@ public abstract class Email {
this.socketTimeout = Math.toIntExact(socketTimeout.toMillis());
}
- /**
- * Sets the socket I/O timeout value in milliseconds. Default is 60 second timeout.
- *
- * @param socketTimeout the socket I/O timeout
- * @throws IllegalStateException if the mail session is already initialized
- * @since 1.2
- * @deprecated Use {@link #setSocketTimeout(Duration)}.
- */
- @Deprecated
- public void setSocketTimeout(final int socketTimeout) {
- checkSessionAlreadyInitialized();
- this.socketTimeout = socketTimeout;
- }
-
- /**
- * Sets whether SSL/TLS encryption should be enabled for the SMTP transport upon connection (SMTPS/POPS). See EMAIL-105 for reason of deprecation.
- *
- * @param ssl whether to enable the SSL transport
- * @deprecated since 1.3, use {@link #setSSLOnConnect(boolean)} instead.
- */
- @Deprecated
- public void setSSL(final boolean ssl) {
- setSSLOnConnect(ssl);
- }
-
/**
* Sets whether the server identity is checked as specified by RFC 2595
*
@@ -1902,18 +1643,6 @@ public abstract class Email {
return this;
}
- /**
- * Sets or disable the STARTTLS encryption. Please see EMAIL-105 for the reasons of deprecation.
- *
- * @param withTLS true if STARTTLS requested, false otherwise
- * @since 1.1
- * @deprecated since 1.3, use {@link #setStartTLSEnabled(boolean)} instead.
- */
- @Deprecated
- public void setTLS(final boolean withTLS) {
- setStartTLSEnabled(withTLS);
- }
-
/**
* Sets a list of "TO" addresses. All elements in the specified {@code Collection} are expected to be of type {@code java.mail.internet.InternetAddress}.
*
diff --git a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java
index 58db1bd..7a66333 100644
--- a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java
+++ b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/EmailConstants.java
@@ -29,41 +29,9 @@ import java.time.Duration;
*/
public final class EmailConstants {
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String SENDER_EMAIL = "sender.email";
+
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String SENDER_NAME = "sender.name";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String RECEIVER_EMAIL = "receiver.email";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String RECEIVER_NAME = "receiver.name";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String EMAIL_SUBJECT = "email.subject";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String EMAIL_BODY = "email.body";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String CONTENT_TYPE = "content.type";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String ATTACHMENTS = "attachments";
-
- /** @deprecated since 1.3, not in use since 1.0 */
- @Deprecated
- public static final String FILE_SERVER = "file.server";
+
// Charset constants
@@ -119,10 +87,6 @@ public final class EmailConstants {
// since 1.1
/////////////////////////////////////////////////////////////////////////
- /** @deprecated since 1.3 */
- @Deprecated
- public static final String MAIL_TRANSPORT_TLS = "mail.smtp.starttls.enable";
-
/**
* Indicates if the STARTTLS command shall be used to initiate a TLS-secured connection.
*
@@ -172,15 +136,6 @@ public final class EmailConstants {
*/
public static final Duration SOCKET_TIMEOUT = Duration.ofMinutes(1);
- /**
- * Default socket timeout.
- *
- * @since 1.3
- * @deprecated Use {@link #SOCKET_TIMEOUT}.
- */
- @Deprecated
- public static final int SOCKET_TIMEOUT_MS = 60_000;
-
/**
* If true, requires the use of the STARTTLS command. If the server doesn't support the STARTTLS command, the connection will fail.
*
diff --git a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
index 9e44f25..3ce078f 100644
--- a/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
+++ b/commons-email-javax/src/main/java/org/apache/commons/mail2/javax/HtmlEmail.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -163,33 +162,18 @@ public class HtmlEmail extends MultiPartEmail {
/**
* Text part of the message. This will be used as alternative text if the email client does not support HTML messages.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected String text;
+ private String text;
/**
* HTML part of the message.
- *
- * @deprecated Use getters and getters.
- */
- @Deprecated
- protected String html;
-
- /**
- * @deprecated As of commons-email 1.1, no longer used. Inline embedded objects are now stored in {@link #inlineEmbeds}.
*/
- @Deprecated
- protected List<InlineImage> inlineImages;
+ private String html;
/**
* Embedded images Map<String, InlineImage> where the key is the user-defined image name.
- *
- * @deprecated Use getters and getters.
*/
- @Deprecated
- protected Map<String, InlineImage> inlineEmbeds = new HashMap<>();
+ private Map<String, InlineImage> inlineEmbeds = new HashMap<>();
/**
* Constructs a new instance.
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/AbstractEmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/AbstractEmailTest.java
index 47e5f79..2f8e53a 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/AbstractEmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/AbstractEmailTest.java
@@ -37,7 +37,6 @@ import javax.mail.Multipart;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.mail2.javax.EmailUtils;
import org.apache.commons.mail2.javax.settings.EmailConfiguration;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/DefaultAuthenticatorTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/DefaultAuthenticatorTest.java
index 14646c2..0f84c3a 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/DefaultAuthenticatorTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/DefaultAuthenticatorTest.java
@@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import javax.mail.PasswordAuthentication;
-import org.apache.commons.mail2.javax.DefaultAuthenticator;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailAttachmentTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailAttachmentTest.java
index d2eba59..6dfdf2c 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailAttachmentTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailAttachmentTest.java
@@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.net.URL;
-import org.apache.commons.mail2.javax.EmailAttachment;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailConstantsTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailConstantsTest.java
index 564085e..174791e 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailConstantsTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailConstantsTest.java
@@ -17,19 +17,8 @@
package org.apache.commons.mail2.javax;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.time.Duration;
-
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.junit.jupiter.api.Test;
-
public class EmailConstantsTest {
- @SuppressWarnings("deprecation")
- @Test
- public void test_SOCKET_TIMEOUT() {
- assertEquals(EmailConstants.SOCKET_TIMEOUT, Duration.ofMillis(EmailConstants.SOCKET_TIMEOUT_MS));
- }
+ // empty for now
}
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailLiveTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailLiveTest.java
index 317e18b..0b7ef58 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailLiveTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailLiveTest.java
@@ -33,15 +33,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.mail2.javax.DefaultAuthenticator;
-import org.apache.commons.mail2.javax.Email;
-import org.apache.commons.mail2.javax.EmailAttachment;
-import org.apache.commons.mail2.javax.EmailException;
-import org.apache.commons.mail2.javax.EmailUtils;
-import org.apache.commons.mail2.javax.HtmlEmail;
-import org.apache.commons.mail2.javax.ImageHtmlEmail;
-import org.apache.commons.mail2.javax.MultiPartEmail;
-import org.apache.commons.mail2.javax.SimpleEmail;
import org.apache.commons.mail2.javax.resolver.DataSourceUrlResolver;
import org.apache.commons.mail2.javax.settings.EmailConfiguration;
import org.junit.jupiter.api.BeforeEach;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
index 60ae314..bb73ab7 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailTest.java
@@ -45,9 +45,6 @@ import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
-import org.apache.commons.mail2.javax.DefaultAuthenticator;
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.apache.commons.mail2.javax.EmailException;
import org.apache.commons.mail2.javax.mocks.MockEmailConcrete;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1045,20 +1042,14 @@ public class EmailTest extends AbstractEmailTest {
@Test
public void testSocketConnectionTimeout() {
- assertEquals(EmailConstants.SOCKET_TIMEOUT_MS, email.getSocketConnectionTimeout());
assertEquals(EmailConstants.SOCKET_TIMEOUT.toMillis(), email.getSocketConnectionTimeout());
- email.setSocketConnectionTimeout(1234);
- assertEquals(1234, email.getSocketConnectionTimeout());
email.setSocketConnectionTimeout(Duration.ofMillis(5678));
assertEquals(5678, email.getSocketConnectionTimeout());
}
@Test
public void testSocketTimeout() {
- assertEquals(EmailConstants.SOCKET_TIMEOUT_MS, email.getSocketTimeout());
assertEquals(EmailConstants.SOCKET_TIMEOUT.toMillis(), email.getSocketTimeout());
- email.setSocketTimeout(1234);
- assertEquals(1234, email.getSocketTimeout());
email.setSocketTimeout(Duration.ofMillis(5678));
assertEquals(5678, email.getSocketTimeout());
}
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailUtilsTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailUtilsTest.java
index b82c4e2..18dcee6 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailUtilsTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/EmailUtilsTest.java
@@ -19,7 +19,6 @@ package org.apache.commons.mail2.javax;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.commons.mail2.javax.EmailUtils;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
index f35dc29..4d2e8c9 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/HtmlEmailTest.java
@@ -32,11 +32,6 @@ import javax.activation.DataSource;
import javax.activation.FileDataSource;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.mail2.javax.EmailAttachment;
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.apache.commons.mail2.javax.EmailException;
-import org.apache.commons.mail2.javax.EmailUtils;
-import org.apache.commons.mail2.javax.HtmlEmail;
import org.apache.commons.mail2.javax.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail2.javax.settings.EmailConfiguration;
import org.apache.commons.mail2.javax.util.MimeMessageParser;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/ImageHtmlEmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/ImageHtmlEmailTest.java
index c323ebe..5c5fb41 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/ImageHtmlEmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/ImageHtmlEmailTest.java
@@ -36,9 +36,6 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.EmailException;
-import org.apache.commons.mail2.javax.ImageHtmlEmail;
import org.apache.commons.mail2.javax.mocks.MockImageHtmlEmailConcrete;
import org.apache.commons.mail2.javax.resolver.DataSourceClassPathResolver;
import org.apache.commons.mail2.javax.resolver.DataSourceCompositeResolver;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/InvalidAddressTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/InvalidAddressTest.java
index cbc845f..5754340 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/InvalidAddressTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/InvalidAddressTest.java
@@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.stream.IntStream;
-import org.apache.commons.mail2.javax.EmailException;
import org.apache.commons.mail2.javax.mocks.MockEmailConcrete;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
index 8d63823..1bb6054 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/MultiPartEmailTest.java
@@ -32,10 +32,6 @@ import javax.activation.FileDataSource;
import javax.activation.URLDataSource;
import javax.mail.internet.MimeMultipart;
-import org.apache.commons.mail2.javax.EmailAttachment;
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.apache.commons.mail2.javax.EmailException;
-import org.apache.commons.mail2.javax.EmailUtils;
import org.apache.commons.mail2.javax.mocks.MockMultiPartEmailConcrete;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
index 8f78008..ab1c8b6 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SendWithAttachmentsTest.java
@@ -22,9 +22,6 @@ import java.net.URL;
import javax.mail.internet.MimeUtility;
-import org.apache.commons.mail2.javax.EmailAttachment;
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.apache.commons.mail2.javax.EmailException;
import org.apache.commons.mail2.javax.mocks.MockHtmlEmailConcrete;
import org.apache.commons.mail2.javax.settings.EmailConfiguration;
import org.junit.jupiter.api.BeforeEach;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
index 48ac265..a930344 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/SimpleEmailTest.java
@@ -23,9 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.mail2.javax.EmailConstants;
-import org.apache.commons.mail2.javax.EmailException;
-import org.apache.commons.mail2.javax.EmailUtils;
import org.apache.commons.mail2.javax.mocks.MockSimpleEmail;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceClassPathResolverTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceClassPathResolverTest.java
index a5c42ca..2c95ca7 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceClassPathResolverTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceClassPathResolverTest.java
@@ -24,7 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceClassPathResolver;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceCompositeResolverTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceCompositeResolverTest.java
index a995c61..1402db0 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceCompositeResolverTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceCompositeResolverTest.java
@@ -24,9 +24,6 @@ import java.io.IOException;
import java.net.URL;
import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceClassPathResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceCompositeResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceUrlResolver;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceFileResolverTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceFileResolverTest.java
index 00d2fba..08f308b 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceFileResolverTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceFileResolverTest.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceFileResolver;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourcePathResolverTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourcePathResolverTest.java
index cc8a85e..6447331 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourcePathResolverTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourcePathResolverTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.nio.file.Paths;
import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourcePathResolver;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceUrlResolverTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceUrlResolverTest.java
index 9740785..ed4d886 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceUrlResolverTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/resolver/DataSourceUrlResolverTest.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.net.URL;
import org.apache.commons.mail2.javax.DataSourceResolver;
-import org.apache.commons.mail2.javax.resolver.DataSourceUrlResolver;
import org.junit.jupiter.api.Test;
/**
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/IDNEmailAddressConverterTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/IDNEmailAddressConverterTest.java
index 59c5949..e64d303 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/IDNEmailAddressConverterTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/IDNEmailAddressConverterTest.java
@@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.mail.internet.InternetAddress;
-import org.apache.commons.mail2.javax.util.IDNEmailAddressConverter;
import org.junit.jupiter.api.Test;
public class IDNEmailAddressConverterTest {
diff --git a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/MimeMessageParserTest.java b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/MimeMessageParserTest.java
index 3b740d3..b7454c2 100644
--- a/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/MimeMessageParserTest.java
+++ b/commons-email-javax/src/test/java/org/apache/commons/mail2/javax/util/MimeMessageParserTest.java
@@ -32,8 +32,6 @@ import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import org.apache.commons.mail2.javax.HtmlEmail;
-import org.apache.commons.mail2.javax.util.MimeMessageParser;
-import org.apache.commons.mail2.javax.util.MimeMessageUtils;
import org.junit.jupiter.api.Test;
/**