You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/11/16 08:33:57 UTC

[camel] branch master updated: Camel-Schematron: Fixed CS

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 12113b8  Camel-Schematron: Fixed CS
12113b8 is described below

commit 12113b86b650e1818d53f6af74c5546e5aa791c4
Author: Andrea Cosentino <an...@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 | 13 ++++++-------
 2 files changed, 13 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 bef9c50..94770b5 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.impl.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 ebf2594..e588bd3 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
@@ -15,14 +15,19 @@
  * limitations under the License.
  */
 package org.apache.camel.component.schematron;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 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;
@@ -30,16 +35,11 @@ import org.apache.camel.component.schematron.processor.ClassPathURIResolver;
 import org.apache.camel.component.schematron.processor.TemplatesFactory;
 import org.apache.camel.impl.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 {
 
@@ -50,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);
     }