Skip to content

Commit 4822d79

Browse files
committed
Added missing log statements to help determine which field was unequal betwen to Email instances
1 parent 02f2a5f commit 4822d79

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

modules/core-module/src/main/java/org/simplejavamail/api/email/EqualsHelper.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static boolean equalsEmail(final Email email1, final Email email2) {
3030
if (!fieldIsEqual(email1.getSentDate(), email2.getSentDate(), "sendDate")) {
3131
return false;
3232
}
33-
if (!isEqualRecipientList(email1.getReplyToRecipients(), email2.getReplyToRecipients())) {
33+
if (!isEqualRecipientList("ReplyTo", email1.getReplyToRecipients(), email2.getReplyToRecipients())) {
3434
return false;
3535
}
3636
if (!fieldIsEqual(email1.getBounceToRecipient(), email2.getBounceToRecipient(), "bounceToRecipient")) {
@@ -47,33 +47,40 @@ public static boolean equalsEmail(final Email email1, final Email email2) {
4747
}
4848
//noinspection SimplifiableConditionalExpression
4949
if (email1.getEmailToForward() != null ? email2.getEmailToForward() == null : email2.getEmailToForward() != null) {
50+
log.debug("Email unqual for emailToForward: {} vs {}", email1.getEmailToForward(), email2.getEmailToForward());
5051
return false;
5152
}
5253
if (email1.getHTMLText() != null ? !normalizeNewlines(email1.getHTMLText()).equals(normalizeNewlines(email2.getHTMLText())) : email2.getHTMLText() != null) {
54+
log.debug("Email unqual for HTML text: {} vs {}", email1.getHTMLText(), email2.getHTMLText());
5355
return false;
5456
}
5557
if (!fieldIsEqual(email1.getSubject(), email2.getSubject(), "subject")) {
5658
return false;
5759
}
58-
if (!isEqualRecipientList(email1.getRecipients(), email2.getRecipients())) {
60+
if (!isEqualRecipientList("TO/CC/BCC", email1.getRecipients(), email2.getRecipients())) {
5961
return false;
6062
}
61-
if (!isEqualRecipientList(email1.getOverrideReceivers(), email2.getOverrideReceivers())) {
63+
if (!isEqualRecipientList("Override receivers", email1.getOverrideReceivers(), email2.getOverrideReceivers())) {
6264
return false;
6365
}
6466
if (!email1.getEmbeddedImages().containsAll(email2.getEmbeddedImages()) || !email2.getEmbeddedImages().containsAll(email1.getEmbeddedImages())) {
67+
log.debug("Email unqual for embedded images: {} vs {}", email1.getEmbeddedImages(), email2.getEmbeddedImages());
6568
return false;
6669
}
6770
if (!email1.getAttachments().containsAll(email2.getAttachments()) || !email2.getAttachments().containsAll(email1.getAttachments())) {
71+
log.debug("Email unqual for attachments: {} vs {}", email1.getAttachments(), email2.getAttachments());
6872
return false;
6973
}
7074
if (!email1.getHeaders().equals(email2.getHeaders())) {
75+
log.debug("Email unqual for headers: {} vs {}", email1.getHeaders(), email2.getHeaders());
7176
return false;
7277
}
7378
if (!Objects.equals(email1.getUseDispositionNotificationTo(), email2.getUseDispositionNotificationTo())) {
79+
log.debug("Email unqual for useDispositionNotificationTo: {} vs {}", email1.getUseDispositionNotificationTo(), email2.getUseDispositionNotificationTo());
7480
return false;
7581
}
7682
if (!Objects.equals(email1.getUseReturnReceiptTo(), email2.getUseReturnReceiptTo())) {
83+
log.debug("Email unqual for useReturnReceiptTo: {} vs {}", email1.getUseReturnReceiptTo(), email2.getUseReturnReceiptTo());
7784
return false;
7885
}
7986
if (!fieldIsEqual(email1.getDispositionNotificationTo(), email2.getDispositionNotificationTo(), "dispositionNotificationTo")) {
@@ -91,8 +98,9 @@ public static boolean equalsEmail(final Email email1, final Email email2) {
9198
return fieldIsEqual(email1.getReturnReceiptTo(), email2.getReturnReceiptTo(), "returnReceiptTo");
9299
}
93100

94-
private static boolean isEqualRecipientList(final List<Recipient> recipients, final List<Recipient> otherRecipients) {
101+
private static boolean isEqualRecipientList(final String recipientType, final List<Recipient> recipients, final List<Recipient> otherRecipients) {
95102
if (recipients.size() != otherRecipients.size()) {
103+
log.debug("Email unqual for [{}] recipients: {} vs {}", recipientType, recipients, otherRecipients);
96104
return false;
97105
}
98106
for (final Recipient otherRecipient : otherRecipients) {

0 commit comments

Comments
 (0)