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
The following commit(s) were added to refs/heads/master by this push:
new bea4e20 Use isEmpty().
bea4e20 is described below
commit bea4e20be2e24ae767a7857e00553b2a86ae527f
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jan 16 22:27:16 2021 -0500
Use isEmpty().
---
src/main/java/org/apache/commons/mail/Email.java | 10 +++++-----
src/main/java/org/apache/commons/mail/HtmlEmail.java | 4 ++--
.../java/org/apache/commons/mail/util/MimeMessageParser.java | 2 +-
src/test/java/org/apache/commons/mail/AbstractEmailTest.java | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/commons/mail/Email.java
b/src/main/java/org/apache/commons/mail/Email.java
index 4068d64..cbc23a1 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -1388,35 +1388,35 @@ public abstract class Email
throw new EmailException("At least one receiver address
required");
}
- if (this.toList.size() > 0)
+ if (!this.toList.isEmpty())
{
this.message.setRecipients(
Message.RecipientType.TO,
this.toInternetAddressArray(this.toList));
}
- if (this.ccList.size() > 0)
+ if (!this.ccList.isEmpty())
{
this.message.setRecipients(
Message.RecipientType.CC,
this.toInternetAddressArray(this.ccList));
}
- if (this.bccList.size() > 0)
+ if (!this.bccList.isEmpty())
{
this.message.setRecipients(
Message.RecipientType.BCC,
this.toInternetAddressArray(this.bccList));
}
- if (this.replyList.size() > 0)
+ if (!this.replyList.isEmpty())
{
this.message.setReplyTo(
this.toInternetAddressArray(this.replyList));
}
- if (this.headers.size() > 0)
+ if (!this.headers.isEmpty())
{
for (final Map.Entry<String, String> entry :
this.headers.entrySet())
{
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java
b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index 2462f0e..864e6ff 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -527,7 +527,7 @@ public class HtmlEmail extends MultiPartEmail
// determine how to form multiparts of email
- if (EmailUtils.isNotEmpty(this.html) && this.inlineEmbeds.size() > 0)
+ if (EmailUtils.isNotEmpty(this.html) && !this.inlineEmbeds.isEmpty())
{
//If HTML body and embeds are used, create a related container and
add it to the root container
bodyEmbedsContainer = new MimeMultipart("related");
@@ -556,7 +556,7 @@ public class HtmlEmail extends MultiPartEmail
// inline images, the root container should have
mimetype
// "multipart/alternative".
// reference: http://tools.ietf.org/html/rfc2046#section-5.1.4
- if (this.inlineEmbeds.size() > 0 || isBoolHasAttachments())
+ if (!this.inlineEmbeds.isEmpty() || isBoolHasAttachments())
{
// If both HTML and TEXT bodies are provided, create an
alternative
// container and add it to the root container
diff --git a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
b/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
index 1ec152f..556c2b6 100644
--- a/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
+++ b/src/main/java/org/apache/commons/mail/util/MimeMessageParser.java
@@ -337,7 +337,7 @@ public class MimeMessageParser
/** @return true if attachments are available */
public boolean hasAttachments()
{
- return this.attachmentList.size() > 0;
+ return !this.attachmentList.isEmpty();
}
/**
diff --git a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
index 2d23c92..8c1324f 100644
--- a/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
@@ -282,14 +282,14 @@ public abstract class AbstractEmailTest
toAdd.toString().contains(mimeMessage.getHeader("To",
null)));
//test cc address
- if (ccAdd.size() > 0)
+ if (!ccAdd.isEmpty())
{
assertTrue("got wrong Cc: address from mail",
ccAdd.toString().contains(mimeMessage.getHeader("Cc",
null)));
}
//test bcc address
- if (bccAdd.size() > 0)
+ if (!bccAdd.isEmpty())
{
assertTrue("got wrong Bcc: address from mail",
bccAdd.toString().contains(mimeMessage.getHeader("Bcc",
null)));
