This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit a9417cf622f6850ec468e1f6149f106389d13b5d Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Thu Mar 10 15:33:33 2022 +0100 CAMEL-17763: cleaned up unused exceptions in camel-velocity --- .../apache/camel/component/velocity/VelocityConcurrentTest.java | 2 +- .../apache/camel/component/velocity/VelocityContentCacheTest.java | 4 ++-- .../camel/component/velocity/VelocityDynamicTemplateTest.java | 6 +++--- .../org/apache/camel/component/velocity/VelocityEncodingTest.java | 4 ++-- .../apache/camel/component/velocity/VelocityFileLetterTest.java | 4 ++-- .../component/velocity/VelocityFileLetterWithPropertyTest.java | 4 ++-- .../org/apache/camel/component/velocity/VelocityLetterTest.java | 4 ++-- .../camel/component/velocity/VelocityLetterWithParserTest.java | 4 ++-- .../camel/component/velocity/VelocityLetterWithoutHeaderTest.java | 4 ++-- .../camel/component/velocity/VelocityMethodInvokationTest.java | 4 ++-- .../camel/component/velocity/VelocityOverridesPropertiesTest.java | 8 ++++---- .../apache/camel/component/velocity/VelocitySetHeaderTest.java | 2 +- .../component/velocity/VelocitySetTemplateViaHeaderTest.java | 4 ++-- .../component/velocity/VelocitySomeValuesNotInExchangeTest.java | 4 ++-- .../camel/component/velocity/VelocitySupplementalContextTest.java | 4 ++-- .../camel/component/velocity/VelocityTemplateInHeaderTest.java | 2 +- .../java/org/apache/camel/component/velocity/VelocityTest.java | 8 ++++---- .../camel/component/velocity/VelocityValuesInPropertiesTest.java | 6 +++--- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java index 0dbb9c5..3c475bd 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java @@ -47,7 +47,7 @@ public class VelocityConcurrentTest extends CamelTestSupport { for (int i = 0; i < files; i++) { final int index = i; executor.submit(new Callable<Object>() { - public Object call() throws Exception { + public Object call() { template.sendBody("direct:start", "Hello " + index); return null; } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java index 8168a10..42abab8 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java @@ -156,9 +156,9 @@ public class VelocityContentCacheTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity://org/apache/camel/component/velocity/hello.vm?contentCache=false") .to("mock:result"); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java index 42af06c..6fd1c8f 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java @@ -57,9 +57,9 @@ public class VelocityDynamicTemplateTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { MyBean bean = new MyBean(); from("direct:a").bean(bean).to("mock:result"); } @@ -70,7 +70,7 @@ public class VelocityDynamicTemplateTest extends CamelTestSupport { ProducerTemplate template; boolean useLetter2; - public void sendToNewTemplate(Exchange exchange) throws Exception { + public void sendToNewTemplate(Exchange exchange) { if (template == null) { template = exchange.getContext().createProducerTemplate(); } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java index 8e8c9aa..a39fad7 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; public class VelocityEncodingTest extends VelocityLetterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity:org/apache/camel/component/velocity/letter-utf16.vm?encoding=UTF-16") .to("mock:result"); } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterTest.java index 6617010..b9b6e41 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; public class VelocityFileLetterTest extends VelocityLetterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity:file:src/test/resources/org/apache/camel/component/velocity/letter.vm") .to("mock:result"); } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java index 672c3e5..28aa0b6 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityFileLetterWithPropertyTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; public class VelocityFileLetterWithPropertyTest extends VelocityLetterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { System.setProperty("ENV", "src/test/resources/"); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java index 13c486e..fb3bf33 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java @@ -51,9 +51,9 @@ public class VelocityLetterTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity:org/apache/camel/component/velocity/letter.vm").to("mock:result"); } }; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithParserTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithParserTest.java index e88b7bd..bfbd047 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithParserTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithParserTest.java @@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder; public class VelocityLetterWithParserTest extends VelocityLetterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to( "velocity:org/apache/camel/component/velocity/letterWithParser.vm?propertiesFile=org/apache/camel/component/velocity/velocity.properties") .to("mock:result"); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java index 8444310..6441401 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterWithoutHeaderTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; public class VelocityLetterWithoutHeaderTest extends VelocityLetterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity:org/apache/camel/component/velocity/header.vm") .to("velocity:org/apache/camel/component/velocity/letterWithoutHeader.vm").to("mock:result"); } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java index 5bb8ecc..35c2657 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java @@ -28,10 +28,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class VelocityMethodInvokationTest extends CamelTestSupport { @Test - public void testVelocityLetter() throws Exception { + public void testVelocityLetter() { Exchange exchange = template.request("direct:a", new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setBody("Monday & Tuesday"); exchange.getIn().setHeader("name", "Christian"); exchange.setProperty("item", "7"); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java index 5cf3b05..196ef88 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java @@ -27,10 +27,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class VelocityOverridesPropertiesTest extends CamelTestSupport { @Test - public void testOverridingProperties() throws Exception { + public void testOverridingProperties() { Exchange exchange = template.request("direct:a", new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setBody("Monday"); exchange.getIn().setHeader("name", "Christian"); exchange.setProperty("item", "7"); @@ -42,9 +42,9 @@ public class VelocityOverridesPropertiesTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a") .to("velocity:org/apache/camel/component/velocity/example.vm?propertiesFile=org/apache/camel/component/velocity/velocity-logging.properties&allowContextMapAll=true"); } diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java index 802c659..bbb7b19 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java @@ -41,7 +41,7 @@ public class VelocitySetHeaderTest extends CamelSpringTestSupport { mock.expectedHeaderReceived("fruit", value); mock.expectedBodiesReceived(expectedBody); template.request("direct:start", new Processor() { - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { Message in = exchange.getIn(); in.setBody(value); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java index b694931..218b6d6 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java @@ -57,9 +57,9 @@ public class VelocitySetTemplateViaHeaderTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a").to("velocity:dummy?allowTemplateFromHeader=true").to("mock:result"); } }; diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java index 4441f74..3122ebe 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java @@ -59,9 +59,9 @@ public class VelocitySomeValuesNotInExchangeTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a") .to("velocity:org/apache/camel/component/velocity/someValuesNotInExchange.vm") .to("mock:result"); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java index c86613a..d6aa4e1 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java @@ -51,14 +51,14 @@ public class VelocitySupplementalContextTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { final Map<String, Object> supplementalContext = new HashMap<>(); supplementalContext.put("body", "new_body"); return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("direct:input") .setHeader(VelocityConstants.VELOCITY_SUPPLEMENTAL_CONTEXT).constant(supplementalContext) .to("velocity:template-in-header?allowTemplateFromHeader=true&allowContextMapAll=true") diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java index f98684b..46732fd 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java @@ -56,7 +56,7 @@ public class VelocityTemplateInHeaderTest extends CamelTestSupport { protected void assertRespondsWith(final String headerName, final String headerValue, String expectedBody) throws InvalidPayloadException { Exchange response = template.request("direct:a", new Processor() { - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { Message in = exchange.getIn(); in.setHeader(VelocityConstants.VELOCITY_TEMPLATE, "<hello>${headers." + headerName + "}</hello>"); in.setHeader(headerName, headerValue); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java index a4b107c..117091b 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java @@ -31,10 +31,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class VelocityTest extends CamelTestSupport { @Test - public void testVelocityLetter() throws Exception { + public void testVelocityLetter() { Exchange exchange = template.request("direct:a", new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setBody("Monday"); exchange.getIn().setHeader("name", "Christian"); exchange.setProperty("item", "7"); @@ -46,10 +46,10 @@ public class VelocityTest extends CamelTestSupport { } @Test - public void testVelocityContext() throws Exception { + public void testVelocityContext() { Exchange exchange = template.request("direct:a", new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setBody(""); exchange.getIn().setHeader("name", "Christian"); Map<String, Object> variableMap = new HashMap<>(); diff --git a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java index 0d98ed2..f9c4c3e 100644 --- a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java +++ b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java @@ -35,7 +35,7 @@ public class VelocityValuesInPropertiesTest extends CamelTestSupport { template.send("direct:a", new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setHeader(VelocityConstants.VELOCITY_TEMPLATE, "Dear ${exchange.properties.name}. You ordered item ${exchange.properties.item}."); exchange.setProperty("name", "Christian"); @@ -47,9 +47,9 @@ public class VelocityValuesInPropertiesTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:a") .to("velocity:dummy?allowTemplateFromHeader=true&allowContextMapAll=true") .to("mock:result");
