Move XML parsing code into its own package

7 files changed, 20 insertions, 15 deletions

diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java
index 7dcce95..e266f77 100644
--- a/src/main/java/org/zwobble/mammoth/Mammoth.java
+++ b/src/main/java/org/zwobble/mammoth/Mammoth.java
@@ -8,7 +8,7 @@ import java.util.zip.ZipFile;
 
 import org.zwobble.mammoth.xml.XmlElement;
 import org.zwobble.mammoth.xml.XmlNodeVisitor;
-import org.zwobble.mammoth.xml.XmlParser;
+import org.zwobble.mammoth.xml.parsing.XmlParser;
 import org.zwobble.mammoth.xml.XmlTextNode;
 
 import com.google.common.base.Joiner;
diff --git a/src/main/java/org/zwobble/mammoth/xml/ElementName.java b/src/main/java/org/zwobble/mammoth/xml/parsing/ElementName.java
index 76b1c93..a0f5f8e 100644
--- a/src/main/java/org/zwobble/mammoth/xml/ElementName.java
+++ b/src/main/java/org/zwobble/mammoth/xml/parsing/ElementName.java
@@ -1,19 +1,19 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.xml.parsing;
 
-public class ElementName {
+class ElementName {
     private final String uri;
     private final String localName;
     
-    public ElementName(String uri, String localName) {
+    ElementName(String uri, String localName) {
         this.uri = uri;
         this.localName = localName;
     }
     
-    public String getUri() {
+    String getUri() {
         return uri;
     }
     
-    public String getLocalName() {
+    String getLocalName() {
         return localName;
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/xml/SimpleSax.java b/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSax.java
index 54bd614..5b7957d 100644
--- a/src/main/java/org/zwobble/mammoth/xml/SimpleSax.java
+++ b/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSax.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.xml.parsing;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,12 +18,12 @@ import org.xml.sax.helpers.DefaultHandler;
 
 import static java.util.stream.Collectors.toMap;
 
-public class SimpleSax {
-    public static void parseStream(InputStream input, SimpleSaxHandler handler) {
+class SimpleSax {
+    static void parseStream(InputStream input, SimpleSaxHandler handler) {
         parseInputSource(new InputSource(input), handler);
     }
     
-    public static void parseString(String value, SimpleSaxHandler handler) {
+    static void parseString(String value, SimpleSaxHandler handler) {
         parseInputSource(new InputSource(new StringReader(value)), handler);
     }
 
diff --git a/src/main/java/org/zwobble/mammoth/xml/SimpleSaxHandler.java b/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSaxHandler.java
index f56a940..ed0af31 100644
--- a/src/main/java/org/zwobble/mammoth/xml/SimpleSaxHandler.java
+++ b/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSaxHandler.java
@@ -1,8 +1,8 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.xml.parsing;
 
 import java.util.Map;
 
-public interface SimpleSaxHandler {
+interface SimpleSaxHandler {
     void startElement(ElementName name, Map<ElementName, String> attributes);
     void endElement();
     void characters(String string);
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlElementBuilder.java b/src/main/java/org/zwobble/mammoth/xml/parsing/XmlElementBuilder.java
index 16b4865..1115cfb 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlElementBuilder.java
+++ b/src/main/java/org/zwobble/mammoth/xml/parsing/XmlElementBuilder.java
@@ -1,4 +1,7 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.xml.parsing;
+
+import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.xml.XmlNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlParser.java b/src/main/java/org/zwobble/mammoth/xml/parsing/XmlParser.java
index cf00586..5354f07 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlParser.java
+++ b/src/main/java/org/zwobble/mammoth/xml/parsing/XmlParser.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.xml.parsing;
 
 import java.io.InputStream;
 import java.util.ArrayDeque;
@@ -7,6 +7,8 @@ import java.util.Map;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
+import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.xml.XmlTextNode;
 
 import static java.util.stream.Collectors.toMap;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
index b93838e..ae02b79 100644
--- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
@@ -9,7 +9,7 @@ import org.hamcrest.collection.IsIterableContainingInOrder;
 import org.junit.Test;
 import org.zwobble.mammoth.xml.XmlElement;
 import org.zwobble.mammoth.xml.XmlNode;
-import org.zwobble.mammoth.xml.XmlParser;
+import org.zwobble.mammoth.xml.parsing.XmlParser;
 import org.zwobble.mammoth.xml.XmlTextNode;
 
 import java.io.ByteArrayInputStream;