JAMES-2404 Fix Eclipse warnings

apache · May 29, 2018 · 2129cba · 2129cba
1 parent 0bde59b
commit 2129cba
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/...earch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java b/...earch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
@@ -27,7 +27,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.time.ZoneId;
-import java.util.Optional;
 
 import javax.mail.Flags;
 
@@ -48,6 +47,7 @@
 import org.apache.james.mailbox.tika.TikaHttpClientImpl;
 import org.apache.james.mailbox.tika.TikaTextExtractor;
 import org.apache.james.metrics.api.NoopMetricFactory;
+import org.assertj.core.api.iterable.Extractor;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -473,11 +473,18 @@ public void otherAttachmentsShouldBeenIndexedWhenOneOfThemCannotBeParsed() throw
 
         // Then
         assertThat(indexableMessage.getAttachments())
-            .extracting(MimePart::getTextualBody)
-            .contains(Optional.of("first attachment content"));
-        assertThat(indexableMessage.getAttachments())
-            .extracting(MimePart::getTextualBody)
-            .contains(Optional.of("third attachment content"));
+            .extracting(new TextualBodyExtractor())
+            .contains("first attachment content", TextualBodyExtractor.NO_TEXTUAL_BODY, "third attachment content");
+    }
+
+    private static class TextualBodyExtractor implements Extractor<MimePart, String> {
+
+        public static final String NO_TEXTUAL_BODY = "The textual body is not present";
+
+        @Override
+        public String extract(MimePart input) {
+            return input.getTextualBody().orElse(NO_TEXTUAL_BODY);
+        }
     }
 
     @Test