[bugfix] Do not ignore 'wrap' flag when retrieving Collection respresentations from eXist-db's REST API

Author: adamretter

exist-core/src/main/java/org/exist/http/RESTServer.java

@@ -474,7 +474,7 @@ public void doGet(final DBBroker broker, final Txn transaction, final HttpServle
                         }
                         // return a listing of the collection contents
                         try {
-                            writeCollection(response, encoding, broker, collection);
+                            writeCollection(response, encoding, broker, wrap, collection);
                             return;
                         } catch (final LockException le) {
                             if (MimeType.XML_TYPE.getName().equals(mimeType)) {
@@ -2023,14 +2023,15 @@ private void writeXUpdateResult(final HttpServletResponse response,
      * @param response the http response to write the result to
      * @param encoding the character encoding
      * @param broker the database broker
+     * @param wrap true if the result should be wrapped in a exist:result element, false otherwise
      * @param collection the collection to write
      *
      * @throws IOException if an I/O error occurs
      * @throws PermissionDeniedException if there are insufficient privildged for the caller
      * @throws LockException if a lock error occurs
      */
     protected void writeCollection(final HttpServletResponse response,
-        final String encoding, final DBBroker broker, final Collection collection)
+        final String encoding, final DBBroker broker, final boolean wrap, final Collection collection)
             throws IOException, PermissionDeniedException, LockException {
 
         response.setContentType(MimeType.XML_TYPE.getName() + "; charset=" + encoding);
@@ -2046,13 +2047,15 @@ protected void writeCollection(final HttpServletResponse response,
             serializer = (SAXSerializer) SerializerPool.getInstance().borrowObject(SAXSerializer.class);
 
             serializer.setOutput(writer, defaultProperties);
-            final AttributesImpl attrs = new AttributesImpl();
 
             serializer.startDocument();
             serializer.startPrefixMapping("exist", Namespaces.EXIST_NS);
-            serializer.startElement(Namespaces.EXIST_NS, "result",
-                    "exist:result", attrs);
 
+            if (wrap) {
+                serializer.startElement(Namespaces.EXIST_NS, "result", "exist:result", null);
+            }
+
+            final AttributesImpl attrs = new AttributesImpl();
             attrs.addAttribute("", "name", "name", "CDATA", collection.getURI()
                     .toString());
             // add an attribute for the creation date as an xs:dateTime
@@ -2137,7 +2140,10 @@ protected void writeCollection(final HttpServletResponse response,
             }
 
             serializer.endElement(Namespaces.EXIST_NS, "collection", "exist:collection");
-            serializer.endElement(Namespaces.EXIST_NS, "result", "exist:result");
+
+            if (wrap) {
+                serializer.endElement(Namespaces.EXIST_NS, "result", "exist:result");
+            }
 
             serializer.endDocument();