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 e603d82a6e959275827975629facad409b44e98e Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Fri Apr 8 16:00:03 2022 +0200 CAMEL-17763: cleanup unused exceptions in camel-xstream --- .../xstream/MarshalDomainObjectJSONDropRootNodeTest.java | 4 ++-- .../camel/dataformat/xstream/MarshalDomainObjectJSONTest.java | 4 ++-- .../apache/camel/dataformat/xstream/MarshalDomainObjectTest.java | 4 ++-- .../java/org/apache/camel/dataformat/xstream/MarshalListTest.java | 4 ++-- .../camel/dataformat/xstream/MarshalMapCVE202026217Test.java | 8 ++++---- .../camel/dataformat/xstream/UnmarshalThenMarshalJSONTest.java | 2 +- .../apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java | 2 +- .../apache/camel/dataformat/xstream/XStreamConcurrencyTest.java | 2 +- .../apache/camel/dataformat/xstream/XStreamConfigurationTest.java | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java index 188dcce5cb7..c881c73f9e8 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java @@ -62,9 +62,9 @@ public class MarshalDomainObjectJSONDropRootNodeTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:reverse").unmarshal().json(JsonLibrary.XStream, PurchaseOrder.class).to("mock:reverse"); JsonDataFormat df = new JsonDataFormat().library(JsonLibrary.XStream).dropRootNode(true).prettyPrint(true); diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java index c34f4c1a638..c470c57fd9d 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java @@ -53,9 +53,9 @@ public class MarshalDomainObjectJSONTest extends MarshalDomainObjectTest { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:in").marshal().json(JsonLibrary.XStream).to("mock:result"); // just used for helping to marshal diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java index c31690a93bd..105239b2873 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectTest.java @@ -84,9 +84,9 @@ public class MarshalDomainObjectTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:in").marshal().xstream(PurchaseOrder.class).to("mock:result"); // just used for helping to marshal diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java index 5a6764920fe..0dbd3e007b6 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java @@ -85,9 +85,9 @@ public class MarshalListTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("direct:in").marshal().xstream().to(mock); from("direct:in-UTF-8").marshal().xstream("UTF-8").to(mock); } diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java index 8c5d38fee86..a53e73cd9dd 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalMapCVE202026217Test.java @@ -43,7 +43,7 @@ public class MarshalMapCVE202026217Test extends CamelTestSupport { @Test @EnabledOnJre({ JRE.JAVA_11 }) - public void testMarshalListJDK11() throws Exception { + public void testMarshalListJDK11() { mock.expectedMessageCount(1); mock.expectedBodiesReceived("<?xml version='1.0' encoding='ISO-8859-1'?>" @@ -59,14 +59,14 @@ public class MarshalMapCVE202026217Test extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { XStreamDataFormat xStreamDataFormat = new XStreamDataFormat(); from("direct:in").marshal(xStreamDataFormat).process(new Processor() { @Override - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { exchange.getIn().setBody("<map>\n" + " <entry>\n" + " <jdk.nashorn.internal.objects.NativeString>\n" + diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalJSONTest.java index 089eba5f4ac..1ddf9db5dc3 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalJSONTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalJSONTest.java @@ -27,7 +27,7 @@ public class UnmarshalThenMarshalJSONTest extends UnmarshalThenMarshalTest { return new RouteBuilder() { public void configure() { from("direct:start").marshal().json(JsonLibrary.XStream, PurchaseOrder.class).process(new Processor() { - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { log.debug("marshalled: " + exchange.getIn().getBody(String.class)); } }).unmarshal().json(JsonLibrary.XStream, PurchaseOrder.class).to("mock:result"); diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java index 0825abe0809..cf1c3790830 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java @@ -61,7 +61,7 @@ public class UnmarshalThenMarshalTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:start").marshal().xstream(PurchaseOrder.class).process(new Processor() { - public void process(Exchange exchange) throws Exception { + public void process(Exchange exchange) { log.debug("marshalled: " + exchange.getIn().getBody(String.class)); } }).unmarshal().xstream(PurchaseOrder.class).to("mock:result"); diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java index 2243b8527da..dc4cd4d1270 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java @@ -46,7 +46,7 @@ public class XStreamConcurrencyTest 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() { PurchaseOrder bean = new PurchaseOrder(); bean.setName("Beer"); bean.setAmount(Double.valueOf("" + index)); diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java index 9f45c706152..3feacecc990 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java @@ -133,10 +133,10 @@ public class XStreamConfigurationTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { XStreamDataFormat xstreamDefinition = new XStreamDataFormat(); Map<String, String> aliases = new HashMap<>(); aliases.put("purchase-order", PurchaseOrder.class.getName());