(commons-email) 04/04: Internal refactoring

[ggregory]

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 077df4e40e99601ef825e8d65e0abc3ceead4872
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 15 15:29:23 2023 -0500

    Internal refactoring
---
 .../org/apache/commons/mail/EmailException.java    |  7 +++++++
 .../org/apache/commons/mail/MultiPartEmail.java    | 24 +++++++---------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/commons/mail/EmailException.java 
b/src/main/java/org/apache/commons/mail/EmailException.java
index a0d7396..8f54258 100644
--- a/src/main/java/org/apache/commons/mail/EmailException.java
+++ b/src/main/java/org/apache/commons/mail/EmailException.java
@@ -59,6 +59,13 @@ public class EmailException extends Exception {
         return check(() -> EmailUtils.isEmpty(value), value, message);
     }
 
+    static <T> T checkNonNull(final T test, final Supplier<String> message) 
throws EmailException {
+        if (test == null) {
+            throw new EmailException(message.get());
+        }
+        return test;
+    }
+
     /**
      * Constructs a new {@code EmailException} with no detail message.
      */
diff --git a/src/main/java/org/apache/commons/mail/MultiPartEmail.java 
b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
index f197a78..d65a530 100644
--- a/src/main/java/org/apache/commons/mail/MultiPartEmail.java
+++ b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
@@ -130,16 +130,12 @@ public class MultiPartEmail extends Email {
      * @since 1.0
      */
     public MultiPartEmail attach(final DataSource dataSource, final String 
name, final String description) throws EmailException {
-        if (dataSource == null) {
-            throw new EmailException("Invalid Datasource");
-        }
+        EmailException.checkNonNull(dataSource, () -> "Invalid Datasource.");
         // verify that the DataSource is valid
         try (InputStream inputStream = dataSource.getInputStream()) {
-            if (inputStream == null) {
-                throw new EmailException("Invalid Datasource");
-            }
+            EmailException.checkNonNull(inputStream, () -> "Invalid 
Datasource.");
         } catch (final IOException e) {
-            throw new EmailException("Invalid Datasource", e);
+            throw new EmailException("Invalid Datasource.", e);
         }
         return attach(dataSource, name, description, 
EmailAttachment.ATTACHMENT);
     }
@@ -183,14 +179,9 @@ public class MultiPartEmail extends Email {
      * @since 1.0
      */
     public MultiPartEmail attach(final EmailAttachment attachment) throws 
EmailException {
+        EmailException.checkNonNull(attachment, () -> "Invalid attachment.");
         MultiPartEmail result = null;
-
-        if (attachment == null) {
-            throw new EmailException("Invalid attachment supplied");
-        }
-
         final URL url = attachment.getURL();
-
         if (url == null) {
             String fileName = null;
             try {
@@ -206,7 +197,6 @@ public class MultiPartEmail extends Email {
         } else {
             result = attach(url, attachment.getName(), 
attachment.getDescription(), attachment.getDisposition());
         }
-
         return result;
     }
 
@@ -441,11 +431,11 @@ public class MultiPartEmail extends Email {
     /**
      * Sets the MIME subtype of the email.
      *
-     * @param aSubType MIME subtype of the email
+     * @param subType MIME subtype of the email
      * @since 1.0
      */
-    public void setSubType(final String aSubType) {
-        this.subType = aSubType;
+    public void setSubType(final String subType) {
+        this.subType = subType;
     }
 
 }