Rename DocxFile to Archive

10 files changed, 36 insertions, 36 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
index 3966b51..c5ba826 100644
--- a/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/InternalDocumentConverter.java
@@ -6,10 +6,10 @@ import org.zwobble.mammoth.internal.documents.DocumentElement;
 import org.zwobble.mammoth.internal.documents.HasChildren;
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Text;
-import org.zwobble.mammoth.internal.docx.DocxFile;
+import org.zwobble.mammoth.internal.docx.Archive;
 import org.zwobble.mammoth.internal.docx.EmbeddedStyleMap;
-import org.zwobble.mammoth.internal.docx.InMemoryDocxFile;
-import org.zwobble.mammoth.internal.docx.ZippedDocxFile;
+import org.zwobble.mammoth.internal.docx.InMemoryArchive;
+import org.zwobble.mammoth.internal.docx.ZippedArchive;
 import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.internal.results.InternalResult;
 import org.zwobble.mammoth.internal.styles.StyleMap;
@@ -48,7 +48,7 @@ public class InternalDocumentConverter {
                 convertToHtml(Optional.of(file.toPath()), zipFile)));
     }
 
-    private InternalResult<String> convertToHtml(Optional<Path> path, DocxFile zipFile) {
+    private InternalResult<String> convertToHtml(Optional<Path> path, Archive zipFile) {
         Optional<StyleMap> styleMap = readEmbeddedStyleMap(zipFile).map(StyleMapParser::parse);
         DocumentToHtmlOptions conversionOptions = styleMap.map(options::addEmbeddedStyleMap).orElse(options);
 
@@ -59,7 +59,7 @@ public class InternalDocumentConverter {
             .map(Html::write);
     }
 
-    private Optional<String> readEmbeddedStyleMap(DocxFile zipFile) {
+    private Optional<String> readEmbeddedStyleMap(Archive zipFile) {
         return PassThroughException.wrap(() -> EmbeddedStyleMap.readStyleMap(zipFile));
     }
 
@@ -75,19 +75,19 @@ public class InternalDocumentConverter {
                 extractRawText(Optional.of(file.toPath()), zipFile)));
     }
 
-    private InternalResult<String> extractRawText(Optional<Path> path, DocxFile zipFile) {
+    private InternalResult<String> extractRawText(Optional<Path> path, Archive zipFile) {
         return readDocument(path, zipFile)
             .map(InternalDocumentConverter::extractRawTextOfChildren);
     }
 
-    private static <T> T withDocxFile(File file, Function<DocxFile, T> function) throws IOException {
-        try (DocxFile zipFile = new ZippedDocxFile(file)) {
+    private static <T> T withDocxFile(File file, Function<Archive, T> function) throws IOException {
+        try (Archive zipFile = new ZippedArchive(file)) {
             return function.apply(zipFile);
         }
     }
 
-    private static <T> T withDocxFile(InputStream stream, Function<DocxFile, T> function) throws IOException {
-        try (DocxFile zipFile = InMemoryDocxFile.fromStream(stream)) {
+    private static <T> T withDocxFile(InputStream stream, Function<Archive, T> function) throws IOException {
+        try (Archive zipFile = InMemoryArchive.fromStream(stream)) {
             return function.apply(zipFile);
         }
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/Archive.java
index 23bddb1..8354662 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Archive.java
@@ -5,6 +5,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Optional;
 
-public interface DocxFile extends Closeable {
+public interface Archive extends Closeable {
     Optional<InputStream> tryGetInputStream(String name) throws IOException;
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
index fdbeee1..f31f6ee 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -31,7 +31,7 @@ public class BodyXmlReader {
     private final Numbering numbering;
     private final Relationships relationships;
     private final ContentTypes contentTypes;
-    private final DocxFile file;
+    private final Archive file;
     private final FileReader fileReader;
 
     public BodyXmlReader(
@@ -39,7 +39,7 @@ public class BodyXmlReader {
         Numbering numbering,
         Relationships relationships,
         ContentTypes contentTypes,
-        DocxFile file,
+        Archive file,
         FileReader fileReader)
     {
         this.styles = styles;
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 0452c63..afb7b74 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -21,7 +21,7 @@ public class DocumentReader {
         BodyXmlReader forName(String name);
     }
 
-    public static InternalResult<Document> readDocument(Optional<Path> path, DocxFile zipFile) {
+    public static InternalResult<Document> readDocument(Optional<Path> path, Archive zipFile) {
         Styles styles = readStyles(zipFile);
         Numbering numbering = readNumbering(zipFile);
         ContentTypes contentTypes = readContentTypes(zipFile);
@@ -39,13 +39,13 @@ public class DocumentReader {
             });
     }
 
-    private static InternalResult<List<Comment>> readComments(DocxFile file, BodyReaders bodyReaders) {
+    private static InternalResult<List<Comment>> readComments(Archive file, BodyReaders bodyReaders) {
         return tryParseOfficeXml(file, "word/comments.xml")
             .map(new CommentXmlReader(bodyReaders.forName("comments"))::readElement)
             .orElse(InternalResult.success(list()));
     }
 
-    private static InternalResult<Notes> readNotes(DocxFile file, BodyReaders bodyReaders) {
+    private static InternalResult<Notes> readNotes(Archive file, BodyReaders bodyReaders) {
         return InternalResult.map(
             tryParseOfficeXml(file, "word/footnotes.xml")
                 .map(NotesXmlReader.footnote(bodyReaders.forName("footnotes"))::readElement)
@@ -56,36 +56,36 @@ public class DocumentReader {
             Lists::eagerConcat).map(Notes::new);
     }
 
-    private static Styles readStyles(DocxFile file) {
+    private static Styles readStyles(Archive file) {
         return tryParseOfficeXml(file, "word/styles.xml")
             .map(StylesXml::readStylesXmlElement)
             .orElse(Styles.EMPTY);
     }
 
-    private static Numbering readNumbering(DocxFile file) {
+    private static Numbering readNumbering(Archive file) {
         return tryParseOfficeXml(file, "word/numbering.xml")
             .map(NumberingXml::readNumberingXmlElement)
             .orElse(Numbering.EMPTY);
     }
 
-    private static ContentTypes readContentTypes(DocxFile file) {
+    private static ContentTypes readContentTypes(Archive file) {
         return tryParseOfficeXml(file, "[Content_Types].xml")
             .map(ContentTypesXml::readContentTypesXmlElement)
             .orElse(ContentTypes.DEFAULT);
     }
 
-    private static Relationships readRelationships(DocxFile zipFile, String name) {
+    private static Relationships readRelationships(Archive zipFile, String name) {
         return tryParseOfficeXml(zipFile, "word/_rels/" + name + ".xml.rels")
             .map(RelationshipsXml::readRelationshipsXmlElement)
             .orElse(Relationships.EMPTY);
     }
 
-    private static Optional<XmlElement> tryParseOfficeXml(DocxFile zipFile, String name) {
+    private static Optional<XmlElement> tryParseOfficeXml(Archive zipFile, String name) {
         return PassThroughException.wrap(() ->
             zipFile.tryGetInputStream(name).map(OfficeXml::parseXml));
     }
 
-    private static XmlElement parseOfficeXml(DocxFile zipFile, String name) {
+    private static XmlElement parseOfficeXml(Archive zipFile, String name) {
         return tryParseOfficeXml(zipFile, name)
             .orElseThrow(() -> new PassThroughException(new IOException("Missing entry in file: " + name)));
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
index 5d06b76..1860bb7 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFiles.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public class DocxFiles {
-    static InputStream getInputStream(DocxFile file, String name) throws IOException {
+    static InputStream getInputStream(Archive file, String name) throws IOException {
         return file.tryGetInputStream(name)
             .orElseThrow(() -> new IOException("Missing entry in file: " + name));
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java b/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java
index 306ae99..2befa20 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/EmbeddedStyleMap.java
@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 public class EmbeddedStyleMap {
     private static final String PATH = "mammoth/style-map";
 
-    public static Optional<String> readStyleMap(DocxFile file) throws IOException {
+    public static Optional<String> readStyleMap(Archive file) throws IOException {
         return file.tryGetInputStream(PATH)
             .map(inputStream -> readInputStream(inputStream));
     }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryArchive.java
index c4ef2c3..fa635c1 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryArchive.java
@@ -14,24 +14,24 @@ import static org.zwobble.mammoth.internal.util.Maps.eagerMapValues;
 import static org.zwobble.mammoth.internal.util.Maps.lookup;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
 
-public class InMemoryDocxFile implements DocxFile {
-    public static DocxFile fromStream(InputStream stream) throws IOException {
+public class InMemoryArchive implements Archive {
+    public static Archive fromStream(InputStream stream) throws IOException {
         ZipInputStream zipStream = new ZipInputStream(stream);
         Map<String, byte[]> entries = new HashMap<>();
         ZipEntry entry;
         while ((entry = zipStream.getNextEntry()) != null) {
             entries.put(entry.getName(), toByteArray(zipStream));
         }
-        return new InMemoryDocxFile(entries);
+        return new InMemoryArchive(entries);
     }
 
-    public static DocxFile fromStrings(Map<String, String> entries) {
-        return new InMemoryDocxFile(eagerMapValues(entries, value -> value.getBytes(StandardCharsets.UTF_8)));
+    public static Archive fromStrings(Map<String, String> entries) {
+        return new InMemoryArchive(eagerMapValues(entries, value -> value.getBytes(StandardCharsets.UTF_8)));
     }
 
     private final Map<String, byte[]> entries;
 
-    public InMemoryDocxFile(Map<String, byte[]> entries) {
+    public InMemoryArchive(Map<String, byte[]> entries) {
         this.entries = entries;
     }
 
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ZippedDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/ZippedArchive.java
index 559be1b..27e7fa4 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ZippedDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ZippedArchive.java
@@ -7,14 +7,14 @@ import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-public class ZippedDocxFile implements DocxFile {
+public class ZippedArchive implements Archive {
     private final ZipFile zipFile;
 
-    public ZippedDocxFile(ZipFile zipFile) {
+    public ZippedArchive(ZipFile zipFile) {
         this.zipFile = zipFile;
     }
 
-    public ZippedDocxFile(File file) throws IOException {
+    public ZippedArchive(File file) throws IOException {
         this(new ZipFile(file));
     }
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
index 2fbd72c..a9c37c6 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
@@ -15,7 +15,7 @@ public class BodyXmlReaderMakers {
             arguments.get(Numbering.class, Numbering.EMPTY),
             arguments.get(Relationships.class, Relationships.EMPTY),
             arguments.get(ContentTypes.class, ContentTypes.DEFAULT),
-            arguments.get(DocxFile.class, new DocxFile() {
+            arguments.get(Archive.class, new Archive() {
                 @Override
                 public Optional<InputStream> tryGetInputStream(String name) throws IOException {
                     throw new UnsupportedOperationException();
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 495683a..cbb0a5c 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -686,7 +686,7 @@ public class BodyXmlTests {
     private Image readEmbeddedImage(XmlElement element) {
         Relationships relationships = new Relationships(map(
             IMAGE_RELATIONSHIP_ID, new Relationship("media/hat.png")));
-        DocxFile file = InMemoryDocxFile.fromStrings(map("word/media/hat.png", IMAGE_BYTES));
+        Archive file = InMemoryArchive.fromStrings(map("word/media/hat.png", IMAGE_BYTES));
 
         return (Image) readSuccess(
             BodyXmlReaderMakers.bodyReader(relationships, file),
@@ -712,7 +712,7 @@ public class BodyXmlTests {
         XmlElement element = inlineImageXml(embeddedBlipXml(IMAGE_RELATIONSHIP_ID), "");
         Relationships relationships = new Relationships(map(
             IMAGE_RELATIONSHIP_ID, new Relationship("media/hat.emf")));
-        DocxFile file = InMemoryDocxFile.fromStrings(map("word/media/hat.emf", IMAGE_BYTES));
+        Archive file = InMemoryArchive.fromStrings(map("word/media/hat.emf", IMAGE_BYTES));
         ContentTypes contentTypes = new ContentTypes(map("emf", "image/x-emf"), map());
 
         InternalResult<?> result = read(