[james-project] 16/44: [Refactoring] MessageResultImpl: partContent can never be null

[btellier]

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 7b8fc368f93315dcf3830a51e846c1749c7d4d4d
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Thu Nov 14 11:12:35 2019 +0700

    [Refactoring] MessageResultImpl: partContent can never be null
    
    IntelliJ asserted
---
 .../james/mailbox/store/MessageResultImpl.java     | 50 +++++-----------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git 
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
 
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index 775ae7a..133415f 100644
--- 
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ 
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -159,62 +159,32 @@ public class MessageResultImpl implements MessageResult {
 
     @Override
     public Content getBody(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getBody();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getBody();
     }
 
     @Override
     public Content getMimeBody(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getMimeBody();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getMimeBody();
     }
 
     @Override
     public Content getFullContent(MimePath path) {
-        final Content result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getFull();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getFull();
     }
 
     @Override
     public Iterator<Header> iterateHeaders(MimePath path) {
-        final Iterator<Header> result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getHeaders();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getHeaders();
     }
 
     @Override
     public Iterator<Header> iterateMimeHeaders(MimePath path) {
-        final Iterator<Header> result;
-        final PartContent partContent = getPartContent(path);
-        if (partContent == null) {
-            result = null;
-        } else {
-            result = partContent.getMimeHeaders();
-        }
-        return result;
+        PartContent partContent = getPartContent(path);
+        return partContent.getMimeHeaders();
     }
 
     public void setBodyContent(MimePath path, Content content) {


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