diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-03-26 17:14:08 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-03-26 17:14:08 +0000 |
| commit | 36befa1f40053899efa58ddeef3aa756dda7cef4 (patch) | |
| tree | 916a0c473dec4c8f9dc8f05c689ab62708516f57 /src/main/java/org/zwobble/mammoth/internal/docx | |
| parent | 150bedb37750e80d598f7072f55ce7487e257216 (diff) | |
Remove more usages of Guava
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/docx')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java index 3f55f8c..c17346c 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java @@ -1,33 +1,32 @@ package org.zwobble.mammoth.internal.docx; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import static org.zwobble.mammoth.internal.util.MammothMaps.eagerMapValues; import static org.zwobble.mammoth.internal.util.MammothMaps.lookup; import static org.zwobble.mammoth.internal.util.Streams.toByteArray; public class InMemoryDocxFile implements DocxFile { public static DocxFile fromStream(InputStream stream) throws IOException { ZipInputStream zipStream = new ZipInputStream(stream); - ImmutableMap.Builder<String, byte[]> entries = ImmutableMap.builder(); + Map<String, byte[]> entries = new HashMap<>(); ZipEntry entry; while ((entry = zipStream.getNextEntry()) != null) { entries.put(entry.getName(), toByteArray(zipStream)); } - return new InMemoryDocxFile(entries.build()); + return new InMemoryDocxFile(entries); } public static DocxFile fromStrings(Map<String, String> entries) { - return new InMemoryDocxFile(Maps.transformValues(entries, value -> value.getBytes(StandardCharsets.UTF_8))); + return new InMemoryDocxFile(eagerMapValues(entries, value -> value.getBytes(StandardCharsets.UTF_8))); } private final Map<String, byte[]> entries; |
