This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7774b0900c8bf73ea873803112f44bab247bd2b5 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Nov 16 09:33:39 2018 +0100 Camel-Schematron: Fixed CS --- .../camel/component/schematron/SchematronProducer.java | 14 +++++++------- .../camel/component/schematron/SchematronProducerTest.java | 12 +++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java index 0b0e977..9e91bab 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java @@ -16,6 +16,11 @@ */ package org.apache.camel.component.schematron; +import java.util.HashMap; +import java.util.Map; + +import javax.xml.transform.Source; + import org.apache.camel.Exchange; import org.apache.camel.component.schematron.constant.Constants; import org.apache.camel.component.schematron.exception.SchematronValidationException; @@ -25,10 +30,6 @@ import org.apache.camel.support.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.transform.Source; -import java.util.HashMap; -import java.util.Map; - /** * The Schematron producer. */ @@ -36,7 +37,6 @@ public class SchematronProducer extends DefaultProducer { private Logger logger = LoggerFactory.getLogger(SchematronProducer.class); private SchematronEndpoint endpoint; - /** * @param endpoint the schematron endpoint. */ @@ -58,10 +58,10 @@ public class SchematronProducer extends DefaultProducer { if (payload instanceof Source) { logger.debug("Applying schematron validation on payload: {}", payload); - report = schematronProcessor.validate((Source) payload); + report = schematronProcessor.validate((Source)payload); } else if (payload instanceof String) { logger.debug("Applying schematron validation on payload: {}", payload); - report = schematronProcessor.validate((String) payload); + report = schematronProcessor.validate((String)payload); } else { String stringPayload = exchange.getIn().getBody(String.class); logger.debug("Applying schematron validation on payload: {}", stringPayload); diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java index 322fd38..2185401 100644 --- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java +++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java @@ -22,8 +22,12 @@ import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Templates; import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXSource; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; import net.sf.saxon.TransformerFactoryImpl; + import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.component.schematron.constant.Constants; @@ -31,16 +35,11 @@ import org.apache.camel.component.schematron.processor.ClassPathURIResolver; import org.apache.camel.component.schematron.processor.TemplatesFactory; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.commons.io.IOUtils; import org.junit.BeforeClass; import org.junit.Test; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; /** * Schematron Producer Unit Test. - * */ public class SchematronProducerTest extends CamelTestSupport { @@ -51,8 +50,7 @@ public class SchematronProducerTest extends CamelTestSupport { SchematronEndpoint endpoint = new SchematronEndpoint(); TransformerFactory fac = new TransformerFactoryImpl(); fac.setURIResolver(new ClassPathURIResolver(Constants.SCHEMATRON_TEMPLATES_ROOT_DIR, endpoint.getUriResolver())); - Templates templates = TemplatesFactory.newInstance().getTemplates(ClassLoader. - getSystemResourceAsStream("sch/schematron-1.sch"), fac); + Templates templates = TemplatesFactory.newInstance().getTemplates(ClassLoader.getSystemResourceAsStream("sch/schematron-1.sch"), fac); endpoint.setRules(templates); producer = new SchematronProducer(endpoint); }