feat(#277): refactor constructors

Author: volodya-lombrozo

src/main/java/com/jcabi/xml/DomParser.java

@@ -33,8 +33,10 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import javax.print.Doc;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -97,6 +99,11 @@ final class DomParser {
         this(fct, new BytesSource(bytes));
     }
 
+
+    DomParser(final DocumentBuilderFactory fct, final InputStream stream) {
+        this(fct, new StreamSource(stream));
+    }
+
     DomParser(final DocumentBuilderFactory fct, final File file) {
         this(fct, new FileSource(file));
     }
@@ -179,6 +186,28 @@ public long length() {
     }
 
 
+    private static class StreamSource implements DocSource {
+
+        private final InputStream stream;
+
+        public StreamSource(final InputStream stream) {
+            this.stream = stream;
+        }
+
+        @Override
+        public Document apply(final DocumentBuilder builder) throws IOException, SAXException {
+            final Document res = builder.parse(this.stream);
+            this.stream.close();
+            return res;
+        }
+
+        @Override
+        public long length() {
+            return 0;
+        }
+    }
+
+
     private static class BytesSource implements DocSource {
 
         private final byte[] xml;

src/main/java/com/jcabi/xml/XML.java

@@ -165,7 +165,7 @@ public interface XML {
      * This method works exactly the same as {@link #deepCopy()}.
      * @return DOM node
      */
-    @Deprecated
+//    @Deprecated
     Node node();
 
     /**

src/main/java/com/jcabi/xml/XMLDocument.java

@@ -106,6 +106,22 @@ public final class XMLDocument implements XML {
      */
     private final transient Node cache;
 
+    /**
+     * Public ctor, from a source.
+     *
+     * <p>The object is created with a default implementation of
+     * {@link NamespaceContext}, which already defines a
+     * number of namespaces, see {@link XMLDocument#XMLDocument(String)}.
+     *
+     * <p>An {@link IllegalArgumentException} is thrown if the parameter
+     * passed is not in XML format.
+     *
+     * @param source Source of XML document
+     */
+    public XMLDocument(final Source source) {
+        this(XMLDocument.transform(source));
+    }
+
     /**
      * Public ctor, from XML as a text.
      *
@@ -125,11 +141,7 @@ public final class XMLDocument implements XML {
      * @param text XML document body
      */
     public XMLDocument(final String text) {
-        this(
-            new DomParser(FACTORY, text).document(),
-            new XPathContext(),
-            false
-        );
+        this(new DomParser(XMLDocument.configuredDFactory(), text).document());
     }
 
     /**
@@ -151,29 +163,11 @@ public XMLDocument(final String text) {
      * @param data The XML body
      */
     public XMLDocument(final byte[] data) {
-        this(
-            new DomParser(FACTORY, data).document(),
-            new XPathContext(),
-            false
-        );
+        this(new DomParser(XMLDocument.configuredDFactory(), data).document());
     }
 
     /**
-     * Public ctor, from a DOM node.
-     *
-     * <p>The object is created with a default implementation of
-     * {@link NamespaceContext}, which already defines a
-     * number of namespaces, see {@link XMLDocument#XMLDocument(String)}.
-     *
-     * @param node DOM source
-     * @since 0.2
-     */
-    public XMLDocument(final Node node) {
-        this(node, new XPathContext(), !(node instanceof Document));
-    }
-
-    /**
-     * Public ctor, from a source.
+     * Public ctor, from XML in a file.
      *
      * <p>The object is created with a default implementation of
      * {@link NamespaceContext}, which already defines a
@@ -182,14 +176,15 @@ public XMLDocument(final Node node) {
      * <p>An {@link IllegalArgumentException} is thrown if the parameter
      * passed is not in XML format.
      *
-     * @param source Source of XML document
+     * @param file XML file
+     * @throws FileNotFoundException In case of I/O problems
      */
-    public XMLDocument(final Source source) {
-        this(XMLDocument.transform(source), new XPathContext(), false);
+    public XMLDocument(final File file) throws FileNotFoundException {
+        this(new DomParser(XMLDocument.configuredDFactory(), file).document());
     }
 
     /**
-     * Public ctor, from XML in a file.
+     * Public ctor, from input stream.
      *
      * <p>The object is created with a default implementation of
      * {@link NamespaceContext}, which already defines a
@@ -198,12 +193,15 @@ public XMLDocument(final Source source) {
      * <p>An {@link IllegalArgumentException} is thrown if the parameter
      * passed is not in XML format.
      *
-     * @param file XML file
-     * @throws FileNotFoundException In case of I/O problems
+     * <p>The provided input stream will be closed automatically after
+     * getting data from it.
+     *
+     * @param stream The input stream, which will be closed automatically
+     * @throws IOException In case of I/O problem
      */
-    public XMLDocument(final File file) throws FileNotFoundException {
-//        this(new TextResource(file).toString());
-        this(new DomParser(FACTORY, file).document());
+    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
+    public XMLDocument(final InputStream stream) throws IOException {
+        this(new DomParser(XMLDocument.configuredDFactory(), stream).document());
     }
 
     /**
@@ -220,7 +218,7 @@ public XMLDocument(final File file) throws FileNotFoundException {
      * @throws FileNotFoundException In case of I/O problems
      */
     public XMLDocument(final Path file) throws FileNotFoundException {
-        this(file.toFile());
+        this(new DomParser(XMLDocument.configuredDFactory(), file.toFile()).document());
     }
 
     /**
@@ -258,25 +256,17 @@ public XMLDocument(final URI uri) throws IOException {
     }
 
     /**
-     * Public ctor, from input stream.
+     * Public ctor, from a DOM node.
      *
      * <p>The object is created with a default implementation of
      * {@link NamespaceContext}, which already defines a
      * number of namespaces, see {@link XMLDocument#XMLDocument(String)}.
      *
-     * <p>An {@link IllegalArgumentException} is thrown if the parameter
-     * passed is not in XML format.
-     *
-     * <p>The provided input stream will be closed automatically after
-     * getting data from it.
-     *
-     * @param stream The input stream, which will be closed automatically
-     * @throws IOException In case of I/O problem
+     * @param node DOM source
+     * @since 0.2
      */
-    @SuppressWarnings("PMD.ConstructorOnlyInitializesOrCallOtherConstructors")
-    public XMLDocument(final InputStream stream) throws IOException {
-        this(new TextResource(stream).toString());
-        stream.close();
+    public XMLDocument(final Node node) {
+        this(node, new XPathContext(), !(node instanceof Document));
     }
 
     /**
@@ -488,7 +478,7 @@ public Collection<SAXParseException> validate(final Schema schema) {
      * @return A cloned node imported in a dedicated document.
      */
     private static Node createImportedNode(final Node node) {
-        final DocumentBuilderFactory factory = FACTORY;
+        final DocumentBuilderFactory factory = XMLDocument.configuredDFactory();
         final DocumentBuilder builder;
         try {
             builder = factory.newDocumentBuilder();
@@ -609,8 +599,6 @@ private static Node transform(final Source source) {
         return result.getNode();
     }
 
-    private static final DocumentBuilderFactory FACTORY = XMLDocument.configuredDFactory();
-
     /**
      * Create new {@link DocumentBuilderFactory} and configure it.
      * @return Configured factory