Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88e99af6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88e99af6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88e99af6 Branch: refs/heads/master Commit: 88e99af67dfa1661eafb98293839fd17e2afb84a Parents: 491288e Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jun 5 08:21:02 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jun 5 08:21:02 2015 +0200 ---------------------------------------------------------------------- .../component/schematron/SchematronEndpoint.java | 14 +++++++------- .../schematron/processor/ClassPathURIResolver.java | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/88e99af6/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 e58b8d6..bc63b8e 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 @@ -37,17 +37,17 @@ import org.apache.camel.util.ResourceHelper; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import static org.apache.camel.component.schematron.constant.Constants.LINE_NUMBERING; import static org.apache.camel.component.schematron.constant.Constants.SAXON_TRANSFORMER_FACTORY_CLASS_NAME; - /** * Schematron Endpoint. */ @UriEndpoint(scheme = "schematron", title = "Schematron", syntax = "schematron:path", producerOnly = true, label = "validation") public class SchematronEndpoint extends DefaultEndpoint { - private Logger LOG = LoggerFactory.getLogger(SchematronEndpoint.class); + private static final Logger LOG = LoggerFactory.getLogger(SchematronEndpoint.class); private TransformerFactory transformerFactory; @@ -119,7 +119,6 @@ public class SchematronEndpoint extends DefaultEndpoint { protected void doStart() throws Exception { super.doStart(); - if (transformerFactory == null) { createTransformerFactory(); } @@ -143,16 +142,17 @@ public class SchematronEndpoint extends DefaultEndpoint { throw new SchematronConfigException("Failed to load schematron rules: " + path); } } - } private void createTransformerFactory() throws ClassNotFoundException { // provide the class loader of this component to work in OSGi environments - Class<?> factoryClass = getCamelContext().getClassResolver().resolveMandatoryClass(SAXON_TRANSFORMER_FACTORY_CLASS_NAME, - SchematronComponent.class.getClassLoader()); + Class<TransformerFactory> factoryClass = getCamelContext().getClassResolver().resolveMandatoryClass(SAXON_TRANSFORMER_FACTORY_CLASS_NAME, + TransformerFactory.class, SchematronComponent.class.getClassLoader()); + LOG.debug("Using TransformerFactoryClass {}", factoryClass); - transformerFactory = (TransformerFactory) getCamelContext().getInjector().newInstance(factoryClass); + transformerFactory = getCamelContext().getInjector().newInstance(factoryClass); transformerFactory.setURIResolver(new ClassPathURIResolver(Constants.SCHEMATRON_TEMPLATES_ROOT_DIR)); transformerFactory.setAttribute(LINE_NUMBERING, true); } + } http://git-wip-us.apache.org/repos/asf/camel/blob/88e99af6/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java ---------------------------------------------------------------------- diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java index 135026b..1fc8a9a 100644 --- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java +++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java @@ -16,24 +16,21 @@ */ package org.apache.camel.component.schematron.processor; +import java.io.File; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; -import java.io.*; - /** * Class path resolver for schematron templates - * */ public class ClassPathURIResolver implements URIResolver { - private String rulesDir; + private final String rulesDir; /** * Constructor setter for rules directory path. - * @param rulesDir */ public ClassPathURIResolver(final String rulesDir) { this.rulesDir = rulesDir;
