From 1644d9ae7b7eed9f68e6b896c008ec14979dcf01 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Fri, 8 Jan 2021 10:10:26 -0500
Subject: [PATCH] Collapse multiple identical catch clauses into one.

Remove unused import.
---
 src/main/java/org/apache/commons/mail/Email.java            | 6 +-----
 src/main/java/org/apache/commons/mail/EmailException.java   | 1 -
 src/main/java/org/apache/commons/mail/HtmlEmail.java        | 6 +-----
 src/main/java/org/apache/commons/mail/MultiPartEmail.java   | 6 +-----
 .../apache/commons/mail/mocks/MockHtmlEmailConcrete.java    | 6 +-----
 .../commons/mail/mocks/MockImageHtmlEmailConcrete.java      | 6 +-----
 .../commons/mail/mocks/MockMultiPartEmailConcrete.java      | 6 +-----
 7 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail/Email.java
index 4c01376b..4068d645 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -1969,11 +1969,7 @@ private InternetAddress createInternetAddress(final String email, final String n
             // it will throw AddressException.
             address.validate();
         }
-        catch (final AddressException e)
-        {
-            throw new EmailException(e);
-        }
-        catch (final UnsupportedEncodingException e)
+        catch (final AddressException | UnsupportedEncodingException e)
         {
             throw new EmailException(e);
         }
diff --git a/src/main/java/org/apache/commons/mail/EmailException.java b/src/main/java/org/apache/commons/mail/EmailException.java
index f2a8e5af..c7023904 100644
--- a/src/main/java/org/apache/commons/mail/EmailException.java
+++ b/src/main/java/org/apache/commons/mail/EmailException.java
@@ -21,7 +21,6 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 
 /**
  * Exception thrown when a checked error occurs in commons-email.
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index 54a232d5..2462f0ee 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -482,11 +482,7 @@ public String embed(final DataSource dataSource, final String name, final String
 
             return encodedCid;
         }
-        catch (final MessagingException me)
-        {
-            throw new EmailException(me);
-        }
-        catch (final UnsupportedEncodingException uee)
+        catch (final MessagingException | UnsupportedEncodingException uee)
         {
             throw new EmailException(uee);
         }
diff --git a/src/main/java/org/apache/commons/mail/MultiPartEmail.java b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
index 847a9cb5..15358f7a 100644
--- a/src/main/java/org/apache/commons/mail/MultiPartEmail.java
+++ b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
@@ -470,13 +470,9 @@ public MultiPartEmail attach(
 
             getContainer().addBodyPart(bodyPart);
         }
-        catch (final UnsupportedEncodingException uee)
+        catch (final UnsupportedEncodingException | MessagingException me)
         {
             // in case the file name could not be encoded
-            throw new EmailException(uee);
-        }
-        catch (final MessagingException me)
-        {
             throw new EmailException(me);
         }
         setBoolHasAttachments(true);
diff --git a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java b/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
index 8e98988f..fc0d1579 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
@@ -40,11 +40,7 @@ public String getMsg()
         {
             return this.getPrimaryBodyPart().getContent().toString();
         }
-        catch (final IOException ioE)
-        {
-            return null;
-        }
-        catch (final MessagingException msgE)
+        catch (final IOException | MessagingException msgE)
         {
             return null;
         }
diff --git a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java b/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
index 3058698c..40d62d94 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
@@ -37,11 +37,7 @@ public String getMsg()
         {
             return this.getPrimaryBodyPart().getContent().toString();
         }
-        catch (final IOException ioE)
-        {
-            return null;
-        }
-        catch (final MessagingException msgE)
+        catch (final IOException | MessagingException msgE)
         {
             return null;
         }
diff --git a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java b/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
index d0178a23..f6b3aed9 100644
--- a/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
+++ b/src/test/java/org/apache/commons/mail/mocks/MockMultiPartEmailConcrete.java
@@ -42,11 +42,7 @@ public String getMsg()
         {
             return this.getPrimaryBodyPart().getContent().toString();
         }
-        catch (final IOException ioE)
-        {
-            return null;
-        }
-        catch (final MessagingException msgE)
+        catch (final IOException | MessagingException msgE)
         {
             return null;
         }