From c8ff305d5cbbbd472b6dc04c40f25c0190ff3a04 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 3 Jan 2016 10:59:27 +0000
Subject: Rename non-static readers

---
 .../java/org/zwobble/mammoth/docx/BodyXml.java     | 57 ----------------------
 .../org/zwobble/mammoth/docx/BodyXmlReader.java    | 57 ++++++++++++++++++++++
 .../java/org/zwobble/mammoth/docx/DocumentXml.java | 18 -------
 .../zwobble/mammoth/docx/DocumentXmlReader.java    | 17 +++++++
 .../zwobble/mammoth/tests/docx/BodyXmlTests.java   | 12 ++---
 .../mammoth/tests/docx/DocumentXmlTests.java       |  6 +--
 6 files changed, 83 insertions(+), 84 deletions(-)
 delete mode 100644 src/main/java/org/zwobble/mammoth/docx/BodyXml.java
 create mode 100644 src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
 delete mode 100644 src/main/java/org/zwobble/mammoth/docx/DocumentXml.java
 create mode 100644 src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java

diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXml.java b/src/main/java/org/zwobble/mammoth/docx/BodyXml.java
deleted file mode 100644
index a394d97..0000000
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXml.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.zwobble.mammoth.docx;
-
-import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlElementLike;
-import org.zwobble.mammoth.xml.XmlNode;
-
-import java.util.List;
-import java.util.Optional;
-
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
-
-public class BodyXml {
-    private final Styles styles;
-
-    public BodyXml(Styles styles) {
-        this.styles = styles;
-    }
-
-    public List<DocumentElement> readElement(XmlElement element) {
-        switch (element.getName()) {
-            case "w:t":
-                return ImmutableList.of(new TextElement(element.innerText()));
-            case "w:r":
-                return ImmutableList.of(new RunElement(readElements(element.children())));
-            case "w:p":
-                return ImmutableList.of(readParagraph(element));
-
-            case "w:pPr":
-                return ImmutableList.of();
-
-            default:
-                throw new UnsupportedOperationException();
-        }
-    }
-
-    public List<DocumentElement> readElements(Iterable<XmlNode> nodes) {
-        return ImmutableList.copyOf(
-            concat(
-                transform(
-                    filter(nodes, XmlElement.class),
-                    this::readElement)));
-    }
-
-    private ParagraphElement readParagraph(XmlElement element) {
-        return new ParagraphElement(readParagraphStyle(element), readElements(element.children()));
-    }
-
-    private Optional<Style> readParagraphStyle(XmlElement paragraph) {
-        XmlElementLike properties = paragraph.findChildOrEmpty("w:pPr");
-        return properties.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val")
-            .map(styleId -> styles.findParagraphStyleById(styleId).orElse(new Style(styleId, Optional.empty())));
-    }
-}
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
new file mode 100644
index 0000000..9d8713a
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -0,0 +1,57 @@
+package org.zwobble.mammoth.docx;
+
+import com.google.common.collect.ImmutableList;
+import org.zwobble.mammoth.documents.*;
+import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.xml.XmlElementLike;
+import org.zwobble.mammoth.xml.XmlNode;
+
+import java.util.List;
+import java.util.Optional;
+
+import static com.google.common.collect.Iterables.concat;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.transform;
+
+public class BodyXmlReader {
+    private final Styles styles;
+
+    public BodyXmlReader(Styles styles) {
+        this.styles = styles;
+    }
+
+    public List<DocumentElement> readElement(XmlElement element) {
+        switch (element.getName()) {
+            case "w:t":
+                return ImmutableList.of(new TextElement(element.innerText()));
+            case "w:r":
+                return ImmutableList.of(new RunElement(readElements(element.children())));
+            case "w:p":
+                return ImmutableList.of(readParagraph(element));
+
+            case "w:pPr":
+                return ImmutableList.of();
+
+            default:
+                throw new UnsupportedOperationException();
+        }
+    }
+
+    public List<DocumentElement> readElements(Iterable<XmlNode> nodes) {
+        return ImmutableList.copyOf(
+            concat(
+                transform(
+                    filter(nodes, XmlElement.class),
+                    this::readElement)));
+    }
+
+    private ParagraphElement readParagraph(XmlElement element) {
+        return new ParagraphElement(readParagraphStyle(element), readElements(element.children()));
+    }
+
+    private Optional<Style> readParagraphStyle(XmlElement paragraph) {
+        XmlElementLike properties = paragraph.findChildOrEmpty("w:pPr");
+        return properties.findChildOrEmpty("w:pStyle").getAttributeOrNone("w:val")
+            .map(styleId -> styles.findParagraphStyleById(styleId).orElse(new Style(styleId, Optional.empty())));
+    }
+}
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentXml.java b/src/main/java/org/zwobble/mammoth/docx/DocumentXml.java
deleted file mode 100644
index 760f0a4..0000000
--- a/src/main/java/org/zwobble/mammoth/docx/DocumentXml.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.zwobble.mammoth.docx;
-
-import org.zwobble.mammoth.documents.Document;
-import org.zwobble.mammoth.xml.XmlElement;
-
-public class DocumentXml {
-    private final BodyXml bodyReader;
-
-    public DocumentXml(BodyXml bodyReader) {
-
-        this.bodyReader = bodyReader;
-    }
-
-    public Document readDocumentXmlElement(XmlElement element) {
-        XmlElement body = element.findChild("w:body");
-        return new Document(bodyReader.readElements(body.children()));
-    }
-}
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java
new file mode 100644
index 0000000..0b51774
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java
@@ -0,0 +1,17 @@
+package org.zwobble.mammoth.docx;
+
+import org.zwobble.mammoth.documents.Document;
+import org.zwobble.mammoth.xml.XmlElement;
+
+public class DocumentXmlReader {
+    private final BodyXmlReader bodyReader;
+
+    public DocumentXmlReader(BodyXmlReader bodyReader) {
+        this.bodyReader = bodyReader;
+    }
+
+    public Document readElement(XmlElement element) {
+        XmlElement body = element.findChild("w:body");
+        return new Document(bodyReader.readElements(body.children()));
+    }
+}
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 cc00d3c..90bf51a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -9,7 +9,7 @@ import com.natpryce.makeiteasy.PropertyLookup;
 import org.hamcrest.Matcher;
 import org.junit.Test;
 import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.docx.BodyXml;
+import org.zwobble.mammoth.docx.BodyXmlReader;
 import org.zwobble.mammoth.docx.Styles;
 import org.zwobble.mammoth.tests.DeepReflectionMatcher;
 import org.zwobble.mammoth.xml.XmlElement;
@@ -29,12 +29,12 @@ import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.xml.XmlNodes.element;
 
 public class BodyXmlTests {
-    private static final Property<BodyXml, Styles> STYLES = newProperty();
+    private static final Property<BodyXmlReader, Styles> STYLES = newProperty();
 
-    private static final Instantiator<BodyXml> bodyReader = new Instantiator<BodyXml>() {
+    private static final Instantiator<BodyXmlReader> bodyReader = new Instantiator<BodyXmlReader>() {
         @Override
-        public BodyXml instantiate(PropertyLookup<BodyXml> propertyLookup) {
-            return new BodyXml(
+        public BodyXmlReader instantiate(PropertyLookup<BodyXmlReader> propertyLookup) {
+            return new BodyXmlReader(
                 propertyLookup.valueOf(STYLES, new Styles(ImmutableMap.of(), ImmutableMap.of())));
         }
     };
@@ -94,7 +94,7 @@ public class BodyXmlTests {
             hasStyle(Optional.of(style)));
     }
 
-    private static DocumentElement read(Maker<BodyXml> reader, XmlElement element) {
+    private static DocumentElement read(Maker<BodyXmlReader> reader, XmlElement element) {
         return reader.make().readElement(element).get(0);
     }
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
index 114c1b0..11cbaa9 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
@@ -6,8 +6,8 @@ import com.natpryce.makeiteasy.Property;
 import com.natpryce.makeiteasy.PropertyLookup;
 import org.junit.Test;
 import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.docx.BodyXml;
-import org.zwobble.mammoth.docx.DocumentXml;
+import org.zwobble.mammoth.docx.BodyXmlReader;
+import org.zwobble.mammoth.docx.DocumentXmlReader;
 import org.zwobble.mammoth.xml.XmlElement;
 import org.zwobble.mammoth.xml.XmlNodes;
 
@@ -41,7 +41,7 @@ public class DocumentXmlTests {
                         element("w:t", ImmutableList.of(
                             XmlNodes.text("Hello!")))))))))));
 
-        Document document = new DocumentXml(new BodyXml(null)).readDocumentXmlElement(documentElement);
+        Document document = new DocumentXmlReader(new BodyXmlReader(null)).readElement(documentElement);
 
         assertThat(
             document,
-- 
cgit v1.2.3