This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e90031e9562ccd69003cd0da176aeff8f200300b Author: Gautier DI FOLCO <[email protected]> AuthorDate: Tue Oct 22 11:38:33 2019 +0200 JAMES-2928 Make GenericMailet's precondition policy consistent --- .../src/main/java/org/apache/mailet/base/GenericMailet.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index 9e3ea5d..6dce7c5 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -37,6 +37,7 @@ import org.apache.mailet.MailetContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; import com.google.common.base.Strings; /** @@ -57,6 +58,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { private static final String NO = "no"; private static final String TRUE = "true"; private static final String FALSE = "false"; + private static final String CONFIG_IS_NULL_ERROR_MESSAGE = "Mailet configuration must be set before getInitParameter is called."; private MailetConfig config = null; @@ -82,9 +84,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * @throws NullPointerException before {@link #init(MailetConfig)} */ public boolean getInitParameter(String name, boolean defaultValue) { - if (config == null) { - throw new NullPointerException("Mailet configuration must be set before getInitParameter is called."); - } + Preconditions.checkState(config != null, CONFIG_IS_NULL_ERROR_MESSAGE); return MailetUtil.getInitParameter(config, name).orElse(defaultValue); } @@ -126,6 +126,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { */ @Override public String getInitParameter(String name) { + Preconditions.checkState(config != null, CONFIG_IS_NULL_ERROR_MESSAGE); return config.getInitParameter(name); } @@ -142,6 +143,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { * @return a String containing the value of the initalization parameter */ public String getInitParameter(String name, String defValue) { + Preconditions.checkState(config != null, CONFIG_IS_NULL_ERROR_MESSAGE); String res = config.getInitParameter(name); if (res == null) { return defValue; @@ -163,6 +165,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { */ @Override public Iterator<String> getInitParameterNames() { + Preconditions.checkState(config != null, CONFIG_IS_NULL_ERROR_MESSAGE); return config.getInitParameterNames(); } @@ -206,6 +209,7 @@ public abstract class GenericMailet implements Mailet, MailetConfig { */ @Override public String getMailetName() { + Preconditions.checkState(config != null, CONFIG_IS_NULL_ERROR_MESSAGE); return config.getMailetName(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
