Merge pull request #31 from evolvedbinary/6.x.x/hotfix/all-document-children

[6.x.x] Make sure that all Child Nodes of a Document Node are accessible

Author: adamretter

exist-core/pom.xml

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -21,6 +45,8 @@
  */
 package org.exist.backup;
 
+import org.apache.commons.io.output.StringBuilderWriter;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -38,7 +64,7 @@ public class ZipWriter implements BackupWriter
 {
     private String currentPath;
     private final ZipOutputStream out;
-    private StringWriter contents;
+    private StringBuilderWriter contents;
     private boolean dataWritten = false;
 
     public ZipWriter(final String zipFile, final String collection) throws IOException
@@ -53,9 +79,9 @@ public ZipWriter(final Path zipFile, final String collection) throws IOException
         currentPath = collection;
     }
 
-    public Writer newContents() throws IOException
+    public Writer newContents()
     {
-        contents = new StringWriter();
+        contents = new StringBuilderWriter();
         return( contents );
     }
 

exist-core/src/main/java/org/exist/backup/ZipWriter.java

@@ -45,6 +45,7 @@
  */
 package org.exist.client;
 
+import org.apache.commons.io.output.StringBuilderWriter;
 import org.exist.SystemProperties;
 import org.exist.backup.Backup;
 import org.exist.backup.CreateBackupDialog;
@@ -1782,16 +1783,17 @@ public static void showErrorMessage(final String message, final Throwable t) {
         msgArea.setEditable(false);
         msgArea.setBackground(null);
         if (t != null) {
-            final StringWriter out = new StringWriter();
-            final PrintWriter writer = new PrintWriter(out);
-            t.printStackTrace(writer);
-            final JTextArea stacktrace = new JTextArea(out.toString(), 20, 50);
-            stacktrace.setBackground(null);
-            stacktrace.setEditable(false);
-            scroll = new JScrollPane(stacktrace);
-            scroll.setPreferredSize(new Dimension(250, 300));
-            scroll.setBorder(BorderFactory
+            try (final StringBuilderWriter out = new StringBuilderWriter();
+                 final PrintWriter writer = new PrintWriter(out)) {
+                t.printStackTrace(writer);
+                final JTextArea stacktrace = new JTextArea(out.toString(), 20, 50);
+                stacktrace.setBackground(null);
+                stacktrace.setEditable(false);
+                scroll = new JScrollPane(stacktrace);
+                scroll.setPreferredSize(new Dimension(250, 300));
+                scroll.setBorder(BorderFactory
                     .createTitledBorder(Messages.getString("ClientFrame.215"))); //$NON-NLS-1$
+            }
         }
         final JOptionPane optionPane = new JOptionPane();
         optionPane.setMessage(new Object[]{msgArea, scroll});
@@ -1815,7 +1817,7 @@ public static int showErrorMessageQuery(final String message, final Throwable t)
 
         JScrollPane scrollStacktrace = null;
         if (t != null) {
-            try (final StringWriter out = new StringWriter();
+            try (final StringBuilderWriter out = new StringBuilderWriter();
                  final PrintWriter writer = new PrintWriter(out)) {
                 t.printStackTrace(writer);
                 final JTextArea stacktrace = new JTextArea(out.toString(), 20, 50);
@@ -1827,8 +1829,6 @@ public static int showErrorMessageQuery(final String message, final Throwable t)
                 scrollStacktrace.setPreferredSize(new Dimension(600, 300));
                 scrollStacktrace.setBorder(BorderFactory
                         .createTitledBorder(Messages.getString("ClientFrame.218"))); //$NON-NLS-1$
-            } catch (final IOException ioe) {
-                ioe.printStackTrace();
             }
         }
 

exist-core/src/main/java/org/exist/client/ClientFrame.java

@@ -83,6 +83,7 @@
 import javax.swing.border.BevelBorder;
 import javax.xml.transform.OutputKeys;
 
+import org.apache.commons.io.output.StringBuilderWriter;
 import org.exist.security.Account;
 import org.exist.storage.ElementIndex;
 import org.exist.util.ProgressIndicator;
@@ -185,16 +186,17 @@ private static void showErrorMessage(String message, Throwable t) {
         msgArea.setEditable(false);
         msgArea.setBackground(null);
         if (t != null) {
-            final StringWriter out = new StringWriter();
-            final PrintWriter writer = new PrintWriter(out);
-            t.printStackTrace(writer);
-            final JTextArea stacktrace = new JTextArea(out.toString(), 20, 50);
-            stacktrace.setBackground(null);
-            stacktrace.setEditable(false);
-            scroll = new JScrollPane(stacktrace);
-            scroll.setPreferredSize(new Dimension(250, 300));
-            scroll.setBorder(BorderFactory
+            try (final StringBuilderWriter out = new StringBuilderWriter();
+                 final PrintWriter writer = new PrintWriter(out)) {
+                t.printStackTrace(writer);
+                final JTextArea stacktrace = new JTextArea(out.toString(), 20, 50);
+                stacktrace.setBackground(null);
+                stacktrace.setEditable(false);
+                scroll = new JScrollPane(stacktrace);
+                scroll.setPreferredSize(new Dimension(250, 300));
+                scroll.setBorder(BorderFactory
                     .createTitledBorder("Exception Stacktrace:")); //$NON-NLS-1$
+            }
         }
         final JOptionPane optionPane = new JOptionPane();
         optionPane.setMessage(new Object[]{msgArea, scroll});

exist-core/src/main/java/org/exist/client/DocumentView.java

@@ -86,6 +86,7 @@
 import javax.swing.event.PopupMenuListener;
 import javax.xml.transform.OutputKeys;
 
+import org.apache.commons.io.output.StringBuilderWriter;
 import org.exist.security.PermissionDeniedException;
 import org.exist.util.Holder;
 import org.exist.xmldb.EXistXQueryService;
@@ -537,9 +538,10 @@ private void compileQuery() {
                 tCompiled = t1 - t0;
 
                 // In this way we can see the parsed structure meanwhile the query is
-                final StringWriter writer = new StringWriter();
-                service.dump(compiled, writer);
-                exprDisplay.setText(writer.toString());
+                try (final StringBuilderWriter writer = new StringBuilderWriter()) {
+                    service.dump(compiled, writer);
+                    exprDisplay.setText(writer.toString());
+                }
                 resultTabs.setSelectedComponent(exprDisplayScrollPane);
 
                 statusMessage.setText(Messages.getString("QueryDialog.Compilation") + ": " + tCompiled + "ms");
@@ -611,9 +613,10 @@ public void run() {
                 tCompiled = t1 - t0;
 
                 // In this way we can see the parsed structure meanwhile the query is
-                StringWriter writer = new StringWriter();
-                service.dump(compiled, writer);
-                exprDisplay.setText(writer.toString());
+                try (final StringBuilderWriter writer = new StringBuilderWriter()) {
+                    service.dump(compiled, writer);
+                    exprDisplay.setText(writer.toString());
+                }
 
                 result = service.execute(compiled);
                 tResult = System.currentTimeMillis() - t1;
@@ -624,9 +627,10 @@ public void run() {
                 }
 
                 // jmfg: Is this still needed? I don't think so
-                writer = new StringWriter();
-                service.dump(compiled, writer);
-                exprDisplay.setText(writer.toString());
+                try (final StringBuilderWriter writer = new StringBuilderWriter()) {
+                    service.dump(compiled, writer);
+                    exprDisplay.setText(writer.toString());
+                }
 
                 statusMessage.setText(Messages.getString("QueryDialog.retrievingmessage"));
                 Resource resource;

exist-core/src/main/java/org/exist/client/QueryDialog.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -47,6 +71,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.apache.commons.io.output.StringBuilderWriter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.exist.Database;
@@ -1268,24 +1293,22 @@ public static DocumentImpl save(final DBBroker broker, final Configurable instan
     protected static final Set<FullXmldbURI> saving = new ConcurrentSkipListSet<>();
 
     public static DocumentImpl save(final Configurable instance, final DBBroker broker, final Collection collection, final XmldbURI uri) throws IOException, ConfigurationException {
-        
-        final StringWriter writer = new StringWriter();
-        final SAXSerializer serializer = new SAXSerializer(writer, null);
-        
-        try {
+        final String data;
+        try (final StringBuilderWriter writer = new StringBuilderWriter()) {
+            final SAXSerializer serializer = new SAXSerializer(writer, null);
+
             serializer.startDocument();
             serialize(instance, serializer);
             serializer.endDocument();
-            
+
+            data = writer.toString();
+            if (data == null || data.isEmpty()) {
+                return null;
+            }
         } catch (final SAXException saxe) {
             throw new ConfigurationException(saxe.getMessage(), saxe);
         }
 
-        final String data = writer.toString();
-        if (data == null || data.length() == 0) {
-            return null;
-        }
-        
         FullXmldbURI fullURI = null;
         final BrokerPool pool = broker.getBrokerPool();
         final TransactionManager transact = pool.getTransactionManager();

exist-core/src/main/java/org/exist/config/Configurator.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -46,6 +70,26 @@ public boolean add(final Node node) {
         return super.add(node);
     }
 
+    /**
+     * Add all elements of the other NodeListImpl to
+     * this NodeListImpl.
+     *
+     * @param other NodeListImpl to add.
+     *
+     * @return true if the list was modified, false otherwise.
+     */
+    public boolean addAll(final NodeListImpl other) {
+        if (other == null) {
+            return false;
+        }
+
+        if (other.isEmpty()) {
+            return false;
+        }
+
+        return addAll((ArrayList<Node>) other);
+    }
+
     /**
      * Add all elements of the other NodeList to
      * this NodeList
@@ -54,18 +98,26 @@ public boolean add(final Node node) {
      *   if none or only some were added.
      */
     public boolean addAll(final NodeList other) {
+        if (other == null) {
+            return false;
+        }
+
+        if (other instanceof NodeListImpl) {
+            return addAll((NodeListImpl) other);
+        }
+
         if (other.getLength() == 0) {
             return false;
-        } else {
-            boolean result = true;
-            for(int i = 0; i < other.getLength(); i++) {
-                if(!add(other.item(i))) {
-                    result = false;
-                    break;
-                }
+        }
+
+        boolean result = true;
+        for (int i = 0; i < other.getLength(); i++) {
+            if (!add(other.item(i))) {
+                result = false;
+                break;
             }
-            return result;
         }
+        return result;
     }
 
     @Override

exist-core/src/main/java/org/exist/dom/NodeListImpl.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -280,11 +304,6 @@ public String getStringValue() {
         return getData();
     }
 
-    @Override
-    public Node getFirstChild() {
-        return null;
-    }
-
     @Override
     public void selectAttributes(final NodeTest test, final Sequence result)
         throws XPathException {