Move Base64 encoding into its own type

2 files changed, 22 insertions, 2 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
index deab0d3..268d942 100644
--- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
@@ -6,14 +6,15 @@ import org.zwobble.mammoth.internal.html.HtmlNode;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.styles.HtmlPath;
 import org.zwobble.mammoth.internal.styles.StyleMap;
+import org.zwobble.mammoth.internal.util.Base64Encoding;
 import org.zwobble.mammoth.internal.util.Lists;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 
 import static org.zwobble.mammoth.internal.util.Lists.*;
 import static org.zwobble.mammoth.internal.util.Maps.map;
-import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 
 public class DocumentToHtml {
     public static InternalResult<List<HtmlNode>> convertToHtml(Document document, DocumentToHtmlOptions options) {
@@ -207,7 +208,7 @@ public class DocumentToHtml {
                         try {
                             Map<String, String> attributes = new HashMap<>();
 
-                            String base64 = Base64.getEncoder().encodeToString(toByteArray(image.open()));
+                            String base64 = imageToBase64(image);
                             String src = "data:" + contentType + ";base64," + base64;
                             attributes.put("src", src);
 
@@ -224,6 +225,12 @@ public class DocumentToHtml {
         });
     }
 
+    private static String imageToBase64(Image image) throws IOException {
+        try (InputStream stream = image.open()) {
+            return Base64Encoding.streamToBase64(stream);
+        }
+    }
+
     private String generateNoteHtmlId(NoteType noteType, String noteId) {
         return generateId(noteTypeToIdFragment(noteType) + "-" + noteId);
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java b/src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java
new file mode 100644
index 0000000..0f829c2
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java
@@ -0,0 +1,13 @@
+package org.zwobble.mammoth.internal.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
+
+public class Base64Encoding {
+    public static String streamToBase64(InputStream stream) throws IOException {
+        return Base64.getEncoder().encodeToString(toByteArray(stream));
+    }
+}