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 c35bc278b4a5b926f31a37dab77c0efdaec90c8d Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Tue Apr 12 18:24:29 2022 +0200 CAMEL-17763: cleaned up unused exceptions in camel-rss --- .../test/java/org/apache/camel/component/rss/JettyTestServer.java | 3 +-- .../test/java/org/apache/camel/component/rss/RssEndpointTest.java | 2 +- .../org/apache/camel/component/rss/RssEntryPollingConsumerTest.java | 4 ++-- .../component/rss/RssEntryPollingConsumerWithBasicAuthTest.java | 4 ++-- .../camel/component/rss/RssEntryPollingConsumerWithFilterTest.java | 6 +++--- .../org/apache/camel/component/rss/RssEntrySortDefaultsTest.java | 4 ++-- .../test/java/org/apache/camel/component/rss/RssEntrySortTest.java | 6 +++--- .../src/test/java/org/apache/camel/component/rss/RssFilterTest.java | 6 +++--- .../apache/camel/component/rss/RssHttpNoCamelParametersTest.java | 4 ++-- .../apache/camel/component/rss/RssMultipleEndpointsIssueTest.java | 4 ++-- .../java/org/apache/camel/component/rss/RssPollingConsumerTest.java | 4 ++-- .../camel/component/rss/RssPollingConsumerWithBasicAuthTest.java | 4 ++-- .../component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java | 4 ++-- .../test/java/org/apache/camel/dataformat/rss/RssConverterTest.java | 4 ++-- .../java/org/apache/camel/dataformat/rss/RssDataFormatTest.java | 4 ++-- .../org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java | 4 ++-- 16 files changed, 33 insertions(+), 34 deletions(-) diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java index 54214ef5e46..37652b7183f 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -123,7 +122,7 @@ public final class JettyTestServer { private static final long serialVersionUID = 5594945031962091041L; @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { resp.getWriter().write(FileUtils.readFileToString(new File("src/test/data/rss20.xml"), StandardCharsets.UTF_8)); } } diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java index 2d411aeb60c..e7f5be839e2 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java @@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder; public class RssEndpointTest extends RssPollingConsumerTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() throws Exception { RssEndpoint rss = new RssEndpoint(); diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java index 7e6b3d1986a..452632cd720 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java @@ -31,9 +31,9 @@ public class RssEntryPollingConsumerTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=100").to("mock:result"); } }; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java index 83912aa582b..a7df22d34c0 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithBasicAuthTest.java @@ -33,10 +33,10 @@ public class RssEntryPollingConsumerWithBasicAuthTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("rss:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=true&sortEntries=true&delay=100&username=camel&password=camelPass").to("mock:result"); } diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java index 1f2d4ecf0c9..26becf4ff77 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java @@ -42,7 +42,7 @@ public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport { } @Override - protected void bindToRegistry(Registry registry) throws Exception { + protected void bindToRegistry(Registry registry) { // timestamp from the feed to use as base // Fri, 31 Oct 2008 12:02:21 -0500 Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT-5:00")); @@ -52,9 +52,9 @@ public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").filter().method("myBean", "isAfterDate") .to("mock:result"); } diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java index acd3ca5fb28..5adb473751b 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java @@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder; public class RssEntrySortDefaultsTest extends RssEntrySortTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted"); // should NOT sort by default diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java index db7f3afa644..47ae64b7890 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java @@ -49,14 +49,14 @@ public class RssEntrySortTest extends CamelTestSupport { } @Override - protected void bindToRegistry(Registry registry) throws Exception { + protected void bindToRegistry(Registry registry) { registry.bind("myBean", new MyBean()); } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=true&delay=50").to("mock:sorted"); from("rss:file:src/test/data/rss20.xml?splitEntries=true&sortEntries=false&delay=50").to("mock:unsorted"); } diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java index da6083c90a7..561f9b51c1e 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java @@ -35,14 +35,14 @@ public class RssFilterTest extends CamelTestSupport { } @Override - protected void bindToRegistry(Registry registry) throws Exception { + protected void bindToRegistry(Registry registry) { registry.bind("myFilterBean", new FilterBean()); } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { // See RssFilterWithXPathTest for an example of how to do this with XPath // START SNIPPET: ex1 diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java index 061e525d0a7..911df10180e 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssHttpNoCamelParametersTest.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; public class RssHttpNoCamelParametersTest extends CamelTestSupport { @Test - public void testRssHttpNoCamelParameters() throws Exception { + public void testRssHttpNoCamelParameters() { RssEndpoint rss = context.getEndpoint( "rss://http://www.iafrica.com/pls/cms/grapevine.xml?sortEntries=true&feedHeader=true", RssEndpoint.class); assertNotNull(rss); @@ -36,7 +36,7 @@ public class RssHttpNoCamelParametersTest extends CamelTestSupport { } @Test - public void testRssHttpNoCamelParametersAndOneFeedParameter() throws Exception { + public void testRssHttpNoCamelParametersAndOneFeedParameter() { RssEndpoint rss = context.getEndpoint( "rss://http://www.iafrica.com/pls/cms/grapevine.xml?sortEntries=true&feedHeader=true&foo=bar", RssEndpoint.class); diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java index c22c9a6fde6..09bebc23ab8 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssMultipleEndpointsIssueTest.java @@ -37,10 +37,10 @@ public class RssMultipleEndpointsIssueTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?initialDelay=2000").to("mock:a"); from("rss:http://www.iafrica.com/pls/cms/grapevine.xml?p_section=world_news&initialDelay=3000").to("mock:b"); diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java index 856a3b92a24..641444f8419 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java @@ -50,9 +50,9 @@ public class RssPollingConsumerTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=false").to("mock:result"); } }; diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java index 9e1a796e76e..1f9a062d806 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithBasicAuthTest.java @@ -23,10 +23,10 @@ import org.junit.jupiter.api.BeforeAll; public class RssPollingConsumerWithBasicAuthTest extends RssPollingConsumerTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @Override - public void configure() throws Exception { + public void configure() { from("rss:http://localhost:" + JettyTestServer.getInstance().port + "/?splitEntries=false&username=camel&password=camelPass").to("mock:result"); } diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java index fa2ce5eb91f..70754fc611f 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java @@ -41,9 +41,9 @@ public class RssPollingConsumerWithFeedHeaderDisabledTest extends CamelTestSuppo } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=500&feedHeader=false").to("mock:result"); } }; diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java index 3895efc38d6..f288b756d8f 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java @@ -22,9 +22,9 @@ import org.apache.camel.builder.RouteBuilder; public class RssConverterTest extends RssDataFormatTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { // START SNIPPET: ex from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").convertBodyTo(String.class) .to("mock:marshal"); diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java index ab6356ce3b0..86ae71f0449 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java @@ -54,9 +54,9 @@ public class RssDataFormatTest extends CamelTestSupport { } @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { // START SNIPPET: ex from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").marshal().rss().to("mock:marshal"); // END SNIPPET: ex diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java index 17c6d41f312..cd445d41a14 100644 --- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java +++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssFilterWithXPathTest.java @@ -22,9 +22,9 @@ import org.apache.camel.component.rss.RssFilterTest; public class RssFilterWithXPathTest extends RssFilterTest { @Override - protected RouteBuilder createRouteBuilder() throws Exception { + protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { - public void configure() throws Exception { + public void configure() { // START SNIPPET: ex // only entries with Camel in the title will get through the filter from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100")