Repository: camel Updated Branches: refs/heads/master 512628c82 -> 2e032ff0e
CAMEL-9580: source check errors removed Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e032ff0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e032ff0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e032ff0 Branch: refs/heads/master Commit: 2e032ff0ea2913d3ed4729c2346244d1e6350a75 Parents: 512628c Author: Franz Forsthofer <franz.forstho...@sap.com> Authored: Tue Feb 9 08:14:02 2016 +0100 Committer: Franz Forsthofer <franz.forstho...@sap.com> Committed: Tue Feb 9 08:14:02 2016 +0100 ---------------------------------------------------------------------- .../xslt/DefaultXsltUriResolverFactory.java | 16 ++++++++++++++++ .../apache/camel/component/xslt/XsltComponent.java | 6 +++--- .../ValidatorResourceResolverFactoryTest.java | 7 +++++-- 3 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2e032ff0/camel-core/src/main/java/org/apache/camel/component/xslt/DefaultXsltUriResolverFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/DefaultXsltUriResolverFactory.java b/camel-core/src/main/java/org/apache/camel/component/xslt/DefaultXsltUriResolverFactory.java index a6a283e..a82498f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/DefaultXsltUriResolverFactory.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/DefaultXsltUriResolverFactory.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.component.xslt; import javax.xml.transform.URIResolver; http://git-wip-us.apache.org/repos/asf/camel/blob/2e032ff0/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java index 0754e3b..fa9f4f8 100644 --- a/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/xslt/XsltComponent.java @@ -37,9 +37,9 @@ public class XsltComponent extends UriEndpointComponent { @Metadata(label = "advanced") private XmlConverter xmlConverter; - @Metadata(label = "advanced", description="To use a custom UriResolver. Should not be used together with the option 'uriResolverFactory'.") + @Metadata(label = "advanced", description = "To use a custom UriResolver. Should not be used together with the option 'uriResolverFactory'.") private URIResolver uriResolver; - @Metadata(label = "advanced", description="To use a custom UriResolver which depends on a dynamic endpoint resource URI. Should not be used together with the option 'uriResolver'.") + @Metadata(label = "advanced", description = "To use a custom UriResolver which depends on a dynamic endpoint resource URI. Should not be used together with the option 'uriResolver'.") private XsltUriResolverFactory uriResolverFactory; @Metadata(defaultValue = "true") private boolean contentCache = true; @@ -140,7 +140,7 @@ public class XsltComponent extends UriEndpointComponent { // not in endpoint then use component specific resolver factory resolverFactory = getUriResolverFactory(); } - if (resolverFactory == null){ + if (resolverFactory == null) { // fallback to use the Default URI resolver factory resolverFactory = new DefaultXsltUriResolverFactory(); } http://git-wip-us.apache.org/repos/asf/camel/blob/2e032ff0/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java index b55aad7..08e0847 100644 --- a/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/validator/ValidatorResourceResolverFactoryTest.java @@ -19,6 +19,9 @@ package org.apache.camel.component.validator; import java.util.HashSet; import java.util.Set; +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSResourceResolver; + import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; @@ -26,9 +29,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.model.language.ConstantExpression; import org.apache.camel.model.language.SimpleExpression; + import org.junit.Assert; -import org.w3c.dom.ls.LSInput; -import org.w3c.dom.ls.LSResourceResolver; + public class ValidatorResourceResolverFactoryTest extends ContextTestSupport {
