aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java9
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java6
2 files changed, 7 insertions, 8 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 268d942..19af0bc 100644
--- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
@@ -10,7 +10,6 @@ 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.*;
@@ -208,7 +207,7 @@ public class DocumentToHtml {
try {
Map<String, String> attributes = new HashMap<>();
- String base64 = imageToBase64(image);
+ String base64 = Base64Encoding.streamToBase64(image::open);
String src = "data:" + contentType + ";base64," + base64;
attributes.put("src", src);
@@ -225,12 +224,6 @@ 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
index 0f829c2..939e1ff 100644
--- a/src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Base64Encoding.java
@@ -7,6 +7,12 @@ import java.util.Base64;
import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
public class Base64Encoding {
+ public static String streamToBase64(SupplierWithException<InputStream, IOException> open) throws IOException {
+ try (InputStream stream = open.get()) {
+ return Base64Encoding.streamToBase64(stream);
+ }
+ }
+
public static String streamToBase64(InputStream stream) throws IOException {
return Base64.getEncoder().encodeToString(toByteArray(stream));
}