decouple file type detector tika from the model

Author: ibalosh

src/main/java/com/postmarkapp/postmark/client/data/FileDetails.java

@@ -0,0 +1,19 @@
+package com.postmarkapp.postmark.client.data;
+
+import org.apache.tika.Tika;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class FileDetails {
+    public static String getFileName(String path) {
+        return new File(path).getName();
+    }
+    public static byte[] getFileContent(String path) throws IOException {
+        return Files.readAllBytes(Paths.get(path));
+    }
+    public static String getFileContentType(String path) throws IOException {
+        return new Tika().detect(new File(path));
+    }
+}

src/main/java/com/postmarkapp/postmark/client/data/model/message/BaseMessage.java

@@ -1,11 +1,8 @@
 package com.postmarkapp.postmark.client.data.model.message;
 
-import java.io.File;
+import com.postmarkapp.postmark.client.data.FileDetails;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
-import org.apache.tika.Tika;
 
 /**
  * Base email message object
@@ -238,7 +235,8 @@ public void setAttachments(List<Map<String, String>> attachments) {
      * @throws IOException
      */
     public void addAttachment(String path) throws IOException {
-        addAttachment(new File(path).getName(), readFileContent(path), readFileContentType(path));
+        addAttachment(FileDetails.getFileName(path), FileDetails.getFileContent(path),
+                FileDetails.getFileContentType(path));
     }
 
     /**
@@ -248,7 +246,8 @@ public void addAttachment(String path) throws IOException {
      * @param contentId file content id, like "cid:image.jpg", very usefull for inline images
      */
     public void addAttachment(String path, String contentId) throws IOException {
-        addAttachment(new File(path).getName(), readFileContent(path), readFileContentType(path), contentId);
+        addAttachment(FileDetails.getFileName(path), FileDetails.getFileContent(path),
+                FileDetails.getFileContentType(path), contentId);
     }
 
     /**
@@ -328,14 +327,6 @@ public void addAttachments(List<Map<String, String>> attachments) {
         attachments.forEach(this::addAttachment);
     }
 
-    private byte[] readFileContent(String path) throws IOException {
-        return Files.readAllBytes(Paths.get(path));
-    }
-
-    private String readFileContentType(String path) throws IOException {
-        return new Tika().detect(new File(path));
-    }
-
     /**
      * Converts list of recipients which contains full name next to email address to a string.
      * By passing something like Map of: key -> John Smith, value -> [email protected]

src/main/java/com/postmarkapp/postmark/client/data/model/templates/BaseTemplatedMessage.java

@@ -1,12 +1,9 @@
 package com.postmarkapp.postmark.client.data.model.templates;
 
+import com.postmarkapp.postmark.client.data.FileDetails;
 import com.postmarkapp.postmark.client.data.model.message.Header;
-import org.apache.tika.Tika;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
 
 /**
@@ -222,7 +219,8 @@ public void setAttachments(List<Map<String, String>> attachments) {
      * @param path file path
      */
     public void addAttachment(String path) throws IOException {
-        addAttachment(new File(path).getName(), readFileContent(path), readFileContentType(path));
+        addAttachment(FileDetails.getFileName(path), FileDetails.getFileContent(path),
+                FileDetails.getFileContentType(path));
     }
 
     /**
@@ -232,7 +230,8 @@ public void addAttachment(String path) throws IOException {
      * @param contentId file content id, like "cid:image.jpg", very usefull for inline images
      */
     public void addAttachment(String path, String contentId) throws IOException {
-        addAttachment(new File(path).getName(), readFileContent(path), readFileContentType(path), contentId);
+        addAttachment(FileDetails.getFileName(path), FileDetails.getFileContent(path),
+                FileDetails.getFileContentType(path), contentId);
     }
 
     /**
@@ -312,14 +311,6 @@ public void addAttachments(List<Map<String, String>> attachments) {
         attachments.forEach(this::addAttachment);
     }
 
-    private byte[] readFileContent(String path) throws IOException {
-        return Files.readAllBytes(Paths.get(path));
-    }
-
-    private String readFileContentType(String path) throws IOException {
-        return new Tika().detect(new File(path));
-    }
-
     /**
      * This helper method allows setting list of recipients which will contain full name next to email address.
      * By passing something like Map of: key -> John Smith, value -> [email protected]

src/test/java/unit/data/MessageTest.java

@@ -8,7 +8,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 
@@ -188,13 +191,15 @@ void attachmentException() throws IOException {
 
     @Test
     void addPdfAttachment() throws IOException {
+        String path = getDefaultFilePath() + "/test.pdf";
         Message message = new Message("[email protected]","[email protected]","Hello world", "Hello world");
-        message.addAttachment(getDefaultFilePath() + "/test.pdf" );
+        message.addAttachment(path);
+        String base64message = Base64.getEncoder().encodeToString(Files.readAllBytes(Paths.get(path)));
 
         HashMap<String,String> attachment = (HashMap<String, String>) message.getAttachments().get(0);
         assertEquals(attachment.get("ContentType"), "application/pdf");
-        assertEquals(attachment.get("Name"), new File(getDefaultFilePath() + "/test.pdf").getName());
-        assertNotNull(attachment.get("Content"));
+        assertEquals(attachment.get("Name"), new File(path).getName());
+        assertEquals(attachment.get("Content"), base64message);
         assertEquals(attachment.get("ContentId"), null);
     }
 
@@ -203,11 +208,12 @@ void addImageAttachment() throws IOException {
         String file = getDefaultFilePath() + "/test.jpg";
         Message message = new Message("[email protected]","[email protected]","Hello world", "Hello world");
         message.addAttachment(file);
+        String base64message = Base64.getEncoder().encodeToString(Files.readAllBytes(Paths.get(file)));
 
         HashMap<String,String> attachment = (HashMap<String, String>) message.getAttachments().get(0);
         assertEquals(attachment.get("ContentType"), "image/jpeg");
         assertEquals(attachment.get("Name"), new File(file).getName());
-        assertNotNull(attachment.get("Content"));
+        assertEquals(attachment.get("Content"), base64message);
         assertEquals(attachment.get("ContentId"), null);
     }
 
@@ -230,11 +236,12 @@ void addAttachmentWithContentId() throws IOException {
         String file = getDefaultFilePath() + "/test.pdf";
         Message message = new Message("[email protected]","[email protected]","Hello world", "Hello world");
         message.addAttachment(file, contentId);
+        String base64message = Base64.getEncoder().encodeToString(Files.readAllBytes(Paths.get(file)));
 
         HashMap<String,String> attachment = (HashMap<String, String>) message.getAttachments().get(0);
         assertEquals(attachment.get("ContentType"), "application/pdf");
         assertEquals(attachment.get("Name"), new File(file).getName());
-        assertNotNull(attachment.get("Content"));
+        assertEquals(attachment.get("Content"), base64message);
         assertEquals(attachment.get("ContentId"), contentId);
     }