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 ad...@apache.org on 2017/12/18 19:34:38 UTC

[02/50] [abbrv] james-project git commit: JAMES-2261 More functional style for getUserName

JAMES-2261 More functional style for getUserName


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/13c5dbc2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/13c5dbc2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/13c5dbc2

Branch: refs/heads/master
Commit: 13c5dbc2fe6ea5c6de8ccd1cb2eb94c5cf6172d9
Parents: 465f315
Author: benwa <bt...@linagora.com>
Authored: Fri Dec 15 11:30:52 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Fri Dec 15 13:50:56 2017 +0700

----------------------------------------------------------------------
 .../org/apache/james/imap/api/ImapSessionUtils.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/13c5dbc2/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
index 76ad8be..9c8fc44 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapSessionUtils.java
@@ -19,9 +19,13 @@
 
 package org.apache.james.imap.api;
 
+import java.util.Optional;
+
 import org.apache.james.imap.api.process.ImapSession;
 import org.apache.james.mailbox.MailboxSession;
 
+import com.google.common.base.Preconditions;
+
 public class ImapSessionUtils {
 
     public static final String MAILBOX_USER_ATTRIBUTE_SESSION_KEY = "org.apache.james.api.imap.MAILBOX_USER_ATTRIBUTE_SESSION_KEY";
@@ -33,13 +37,9 @@ public class ImapSessionUtils {
     }
 
     public static String getUserName(ImapSession imapSession) {
-        final String result;
-        final MailboxSession mailboxSession = getMailboxSession(imapSession);
-        if (mailboxSession == null) {
-            result = null;
-        } else {
-            result = mailboxSession.getUser().getUserName();
-        }
-        return result;
+        Preconditions.checkNotNull(imapSession);
+        return Optional.ofNullable(getMailboxSession(imapSession))
+            .map(mailboxSession -> mailboxSession.getUser().getUserName())
+            .orElse(null);
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org