Polished. This closes #1123
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d19e01ff Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d19e01ff Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d19e01ff Branch: refs/heads/master Commit: d19e01ffa4a97f33f6bc11f2904b7c3e222b03e3 Parents: ffb4b1c Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Aug 15 17:07:01 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 15 17:07:01 2016 +0200 ---------------------------------------------------------------------- components/camel-schematron/src/main/docs/schematron.adoc | 4 +++- .../apache/camel/component/schematron/SchematronEndpoint.java | 3 +-- .../apache/camel/component/schematron/SchematronProducer.java | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d19e01ff/components/camel-schematron/src/main/docs/schematron.adoc ---------------------------------------------------------------------- diff --git a/components/camel-schematron/src/main/docs/schematron.adoc b/components/camel-schematron/src/main/docs/schematron.adoc index 4974ee6..974fe0f 100644 --- a/components/camel-schematron/src/main/docs/schematron.adoc +++ b/components/camel-schematron/src/main/docs/schematron.adoc @@ -40,6 +40,7 @@ The Schematron component has no options. + // endpoint options: START The Schematron component supports 6 endpoint options which are listed below: @@ -50,15 +51,16 @@ The Schematron component supports 6 endpoint options which are listed below: | path | producer | | String | *Required* The path to the schematron rules file. Can either be in class path or location in the file system. | abort | producer | false | boolean | Flag to abort the route and throw a schematron validation exception. | rules | producer | | Templates | To use the given schematron rules instead of loading from the path -| uriResolver | producer | | URIResolver | Set the URIResolver to be used for resolving schematron includes in the rules file. | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange | synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| uriResolver | advanced | | URIResolver | Set the URIResolver to be used for resolving schematron includes in the rules file. |======================================================================= {% endraw %} // endpoint options: END + [[Schematron-Headers]] Headers ^^^^^^^ http://git-wip-us.apache.org/repos/asf/camel/blob/d19e01ff/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java index 17e1414..13f652c 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronEndpoint.java @@ -59,8 +59,7 @@ public class SchematronEndpoint extends DefaultEndpoint { private boolean abort; @UriParam private Templates rules; - - @UriParam + @UriParam(label = "advanced") private URIResolver uriResolver; public SchematronEndpoint() { http://git-wip-us.apache.org/repos/asf/camel/blob/d19e01ff/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java ---------------------------------------------------------------------- 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 9b3f354..2873003 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 @@ -50,7 +50,6 @@ public class SchematronProducer extends DefaultProducer { * @throws Exception */ public void process(Exchange exchange) throws Exception { - String payload = exchange.getIn().getBody(String.class); logger.debug("Applying schematron validation on payload: {}", payload); String report = SchematronProcessorFactory.newScehamtronEngine(endpoint.getRules()).validate(payload); @@ -87,7 +86,6 @@ public class SchematronProducer extends DefaultProducer { * @return */ private String getValidationStatus(final String report) { - String status = report.contains(Constants.FAILED_ASSERT) ? Constants.FAILED : Constants.SUCCESS; if (this.endpoint.isAbort() && Constants.FAILED.equals(status)) { throw new SchematronValidationException("Schematron validation failure \n" + report);
