You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2016/08/29 13:38:05 UTC
[2/6] james-project git commit: MAILET-99 Refactor
MailetUtil.getInitParameter boolean method
MAILET-99 Refactor MailetUtil.getInitParameter boolean method
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/00ce9821
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/00ce9821
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/00ce9821
Branch: refs/heads/master
Commit: 00ce98211c2ea94cea61984548d289a53fe15855
Parents: fc95390
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Aug 25 15:12:08 2016 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Aug 29 14:54:33 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/mailet/base/MailetUtil.java | 14 ++++++--------
.../java/org/apache/mailet/base/MailetUtilTest.java | 6 ++++++
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/00ce9821/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java
index 5223eff..0155d5c 100644
--- a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java
+++ b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java
@@ -98,15 +98,13 @@ public class MailetUtil {
* otherwise the default value
*/
public static boolean getInitParameter(MailetConfig config, String name, boolean defaultValue) {
- final String value = config.getInitParameter(name);
- final boolean result;
+ String value = config.getInitParameter(name);
if ("true".equalsIgnoreCase(value)) {
- result = true;
- } else if ("false".equalsIgnoreCase(value)){
- result = false;
- } else {
- result = defaultValue;
+ return true;
}
- return result;
+ if ("false".equalsIgnoreCase(value)){
+ return false;
+ }
+ return defaultValue;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/00ce9821/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java
index fa3eaee..9a6700f 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java
@@ -84,6 +84,12 @@ public class MailetUtilTest {
assertThat(getParameterValued("gubbins", false)).isFalse();
}
+ @Test
+ public void getInitParameterShouldReturnDefaultValueWhenNull() {
+ assertThat(MailetUtil.getInitParameter(config, A_PARAMETER, false)).isFalse();
+ assertThat(MailetUtil.getInitParameter(config, A_PARAMETER, true)).isTrue();
+ }
+
private boolean getParameterValued(String value, boolean defaultValue) {
config.clear();
config.setProperty(A_PARAMETER, value);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org