3:46 a.m.
Author: nzamosenchuk
Date: 2012-02-24 04:46:37 -0500 (Fri, 24 Feb 2012)
New Revision: 5695
Modified:
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestSearch.java
Log:
EXOJCR-364 : check if uri was already written to the output stream
Modified:
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java
===================================================================
---
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2012-02-24
07:09:16 UTC (rev 5694)
+++
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/dasl/SearchResultResponseEntity.java 2012-02-24
09:46:37 UTC (rev 5695)
@@ -125,6 +125,7 @@
xmlStreamWriter.writeAttribute("xmlns:b",
"urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/");
NodeIterator nodeIter = queryResult.getNodes();
+ Set<URI> resultNodes = new HashSet<URI>();
while (nodeIter.hasNext())
{
Node nextNode = nodeIter.nextNode();
@@ -144,44 +145,50 @@
URI uri = new URI(TextUtil.escape(baseURI + nextNode.getPath(), '%',
true));
- Resource resource;
- if (ResourceUtil.isVersioned(nextNode))
+ // if URI is new, and wasn't previously being written, then write it
+ if (resultNodes.add(uri))
{
- if (ResourceUtil.isFile(nextNode))
+ Resource resource;
+ if (ResourceUtil.isVersioned(nextNode))
{
- resource = new VersionedFileResource(uri, nextNode, nsContext);
+ if (ResourceUtil.isFile(nextNode))
+ {
+ resource = new VersionedFileResource(uri, nextNode, nsContext);
+ }
+ else
+ {
+ resource = new VersionedCollectionResource(uri, nextNode,
nsContext);
+ }
}
else
{
- resource = new VersionedCollectionResource(uri, nextNode, nsContext);
+ if (ResourceUtil.isFile(nextNode))
+ {
+ resource = new FileResource(uri, nextNode, nsContext);
+ }
+ else
+ {
+ resource = new CollectionResource(uri, nextNode, nsContext);
+ }
}
- }
- else
- {
- if (ResourceUtil.isFile(nextNode))
- {
- resource = new FileResource(uri, nextNode, nsContext);
- }
- else
- {
- resource = new CollectionResource(uri, nextNode, nsContext);
- }
- }
- xmlStreamWriter.writeStartElement("DAV:", "response");
+ xmlStreamWriter.writeStartElement("DAV:",
"response");
- xmlStreamWriter.writeStartElement("DAV:", "href");
- xmlStreamWriter.writeCharacters(resource.getIdentifier().toASCIIString());
- xmlStreamWriter.writeEndElement();
+ xmlStreamWriter.writeStartElement("DAV:", "href");
+
xmlStreamWriter.writeCharacters(resource.getIdentifier().toASCIIString());
+ xmlStreamWriter.writeEndElement();
- PropstatGroupedRepresentation propstat = new
PropstatGroupedRepresentation(resource, properties, false);
+ PropstatGroupedRepresentation propstat = new
PropstatGroupedRepresentation(resource, properties, false);
- PropertyWriteUtil.writePropStats(xmlStreamWriter, propstat.getPropStats());
+ PropertyWriteUtil.writePropStats(xmlStreamWriter,
propstat.getPropStats());
- xmlStreamWriter.writeEndElement();
+ xmlStreamWriter.writeEndElement();
+ }
}
-
+ // for better GC
+ resultNodes.clear();
+ resultNodes = null;
// D:multistatus
xmlStreamWriter.writeEndElement();
xmlStreamWriter.writeEndDocument();
@@ -196,5 +203,4 @@
throw new IOException(exc.getMessage());
}
}
-
}
Modified:
jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestSearch.java
===================================================================
---
jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestSearch.java 2012-02-24
07:09:16 UTC (rev 5694)
+++
jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestSearch.java 2012-02-24
09:46:37 UTC (rev 5695)
@@ -27,11 +27,23 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import javax.jcr.Node;
import javax.ws.rs.core.MediaType;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.StartElement;
+
/**
* Created by The eXo Platform SAS. <br/>
* Date: 15 Dec 2008
@@ -46,9 +58,12 @@
private final String fileContent = "TEST FILE CONTENT...";
- private final String sql = "<D:searchrequest xmlns:D='DAV:'>"
+ "<D:sql>"
+ private final String basicSql = "<D:searchrequest
xmlns:D='DAV:'>" + "<D:sql>"
+ "SELECT * FROM nt:resource WHERE contains(*, 'TEST')" +
"</D:sql>" + "</D:searchrequest>";
+ private final String pathSql = "<D:searchrequest
xmlns:D='DAV:'>" + "<D:sql>"
+ + "SELECT * FROM nt:base WHERE jcr:path LIKE '/node[%]/%'"
+ "</D:sql>" + "</D:searchrequest>";
+
public void testBasicSearch() throws Exception
{
@@ -61,7 +76,7 @@
InputStream inputStream = new ByteArrayInputStream(fileContent.getBytes());
TestUtils.addContent(session, fileName, inputStream, defaultFileNodeType,
MediaType.TEXT_PLAIN);
- ContainerResponse response = service(WebDAVMethods.SEARCH, getPathWS(),
"", null, sql.getBytes());
+ ContainerResponse response = service(WebDAVMethods.SEARCH, getPathWS(),
"", null, basicSql.getBytes());
assertEquals(HTTPStatus.MULTISTATUS, response.getStatus());
SearchResultResponseEntity entity =
(SearchResultResponseEntity)response.getEntity();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -70,6 +85,28 @@
assertTrue(result.contains(fileName));
}
+ public void testPathSearch() throws Exception
+ {
+ Node testRoot = session.getRootNode().addNode("node",
defaultFolderNodeType);
+ Node node = testRoot.addNode("addedNode", defaultFileNodeType);
+ node.addNode("jcr:content", "nt:resource");
+ Node content = node.getNode("jcr:content");
+ content.setProperty("jcr:mimeType", MediaType.TEXT_PLAIN);
+ content.setProperty("jcr:lastModified", Calendar.getInstance());
+ content.setProperty("jcr:data", new
ByteArrayInputStream("Text".getBytes()));
+ session.save();
+
+ ContainerResponse response = service(WebDAVMethods.SEARCH, getPathWS(),
"", null, pathSql.getBytes());
+ SearchResultResponseEntity entity =
(SearchResultResponseEntity)response.getEntity();
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ entity.write(outputStream);
+ outputStream.toByteArray();
+ List<String> found = parseNodeNames(outputStream.toByteArray());
+ System.out.println(found);
+ assertEquals(1, found.size());
+
+ }
+
/**
* Here we test WebDAV SEARCH method implementation for correct response
* if request contains encoded non-latin characters. We send a request with
@@ -86,7 +123,7 @@
InputStream inputStream = new ByteArrayInputStream(fileContent.getBytes());
TestUtils.addContent(session, decodedfileName, inputStream, defaultFileNodeType,
MediaType.TEXT_PLAIN);
- ContainerResponse response = service(WebDAVMethods.SEARCH, getPathWS(),
"", null, sql.getBytes());
+ ContainerResponse response = service(WebDAVMethods.SEARCH, getPathWS(),
"", null, basicSql.getBytes());
// serialize response entity to string
SearchResultResponseEntity entity =
(SearchResultResponseEntity)response.getEntity();
@@ -110,4 +147,65 @@
{
return null;
}
+
+ /**
+ * Extracts names of nodes from response XML
+ *
+ * @param data
+ * @return
+ * @throws XMLStreamException
+ * @throws FactoryConfigurationError
+ * @throws IOException
+ */
+ private List<String> parseNodeNames(byte[] data) throws XMLStreamException,
FactoryConfigurationError, IOException
+ {
+ // flag, that notifies when parser is inside
<D:displayname></D:displayname>
+ boolean displayName = false;
+ //Set<String> nodes = new HashSet<String>();
+ List<String> nodes = new ArrayList<String>();
+ InputStream input = new ByteArrayInputStream(data);
+ XMLStreamReader reader =
XMLInputFactory.newInstance().createXMLStreamReader(input);
+ QName name = QName.valueOf("{DAV:}href");
+ try
+ {
+ while (reader.hasNext())
+ {
+ int eventCode = reader.next();
+ switch (eventCode)
+ {
+ case StartElement.START_ELEMENT : {
+ // if {DAV:}displayname opening element
+ if (reader.getName().equals(name))
+ {
+ displayName = true;
+ }
+ break;
+ }
+ case StartElement.CHARACTERS : {
+ if (displayName)
+ {
+ // currently reader is inside
<D:displayname>nodeName</D:displayname>
+ // adding name to list if not empty
+ String nodeName = reader.getText();
+ if (nodeName != null && !nodeName.equals(""))
+ {
+ nodes.add(nodeName);
+ }
+ }
+ break;
+ }
+ default : {
+ displayName = false;
+ break;
+ }
+ }
+ }
+ }
+ finally
+ {
+ reader.close();
+ input.close();
+ }
+ return new ArrayList<String>(nodes);
+ }
}