You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/03/20 08:58:49 UTC
svn commit: r1875457 - in
/jackrabbit/commons/filevault/trunk/vault-validation/src:
main/java/org/apache/jackrabbit/vault/validation/impl/util/
test/java/org/apache/jackrabbit/vault/validation/
test/resources/simple-package/jcr_root/apps/
Author: kwin
Date: Fri Mar 20 08:58:48 2020
New Revision: 1875457
URL: http://svn.apache.org/viewvc?rev=1875457&view=rev
Log:
JCRVLT-422 correctly decode node names in docview xml
Modified:
jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java
jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/DocumentViewParserValidatorTest.java
jackrabbit/commons/filevault/trunk/vault-validation/src/test/resources/simple-package/jcr_root/apps/.content.xml
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java?rev=1875457&r1=1875456&r2=1875457&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/impl/util/DocumentViewXmlContentHandler.java Fri Mar 20 08:58:48 2020
@@ -159,7 +159,7 @@ public class DocumentViewXmlContentHandl
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
// convert to DocViewNode (mostly taken over from DocViewSAXImporter#startElement)
- String label = qName;
+ String label = getNormalizedName(qName);
Name name;
if (elementNameStack.isEmpty() && localName.equals(NameConstants.JCR_ROOT.getLocalName())
&& uri.equals(NameConstants.JCR_ROOT.getNamespaceURI())) {
@@ -209,6 +209,7 @@ public class DocumentViewXmlContentHandl
violations.add(new ValidationViolation(ValidationMessageSeverity.ERROR, String.format(PARSE_VIOLATION_MESSAGE_STRING, qName, e.getMessage()), filePath, null, nodePath.toString(), locator.getLineNumber(), locator.getColumnNumber(), e));
}
// do not collect node paths for empty elements (as they represent order only)
+ // really?
if (attributes.getLength() > 0) {
nodePathsAndLineNumbers.put(nodePath.toString(), locator.getLineNumber());
}
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/DocumentViewParserValidatorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/DocumentViewParserValidatorTest.java?rev=1875457&r1=1875456&r2=1875457&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/DocumentViewParserValidatorTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/test/java/org/apache/jackrabbit/vault/validation/DocumentViewParserValidatorTest.java Fri Mar 20 08:58:48 2020
@@ -96,13 +96,18 @@ public class DocumentViewParserValidator
new ValidationViolation("docviewid", ValidationMessageSeverity.ERROR,
"startDocView", Paths.get("apps/.content.xml"), null, "/apps/somepath", 21, 29, null),
new ValidationViolation("docviewid", ValidationMessageSeverity.ERROR,
- "startDocView", Paths.get("apps/.content.xml"), null, "/apps/somepath/jc:content", 22, 54, null));
+ "startDocView", Paths.get("apps/.content.xml"), null, "/apps/somepath/jc:content", 22, 54, null),
+ new ValidationViolation("docviewid", ValidationMessageSeverity.ERROR,
+ "startDocView", Paths.get("apps/.content.xml"), null, "/apps/0123_sample.jpg", 25, 29, null),
+ new ValidationViolation("docviewid", ValidationMessageSeverity.ERROR,
+ "startDocView", Paths.get("apps/.content.xml"), null, "/apps/01234_sample.jpg", 26, 55, null));
// verify node names
Map<String, Integer> expectedNodePathsAndLineNumber = new HashMap<>();
expectedNodePathsAndLineNumber.put("/apps", 19);
expectedNodePathsAndLineNumber.put("/apps/somepath", 21);
expectedNodePathsAndLineNumber.put("/apps/somepath/jc:content", 22);
+ expectedNodePathsAndLineNumber.put("/apps/01234_sample.jpg", 26);
Assert.assertEquals(expectedNodePathsAndLineNumber, nodePathsAndLineNumbers);
Map<String, DocViewProperty> properties = new HashMap<>();
properties.put(NameConstants.JCR_PRIMARYTYPE.toString(),
Modified: jackrabbit/commons/filevault/trunk/vault-validation/src/test/resources/simple-package/jcr_root/apps/.content.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-validation/src/test/resources/simple-package/jcr_root/apps/.content.xml?rev=1875457&r1=1875456&r2=1875457&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-validation/src/test/resources/simple-package/jcr_root/apps/.content.xml (original)
+++ jackrabbit/commons/filevault/trunk/vault-validation/src/test/resources/simple-package/jcr_root/apps/.content.xml Fri Mar 20 08:58:48 2020
@@ -22,4 +22,6 @@
<jc:content jc:primaryType="nt:unstructured">
</jc:content>
</somepath>
+ <_x0030_123_sample.jpg/>
+ <_x0030_1234_sample.jpg jc:primaryType="nt:file"/>
</jc:root>