Made Gauva a test dependency only

Author: Kim A. Betti

README.md

@@ -88,4 +88,4 @@ simple services to expose.
 
 Roadmap 2.0
 -----------
-I would like to drop Guava and write it in Kotlin. 
+Perhaps I'll write it in Kotlin. 

build.gradle

@@ -59,8 +59,7 @@ jacocoTestReport {
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:28.0-jre'
-
+    testImplementation 'com.google.guava:guava:28.0-jre'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
     testImplementation 'org.assertj:assertj-core:3.13.2'

src/main/java/com/developerb/nmxmlp/NX.java

@@ -15,7 +15,6 @@
  */
 package com.developerb.nmxmlp;
 
-import com.google.common.io.ByteSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Element;
@@ -97,22 +96,7 @@ public Cursor from(String xml) throws Ex {
     }
 
     public Cursor from(final String xml, ReadContext context) throws Ex {
-        return from(new ByteSource() {
-
-            @Override
-            public InputStream openStream() {
-                return new ByteArrayInputStream(xml.getBytes());
-            }
-
-        }, context);
-    }
-
-    public Cursor from(ByteSource source, ReadContext context) throws Ex {
-        try {
-            return from(source.openStream(), context);
-        } catch (Exception ex) {
-            throw new Ex("Failed to initialize xml cursor", ex);
-        }
+        return from(new ByteArrayInputStream(xml.getBytes()), context);
     }
 
     public Cursor from(InputStream stream, ReadContext context) throws Ex {

src/test/java/com/developerb/nmxmlp/AbstractNXTest.java

@@ -19,6 +19,7 @@
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.io.IOException;
 import java.net.URL;
 
 
@@ -36,6 +37,7 @@ protected void withNx(NX nx) {
         // A good place for tests to add extractors etc.
     }
 
+    @SuppressWarnings("UnstableApiUsage")
     protected NX.Cursor parseResource(String resourceName) {
         URL svgResource = Resources.getResource(resourceName);
         ByteSource svgByteSource = Resources.asByteSource(svgResource);
@@ -48,7 +50,11 @@ protected NX.Cursor parse(String xml) {
     }
 
     protected NX.Cursor parse(ByteSource source) {
-        return nx.from(source, new NX.ReadContext(null));
+        try {
+            return nx.from(source.openStream(), new NX.ReadContext(null));
+        } catch (IOException ex) {
+            throw new IllegalStateException(ex);
+        }
     }
 
 }

src/test/java/com/developerb/nmxmlp/XmlLoadingTest.java

@@ -18,8 +18,6 @@
 import com.google.common.io.ByteSource;
 import org.junit.jupiter.api.Test;
 
-import java.io.InputStream;
-
 import static com.google.common.base.Charsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,11 +32,10 @@ void loadInvalidXML() {
             parse("<root><unclosedTag></root>");
 
             fail("Should not have accepted invalid xml");
-        }
-        catch (NX.Ex ex) {
+        } catch (NX.Ex ex) {
             assertThat(ex)
-                    .as("Expected exception")
-                    .hasMessage("Failed to initialize xml cursor");
+                .as("Expected exception")
+                .hasMessage("Failed to initialize xml cursor");
         }
     }
 
@@ -48,23 +45,21 @@ void loadInvalidXMLFromBytes() {
             parse(ByteSource.wrap("<root><unclosedTag></root>".getBytes(UTF_8)));
 
             fail("Should not have accepted invalid xml");
-        }
-        catch (NX.Ex ex) {
+        } catch (NX.Ex ex) {
             assertThat(ex)
-                    .as("Expected exception")
-                    .hasMessage("Failed to initialize xml cursor");
+                .as("Expected exception")
+                .hasMessage("Failed to initialize xml cursor");
         }
     }
 
     @Test
     void readingNodeWithDuplicateAttributeTriggersException() {
         try {
             parse("<people><person name='First' name='Second' /></people>");
-        }
-        catch (NX.Ex ex) {
+        } catch (NX.Ex ex) {
             assertThat(ex.getCause().getCause())
-                    .as("Expected exception")
-                    .hasMessageContaining("Attribute \"name\" was already specified for element \"person\"");
+                .as("Expected exception")
+                .hasMessageContaining("Attribute \"name\" was already specified for element \"person\"");
         }
     }
 
@@ -76,28 +71,4 @@ void loadValidXML() {
         assertEquals("root", cursor.name());
     }
 
-    @Test
-    void failingToReadFromByteSource() {
-        try {
-            parse(new ByteSource() {
-
-                @Override
-                public InputStream openStream() {
-                    throw new IllegalStateException("Oups...");
-                }
-
-            });
-        }
-        catch (NX.Ex ex) {
-            assertThat(ex)
-                    .as("Expected exception")
-                    .hasMessage("Failed to initialize xml cursor");
-
-            assertThat(ex.getCause())
-                    .as("Cause of the expected exception")
-                    .isInstanceOf(IllegalStateException.class)
-                    .hasMessage("Oups...");
-        }
-    }
-
 }