This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3b3a9a00e401b97a17fcacf3d52c3af3969f2927 Author: aldettinger <[email protected]> AuthorDate: Wed May 26 10:46:37 2021 +0200 CAMEL-16643: Dropped the useless dependency to camel-xslt-saxon from camel-saxon --- components/camel-saxon/pom.xml | 5 --- components/camel-soap/pom.xml | 5 --- components/camel-xslt-saxon/pom.xml | 3 +- .../src/test/data/terminate.xml | 0 .../xslt/PayloadWithDefaultNamespaceTest.java | 6 ++-- .../component/xslt/SaxonInvalidXsltFileTest.java | 15 ++++---- .../camel/component/xslt/SaxonUriResolverTest.java | 2 +- .../xslt/SaxonXslIncludeEmptyHrefTest.java | 6 ++-- .../xslt/SaxonXsltComponentConfigurationTest.java | 2 +- .../camel/component/xslt/SaxonXsltDTDTest.java | 4 +-- .../xslt/SaxonXsltEndpointConfigurationTest.java | 4 +-- .../component/xslt/SaxonXsltFeatureRouteTest.java | 6 ++-- .../xslt/SaxonXsltMessageTerminateTest.java | 4 +-- .../apache/camel/component/xslt/SaxonXsltTest.java | 0 .../component/xslt/XsltRouteAllowStAXTest.java | 16 ++------- .../xslt/extensions/MyExtensionFunction1.java | 0 .../xslt/extensions/MyExtensionFunction2.java | 0 .../extensions/SaxonExtensionFunctionsTest.java | 0 .../SaxonSpringExtensionFunctionsTest.java | 0 .../apache/camel/component/xslt/saxon/MyXPath.java | 42 ---------------------- .../component/xslt/saxon/SAXSourceLogBodyTest.java | 4 +-- .../camel/component/xslt/saxon/TestBean.java | 30 ---------------- .../xslt/saxon}/XsltAggregationStrategyTest.java | 4 +-- .../xslt/SaxonXsltComponentConfigurationTest.xml | 0 .../xslt/SaxonXsltEndpointConfigurationTest.xml | 0 .../camel/component/xslt/camelXsltContext.xml | 0 .../component/xslt/extensions/camelXsltContext.xml | 0 .../component/xslt/extensions/extensions.xslt | 0 .../org/apache/camel/component/xslt/terminate.xsl | 0 .../org/apache/camel/component/xslt/transform.xsl | 0 .../apache/camel/component/xslt/transform_dtd.xsl | 0 .../component/xslt/transform_includes_data.xsl | 0 .../apache/camel/component/xslt/transform_text.xsl | 0 .../component/xslt/transform_text_imported.xsl | 0 .../camel/util/toolbox/aggregate-user-property.xsl | 0 .../org/apache/camel/util/toolbox/aggregate.xsl | 0 .../org/apache/camel/util/toolbox/data1.xml | 0 .../org/apache/camel/util/toolbox/data2.xml | 0 .../org/apache/camel/util/toolbox/data3.xml | 0 39 files changed, 33 insertions(+), 125 deletions(-) diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml index 56bc2c5..f0ff981 100644 --- a/components/camel-saxon/pom.xml +++ b/components/camel-saxon/pom.xml @@ -46,11 +46,6 @@ <artifactId>camel-xpath</artifactId> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-xslt-saxon</artifactId> - </dependency> - - <dependency> <groupId>net.sf.saxon</groupId> <artifactId>Saxon-HE</artifactId> </dependency> diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml index e4a73a9..164253f 100644 --- a/components/camel-soap/pom.xml +++ b/components/camel-soap/pom.xml @@ -78,11 +78,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-saxon</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml index 24d90f1..dc9713c 100644 --- a/components/camel-xslt-saxon/pom.xml +++ b/components/camel-xslt-saxon/pom.xml @@ -49,9 +49,10 @@ <artifactId>Saxon-HE</artifactId> </dependency> + <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-junit5</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-saxon/src/test/data/terminate.xml b/components/camel-xslt-saxon/src/test/data/terminate.xml similarity index 100% rename from components/camel-saxon/src/test/data/terminate.xml rename to components/camel-xslt-saxon/src/test/data/terminate.xml diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java similarity index 88% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java index afecf56..9b490bb 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java @@ -25,17 +25,17 @@ public class PayloadWithDefaultNamespaceTest extends CamelTestSupport { = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Message xmlns=\"http://www.camel.apache.org/envelope\";><Version>2.0</Version></Message>"; @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:start").to("xslt-saxon:org/apache/camel/component/xslt/transform.xsl"); } }; } @Test - public void testTransformWithDefaultNamespace() throws Exception { + public void testTransformWithDefaultNamespace() { template.sendBody("direct:start", PAYLOAD); } } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java similarity index 81% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java index d23ca02..6dff1db 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java @@ -29,23 +29,24 @@ import static org.junit.jupiter.api.Assertions.fail; public class SaxonInvalidXsltFileTest { @Test - public void testInvalidStylesheet() throws Exception { + public void testInvalidStylesheet() { try { RouteBuilder builder = createRouteBuilder(); - CamelContext context = new DefaultCamelContext(); - context.addRoutes(builder); - context.start(); + try (CamelContext context = new DefaultCamelContext()) { + context.addRoutes(builder); + context.start(); - fail("Should have thrown an exception due XSL compilation error"); + fail("Should have thrown an exception due XSL compilation error"); + } } catch (Exception e) { // expected assertIsInstanceOf(TransformerException.class, e.getCause().getCause().getCause()); } } - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("seda:a").to( "xslt-saxon:org/apache/camel/component/xslt/notfound.xsl?transformerFactoryClass=net.sf.saxon.TransformerFactoryImpl"); } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java similarity index 97% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java index 24ed592..1a3dd65 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java @@ -56,7 +56,7 @@ public class SaxonUriResolverTest extends CamelTestSupport { assertEquals(XML_RESP, writer.toString()); } - protected Source fromString(String data) throws IOException { + protected Source fromString(String data) { return new StreamSource(new StringReader(data)); } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java similarity index 91% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java index a852052..173c7e4 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java @@ -23,8 +23,6 @@ import org.junit.jupiter.api.Test; public class SaxonXslIncludeEmptyHrefTest extends CamelTestSupport { - //TODO: fix - //@Ignore("To Fix") @Test public void testXsltOutput() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -38,10 +36,10 @@ public class SaxonXslIncludeEmptyHrefTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:start") .to("xslt-saxon:org/apache/camel/component/xslt/transform_includes_data.xsl") .to("mock:result"); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java similarity index 97% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java index 9acae42..5387b2d 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class SaxonXsltComponentConfigurationTest extends CamelSpringTestSupport { @Test - public void testConfiguration() throws Exception { + public void testConfiguration() { XsltSaxonComponent component = context.getComponent("xslt-saxon", XsltSaxonComponent.class); XsltSaxonEndpoint endpoint = context.getEndpoint("xslt-saxon:org/apache/camel/component/xslt/transform.xsl", XsltSaxonEndpoint.class); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java similarity index 97% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java index 9abd6c5..a20b5d5 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java @@ -88,10 +88,10 @@ public class SaxonXsltDTDTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:start1") .to("xslt-saxon:org/apache/camel/component/xslt/transform_dtd.xsl") diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java similarity index 94% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java index 6ed42b1..83aa176 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java @@ -33,9 +33,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class SaxonXsltEndpointConfigurationTest extends CamelSpringTestSupport { @Test - public void testConfiguration() throws Exception { + public void testConfiguration() { Configuration configuration = context.getRegistry().lookupByNameAndType("saxon-configuration", Configuration.class); - Map<String, Object> properties = context.getRegistry().lookupByNameAndType("saxon-properties", Map.class); + Map<?, ?> properties = context.getRegistry().lookupByNameAndType("saxon-properties", Map.class); XsltSaxonComponent component = context.getComponent("xslt-saxon", XsltSaxonComponent.class); XsltSaxonEndpoint endpoint = null; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java similarity index 93% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java index 241c6fc..d7c1d78 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class SaxonXsltFeatureRouteTest extends CamelTestSupport { @Test - public void testSendMessage() throws Exception { + public void testSendMessage() { String message = "<hello/>"; sendXmlMessage("direct:start1", message); sendXmlMessage("direct:start2", message); @@ -47,10 +47,10 @@ public class SaxonXsltFeatureRouteTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:start1") .to("xslt-saxon:org/apache/camel/component/xslt/transform_text_imported.xsl") .to("mock:result"); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java similarity index 95% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java index 7410447..4406c8c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java @@ -49,10 +49,10 @@ public class SaxonXsltMessageTerminateTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { errorHandler(deadLetterChannel("mock:dead")); from("file:src/test/data/?fileName=terminate.xml&noop=true").routeId("foo").noAutoStartup() diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java similarity index 100% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java similarity index 83% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java index c483235..558245c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java @@ -20,24 +20,18 @@ import java.util.List; import org.w3c.dom.Document; -import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.xquery.TestBean; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class XsltRouteAllowStAXTest extends CamelTestSupport { - @BindToRegistry - private TestBean testBean = new TestBean(); - @Test public void testSendStringMessage() throws Exception { sendMessageAndHaveItTransformed("<mail><subject>Hey</subject><body>Hello world!</body></mail>"); @@ -73,19 +67,15 @@ public class XsltRouteAllowStAXTest extends CamelTestSupport { assertTrue(xml.contains("cheese")); assertTrue(xml.contains("<subject>Hey</subject>")); assertTrue(xml.contains("<body>Hello world!</body>")); - - TestBean bean = context.getRegistry().lookupByNameAndType("testBean", TestBean.class); - assertNotNull(bean); - assertEquals("Hey", bean.getSubject(), "bean.subject"); } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:start").to("xslt-saxon:org/apache/camel/component/xslt/transform.xsl?allowStAX=true").multicast() - .bean("testBean").to("mock:result"); + .to("mock:result"); } }; } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java similarity index 100% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction1.java diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction2.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction2.java similarity index 100% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction2.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/MyExtensionFunction2.java diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java similarity index 100% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java similarity index 100% rename from components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/MyXPath.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/MyXPath.java deleted file mode 100644 index ed994fe..0000000 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/MyXPath.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.saxon; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.w3c.dom.NodeList; - -import org.apache.camel.language.xpath.XPathAnnotationExpressionFactory; -import org.apache.camel.support.language.LanguageAnnotation; -import org.apache.camel.support.language.NamespacePrefix; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER }) -@LanguageAnnotation(language = "xpath", factory = XPathAnnotationExpressionFactory.class) -public @interface MyXPath { - String value(); - - // You can add the namespaces as the default value of the annotation - NamespacePrefix[] namespaces() default { - @NamespacePrefix(prefix = "n1", uri = "http://example.org/ns1";), - @NamespacePrefix(prefix = "n2", uri = "http://example.org/ns2";) }; - - Class<?> resultType() default NodeList.class; -} diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java index 2f648ba..b108e0a 100644 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/SAXSourceLogBodyTest.java @@ -19,11 +19,11 @@ package org.apache.camel.component.xslt.saxon; import java.io.File; import java.io.InputStream; +import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.sax.SAXSource; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; @@ -55,7 +55,7 @@ public class SAXSourceLogBodyTest extends CamelTestSupport { public void process(Exchange exchange) throws Exception { byte[] data = exchange.getIn().getBody(byte[].class); InputStream is = exchange.getContext().getTypeConverter().convertTo(InputStream.class, data); - XMLReader xmlReader = XMLReaderFactory.createXMLReader(); + XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader(); exchange.getIn().setBody(new SAXSource(xmlReader, new InputSource(is))); } }) diff --git a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/TestBean.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/TestBean.java deleted file mode 100644 index 9cbbb87..0000000 --- a/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/TestBean.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.saxon; - -public class TestBean { - - private String subject; - - public void onMethod(@MyXPath("/*/@subject") String subject) { - this.subject = subject; - } - - public String getSubject() { - return subject; - } -} diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java similarity index 96% rename from components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java rename to components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java index b675f28..0296fa8 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java +++ b/components/camel-xslt-saxon/src/test/java/org/apache/camel/component/xslt/saxon/XsltAggregationStrategyTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.builder; +package org.apache.camel.component.xslt.saxon; +import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.component.xslt.saxon.XsltSaxonAggregationStrategy; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/camelXsltContext.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/camelXsltContext.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/camelXsltContext.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/camelXsltContext.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/camelXsltContext.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/extensions/extensions.xslt diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/terminate.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_dtd.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_includes_data.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/component/xslt/transform_text_imported.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate-user-property.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/aggregate.xsl diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data1.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data1.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data1.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data1.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data2.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data2.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data2.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data2.xml diff --git a/components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data3.xml b/components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data3.xml similarity index 100% rename from components/camel-saxon/src/test/resources/org/apache/camel/util/toolbox/data3.xml rename to components/camel-xslt-saxon/src/test/resources/org/apache/camel/util/toolbox/data3.xml
