Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1519, INT-1515, polished XmlValidatingMessageSelector and related parser, added javadocs, assertions, comments, tests

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-10-15 17:21:16 -04:00
parent 4bb5443a83
commit 6b18489caa
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParser.java
View File

@@ -59,6 +59,7 @@ public class XmlPayloadValidatingFilterParser extends AbstractConsumerEndpointPa
}
if (schemaLocationDefined){
selectorBuilder.addConstructorArgValue(schemaLocation);
// it is a restriction with the default value of 'xml-schema' which corresponds to 'http://www.w3.org/2001/XMLSchema'
String schemaType = "xml-schema".equals(element.getAttribute("schema-type")) ? SCHEMA_W3C_XML : SCHEMA_RELAX_NG;;
selectorBuilder.addConstructorArgValue(schemaType);
}

22
spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java
View File

@@ -16,6 +16,8 @@
package org.springframework.integration.xml.selector;
import java.io.IOException;
import org.springframework.core.io.Resource;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
@@ -27,6 +29,7 @@ import org.springframework.integration.xml.XmlPayloadConverter;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.xml.validation.XmlValidator;
import org.springframework.xml.validation.XmlValidatorFactory;
import org.xml.sax.SAXParseException;
@@ -39,18 +42,30 @@ import org.xml.sax.SAXParseException;
public class XmlValidatingMessageSelector implements MessageSelector {
private final XmlValidator xmlValidator;
private volatile boolean throwExceptionOnRejection;
private volatile XmlPayloadConverter converter = new DefaultXmlPayloadConverter();
public XmlValidatingMessageSelector(XmlValidator xmlValidator) throws Exception{
Assert.notNull(xmlValidator, "XmlValidator can not be 'null'");
this.xmlValidator = xmlValidator;
}
public XmlValidatingMessageSelector(Resource schema, String schemaType) throws Exception{
/**
* Will create this selector with default {@link XmlValidator} which
* will be initialized with 'schema' location as {@link Resource} and 'schemaType' as
* either {@link XmlValidatorFactory#SCHEMA_W3C_XML} or {@link XmlValidatorFactory#SCHEMA_RELAX_NG}.
* If no 'schemaType' is provided it will default to {@link XmlValidatorFactory#SCHEMA_W3C_XML};
*
* @param schema
* @param schemaType
* @throws IOException
*/
public XmlValidatingMessageSelector(Resource schema, String schemaType) throws IOException {
Assert.notNull(schema, "You must provide XML schema location to perform validation");
if (!StringUtils.hasText(schemaType)){
schemaType = XmlValidatorFactory.SCHEMA_W3C_XML;
}
this.xmlValidator = XmlValidatorFactory.createValidator(schema, schemaType);
}
@@ -64,6 +79,7 @@ public class XmlValidatingMessageSelector implements MessageSelector {
* @param converter
*/
public void setConverter(XmlPayloadConverter converter) {
Assert.notNull(converter, "'converter' must not be null");
this.converter = converter;
}