From c5f8b45877a36683e301fc5b41b5eff38aa46144 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 13 Nov 2022 17:04:57 +0100
Subject: [PATCH] Continued: - thrown exceptions from private methods are very
hard or impossible to test
---
.../model/delivery/BaseMailerBean.java | 42 -------------------
1 file changed, 42 deletions(-)
diff --git a/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java b/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
index 7d16adb..b35b880 100644
--- a/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
+++ b/src/org/mxchange/jmailee/model/delivery/BaseMailerBean.java
@@ -90,48 +90,6 @@ public abstract class BaseMailerBean extends BaseEnterpriseBean implements Deliv
// Trace message
this.getLoggerBeanLocal().logTrace(MessageFormat.format("deliverMail: emailWrapper={0},body={1},mailSession={2} - CALLED!", emailWrapper, writer, mailSession)); //NOI18N
- // Are the additional properties and all parameter set?
- if (null == this.properties) {
- // Nothing set
- throw new NullPointerException("this.properties is null"); //NOI18N
- } else if (!this.properties.containsKey("mailer.from")) { //NOI18N
- // Throw exception
- throw new IllegalStateException("this.properties.mailer.from is not set"); //NOI18N
- } else if (null == emailWrapper) {
- // Throw NPE
- throw new NullPointerException("emailWrapper is null"); //NOI18N
- } else if (emailWrapper.getLocale() == null) {
- // Throw it again
- throw new NullPointerException("emailWrapper.locale is null"); //NOI18N
- } else if (emailWrapper.getRecipientAddress() == null) {
- // Throw it again
- throw new NullPointerException("emailWrapper.recipientAddress is null"); //NOI18N
- } else if (emailWrapper.getTemplateName() == null) {
- // Throw it again
- throw new NullPointerException("emailWrapper.templateName is null"); //NOI18N
- } else if (emailWrapper.getTemplateName().isEmpty()) {
- // Throw IAE
- throw new IllegalArgumentException("emailWrapper.templateName is empty"); //NOI18N
- } else if (emailWrapper.getTemplateVariables() == null) {
- // Throw NPE again
- throw new NullPointerException("emailWrapper.templateVariables is null"); //NOI18N
- } else if (emailWrapper.getTemplateVariables().isEmpty()) {
- // Throw IAE
- throw new IllegalArgumentException("emailWrapper.templateVariables is empty"); //NOI18N
- } else if (!emailWrapper.getTemplateVariables().containsKey("baseUrl")) { //NOI18N
- // Not set
- throw new IllegalArgumentException("emailWrapper.templateVariables.baseUrl is not set"); //NOI18N
- } else if (null == writer) {
- // Throw NPE
- throw new NullPointerException("writer is null"); //NOI18N
- } else if (writer.toString().isEmpty()) {
- // Throw IAE
- throw new IllegalArgumentException("writer.string is empty"); //NOI18N
- } else if (null == mailSession) {
- // Throw NPE
- throw new NullPointerException("mailSession is null"); //NOI18N
- }
-
// Parse from address
final Address senderAddress = new InternetAddress(this.properties.getProperty("mailer.from"));
--
2.39.5