You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/03/09 14:24:22 UTC

[camel] 02/07: CAMEL-17763: cleaned up unused exceptions in camel-mail

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 9a19841bc867c70f6dda1818a208d033c6e23e92
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Mar 9 14:10:32 2022 +0100

    CAMEL-17763: cleaned up unused exceptions in camel-mail
---
 .../mail/AdditionalMailPropertiesTest.java         |  6 +++---
 .../camel/component/mail/AuthenticatorTest.java    |  2 +-
 .../mail/DetermineContentTypeIssueTest.java        | 12 +++++------
 .../camel/component/mail/FromFileSendMailTest.java |  4 ++--
 .../mail/MailAttachmentDuplicateNamesTest.java     |  4 ++--
 .../mail/MailAttachmentRedeliveryTest.java         |  6 +++---
 .../camel/component/mail/MailAttachmentTest.java   |  4 ++--
 .../mail/MailAttachmentsUmlautIssueTest.java       |  4 ++--
 .../component/mail/MailBatchConsumerTest.java      |  4 ++--
 .../component/mail/MailCollectionHeaderTest.java   |  4 ++--
 .../mail/MailComponentRecipientSetTest.java        |  4 ++--
 .../camel/component/mail/MailComponentTest.java    | 24 +++++++++++-----------
 .../mail/MailConsumerAuthenticatorTest.java        |  3 +--
 .../mail/MailConsumerUnsupportedCharsetTest.java   |  4 ++--
 .../mail/MailContentTypeResolverTest.java          |  4 ++--
 .../camel/component/mail/MailContentTypeTest.java  |  4 ++--
 .../camel/component/mail/MailConvertersTest.java   | 10 ++++-----
 .../camel/component/mail/MailCopyToTest.java       |  4 ++--
 .../component/mail/MailCustomContentTypeTest.java  |  4 ++--
 .../component/mail/MailCustomMailSenderTest.java   |  5 ++---
 .../mail/MailDefaultDelayForMailConsumeTest.java   |  4 ++--
 .../camel/component/mail/MailDisconnectTest.java   |  4 ++--
 .../mail/MailDoNotDeleteIfProcessFailsTest.java    |  6 +++---
 .../camel/component/mail/MailEndpointTest.java     |  6 +++---
 .../camel/component/mail/MailEndpointTlsTest.java  |  6 +++---
 .../camel/component/mail/MailFetchSizeTest.java    |  4 ++--
 .../component/mail/MailFetchSizeZeroTest.java      |  4 ++--
 ...aderOverrulePreConfigurationRecipientsTest.java |  4 ++--
 .../component/mail/MailHtmlAttachmentTest.java     |  4 ++--
 ...IdempotentRepositoryDuplicateNotRemoveTest.java |  4 ++--
 .../MailIdempotentRepositoryDuplicateTest.java     |  4 ++--
 .../mail/MailIdempotentRepositoryTest.java         |  4 ++--
 .../component/mail/MailMaxMessagesPerPollTest.java |  4 ++--
 .../component/mail/MailMimeDecodeHeadersTest.java  |  4 ++--
 .../camel/component/mail/MailMoveToTest.java       |  4 ++--
 .../component/mail/MailMultipleRecipientsTest.java |  6 +++---
 .../MailMultipleRecipientsUsingHeadersTest.java    |  4 ++--
 .../mail/MailNameAndEmailInRecipientTest.java      |  6 +++---
 .../camel/component/mail/MailNoRecipientsTest.java |  6 +++---
 .../component/mail/MailPollEnrichNoMailTest.java   |  4 ++--
 .../camel/component/mail/MailPollEnrichTest.java   |  4 ++--
 .../component/mail/MailPostProcessActionTest.java  |  4 ++--
 .../mail/MailProcessOnlyUnseenMessagesTest.java    |  4 ++--
 .../component/mail/MailProducerConcurrentTest.java |  6 +++---
 .../camel/component/mail/MailProducerTest.java     |  4 ++--
 .../mail/MailProducerUnsupportedCharsetTest.java   |  4 ++--
 .../mail/MailRecipientsPipeIssueTest.java          |  4 ++--
 .../camel/component/mail/MailRecipientsTest.java   |  4 ++--
 .../camel/component/mail/MailReplyToTest.java      |  4 ++--
 .../apache/camel/component/mail/MailRouteTest.java |  2 +-
 .../camel/component/mail/MailSearchTermTest.java   |  4 ++--
 .../mail/MailSearchTermUriConfigBeanTest.java      |  6 +++---
 .../MailSearchTermUriConfigLast24HoursTest.java    |  4 ++--
 .../mail/MailSearchTermUriConfigTest.java          |  4 ++--
 .../mail/MailShutdownCompleteAllTasksTest.java     |  2 +-
 .../MailShutdownCompleteCurrentTaskOnlyTest.java   |  4 ++--
 .../camel/component/mail/MailSortTermTest.java     |  4 ++--
 .../component/mail/MailSortTermThreeTest.java      |  4 ++--
 .../mail/MailSortTermThreeUriConfigTest.java       |  4 ++--
 .../camel/component/mail/MailSortTermTwoTest.java  |  4 ++--
 .../mail/MailSortTermTwoUriConfigTest.java         |  4 ++--
 .../component/mail/MailSortTermUriConfigTest.java  |  4 ++--
 .../camel/component/mail/MailSorterTest.java       |  6 +++---
 .../component/mail/MailSplitAttachmentsTest.java   |  4 ++--
 .../camel/component/mail/MailSubjectTest.java      |  4 ++--
 .../mail/MailToMultipleEndpointsTest.java          |  4 ++--
 .../component/mail/MailUsernameWithAtSignTest.java |  4 ++--
 .../component/mail/MailUsingCustomSessionTest.java |  4 ++--
 .../camel/component/mail/MailUsingHeadersTest.java |  4 ++--
 .../mail/MimeMultipartAlternativeTest.java         |  6 +++---
 ...imeMultipartAlternativeWithContentTypeTest.java |  6 +++---
 ...MultipartAlternativeWithLongerFilenameTest.java |  6 +++---
 .../camel/component/mail/RawMailMessageTest.java   |  4 ++--
 .../component/mail/SearchTermBuilderTest.java      |  2 +-
 .../multipart/MimeMultipartDataFormatTest.java     |  2 +-
 75 files changed, 175 insertions(+), 177 deletions(-)

diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
index ee70909..f430ff2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class AdditionalMailPropertiesTest extends CamelTestSupport {
 
     @Test
-    public void testAdditionalMailProperties() throws Exception {
+    public void testAdditionalMailProperties() {
         // clear mailbox
         Mailbox.clearAll();
 
@@ -59,10 +59,10 @@ public class AdditionalMailPropertiesTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@localhost?mail.pop3.forgettopheaders=true&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
index 7f23a04..f5705c7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/AuthenticatorTest.java
@@ -68,7 +68,7 @@ public class AuthenticatorTest extends CamelTestSupport {
         return body;
     }
 
-    private void execute(String mailAddress, String body) throws MessagingException, InterruptedException {
+    private void execute(String mailAddress, String body) throws MessagingException {
 
         Properties properties = new Properties();
         properties.put("mail.smtp.host", "localhost");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
index d836d4f..a037917 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/DetermineContentTypeIssueTest.java
@@ -30,7 +30,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     private final String contentType = "application/pkcs7-mime; smime-type=enveloped-data; name=\"smime.p7m\"";
 
     @Test
-    public void testDetermineContentTypeNoChange() throws Exception {
+    public void testDetermineContentTypeNoChange() {
         MailConfiguration configuration = new MailConfiguration();
         MailBinding binding = new MailBinding();
 
@@ -42,7 +42,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     }
 
     @Test
-    public void testDetermineContentTypeCharSetFromExchange() throws Exception {
+    public void testDetermineContentTypeCharSetFromExchange() {
         MailConfiguration configuration = new MailConfiguration();
         MailBinding binding = new MailBinding();
 
@@ -58,7 +58,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     }
 
     @Test
-    public void testDetermineContentTypeFallbackCharSetFromExchange() throws Exception {
+    public void testDetermineContentTypeFallbackCharSetFromExchange() {
         MailConfiguration configuration = new MailConfiguration();
         MailBinding binding = new MailBinding();
 
@@ -73,7 +73,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     }
 
     @Test
-    public void testDetermineContentTypeIgnoreUnsupportedExchangeAsFallback() throws Exception {
+    public void testDetermineContentTypeIgnoreUnsupportedExchangeAsFallback() {
         MailConfiguration configuration = new MailConfiguration();
         // ignore unsupported
         configuration.setIgnoreUnsupportedCharset(true);
@@ -90,7 +90,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     }
 
     @Test
-    public void testDetermineContentTypeInvalidCharset() throws Exception {
+    public void testDetermineContentTypeInvalidCharset() {
         MailConfiguration configuration = new MailConfiguration();
         MailBinding binding = new MailBinding();
 
@@ -104,7 +104,7 @@ public class DetermineContentTypeIssueTest extends ExchangeTestSupport {
     }
 
     @Test
-    public void testDetermineContentTypeWithCharsetInMiddle() throws Exception {
+    public void testDetermineContentTypeWithCharsetInMiddle() {
         MailConfiguration configuration = new MailConfiguration();
         MailBinding binding = new MailBinding();
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
index cb60940..0497f1e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/FromFileSendMailTest.java
@@ -49,10 +49,10 @@ public class FromFileSendMailTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("file://target/mailtext?initialDelay=100&delay=100")
                         .setHeader("Subject", constant("Hello World"))
                         .setHeader("To", constant("james@localhost"))
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
index 9eb6f15..a4a6618 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentDuplicateNamesTest.java
@@ -91,9 +91,9 @@ public class MailAttachmentDuplicateNamesTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
index cd8c18a..a552b0f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentRedeliveryTest.java
@@ -98,9 +98,9 @@ public class MailAttachmentRedeliveryTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 onException(IllegalArgumentException.class).maximumRedeliveries(3).redeliveryDelay(0);
 
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100")
@@ -108,7 +108,7 @@ public class MailAttachmentRedeliveryTest extends CamelTestSupport {
                             private int counter;
 
                             @Override
-                            public void process(Exchange exchange) throws Exception {
+                            public void process(Exchange exchange) {
                                 Map<String, DataHandler> map = exchange.getIn(AttachmentMessage.class).getAttachments();
                                 assertNotNull(map);
                                 assertEquals(1, map.size());
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
index 74192d5..ba29522 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
@@ -99,9 +99,9 @@ public class MailAttachmentTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
index 31225ef..6a6dc7e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentsUmlautIssueTest.java
@@ -96,9 +96,9 @@ public class MailAttachmentsUmlautIssueTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
index 3c14e7f..803284e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailBatchConsumerTest.java
@@ -90,9 +90,9 @@ public class MailBatchConsumerTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100"
                      + "&delete=true").to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
index 1feeb04..72c4e64 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCollectionHeaderTest.java
@@ -52,9 +52,9 @@ public class MailCollectionHeaderTest 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("smtp://localhost?username=james@localhost");
 
                 from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
index ebbdb92..21c3d36 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
@@ -60,10 +60,10 @@ public class MailComponentRecipientSetTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 MailConfiguration config = new MailConfiguration();
                 config.setCc("spy@spy.com");
                 config.setFrom("me@me.com");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
index 72a5d15..3b7aaf2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentTest.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 public class MailComponentTest extends CamelTestSupport {
 
     @Test
-    public void testMailEndpointsAreConfiguredProperlyWhenUsingSmtp() throws Exception {
+    public void testMailEndpointsAreConfiguredProperlyWhenUsingSmtp() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:25/subject");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("smtp", config.getProtocol(), "getProtocol()");
@@ -47,7 +47,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testMailEndpointsAreConfiguredProperlyWhenUsingImap() throws Exception {
+    public void testMailEndpointsAreConfiguredProperlyWhenUsingImap() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("imap://james@myhost:143/subject");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("imap", config.getProtocol(), "getProtocol()");
@@ -61,7 +61,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testMailEndpointsAreConfiguredProperlyWhenUsingPop() throws Exception {
+    public void testMailEndpointsAreConfiguredProperlyWhenUsingPop() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost:110/subject");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("pop3", config.getProtocol(), "getProtocol()");
@@ -75,7 +75,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testDefaultSMTPConfiguration() throws Exception {
+    public void testDefaultSMTPConfiguration() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost?password=secret");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("smtp", config.getProtocol(), "getProtocol()");
@@ -99,7 +99,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testDefaultSMTPSConfiguration() throws Exception {
+    public void testDefaultSMTPSConfiguration() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtps://james@myhost?password=secret");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("smtps", config.getProtocol(), "getProtocol()");
@@ -123,21 +123,21 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testDebugMode() throws Exception {
+    public void testDebugMode() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost?password=secret&debugMode=true");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals(true, config.isDebugMode());
     }
 
     @Test
-    public void testConnectionTimeout() throws Exception {
+    public void testConnectionTimeout() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost?password=secret&connectionTimeout=2500");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals(2500, config.getConnectionTimeout());
     }
 
     @Test
-    public void testDefaultPOP3Configuration() throws Exception {
+    public void testDefaultPOP3Configuration() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost?password=secret");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("pop3", config.getProtocol(), "getProtocol()");
@@ -158,7 +158,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testDefaultIMAPConfiguration() throws Exception {
+    public void testDefaultIMAPConfiguration() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("imap://james@myhost?password=secret");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("imap", config.getProtocol(), "getProtocol()");
@@ -179,7 +179,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testManyConfigurations() throws Exception {
+    public void testManyConfigurations() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://james@myhost:30/subject?password=secret"
                                                          + "&from=me@camelriders.org&delete=true&folderName=riders"
                                                          + "&contentType=text/html&unseen=false");
@@ -265,7 +265,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testMailEndpointsWithFetchSize() throws Exception {
+    public void testMailEndpointsWithFetchSize() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("pop3://james@myhost?fetchSize=5");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("pop3", config.getProtocol(), "getProtocol()");
@@ -280,7 +280,7 @@ public class MailComponentTest extends CamelTestSupport {
     }
 
     @Test
-    public void testSMTPEndpointWithSubjectOption() throws Exception {
+    public void testSMTPEndpointWithSubjectOption() {
         MailEndpoint endpoint = resolveMandatoryEndpoint("smtp://myhost:25?subject=hello");
         MailConfiguration config = endpoint.getConfiguration();
         assertEquals("smtp", config.getProtocol(), "getProtocol()");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
index c4f18a7..0acb1a2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerAuthenticatorTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.mail;
 
-import java.io.IOException;
 import java.util.Properties;
 
 import javax.mail.MessagingException;
@@ -49,7 +48,7 @@ public class MailConsumerAuthenticatorTest {
         execute("imap");
     }
 
-    private void execute(String protocol) throws Exception, IOException {
+    private void execute(String protocol) throws Exception {
         MailAuthenticator authenticator = new MyAuthenticator();
 
         JavaMailSender sender = Mockito.mock(JavaMailSender.class);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
index 420137c..4110408 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConsumerUnsupportedCharsetTest.java
@@ -64,9 +64,9 @@ public class MailConsumerUnsupportedCharsetTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=true")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
index 9deaeb0..c6bda44 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeResolverTest.java
@@ -87,9 +87,9 @@ public class MailContentTypeResolverTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 MailComponent mail = getContext().getComponent("smtp", MailComponent.class);
                 mail.setContentTypeResolver(new ContentTypeResolver() {
                     public String resolveContentType(String fileName) {
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
index 6d57fdd..040c9b3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailContentTypeTest.java
@@ -77,9 +77,9 @@ public class MailContentTypeTest 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("smtp://claus@localhost?contentType=text/html");
                 from("direct:b").to("smtp://claus@localhost?contentType=text/plain");
                 from("direct:c").to("smtp://claus@localhost");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
index 36693c5..bd4937c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
@@ -82,7 +82,7 @@ public class MailConvertersTest extends CamelTestSupport {
         mock.expectedMessageCount(1);
 
         template.send("direct:a", new Processor() {
-            public void process(Exchange exchange) throws Exception {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody("Hello World");
                 exchange.getIn().setHeader(MailConstants.MAIL_ALTERNATIVE_BODY, "Alternative World");
             }
@@ -107,7 +107,7 @@ public class MailConvertersTest extends CamelTestSupport {
         mock.expectedMessageCount(1);
 
         template.send("direct:a", new Processor() {
-            public void process(Exchange exchange) throws Exception {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody("Hello World");
                 exchange.getIn().setHeader(MailConstants.MAIL_ALTERNATIVE_BODY, "Alternative World");
             }
@@ -132,7 +132,7 @@ public class MailConvertersTest extends CamelTestSupport {
         mock.expectedMessageCount(1);
 
         template.send("direct:a", new Processor() {
-            public void process(Exchange exchange) throws Exception {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody("Hello World");
                 exchange.getIn().setHeader(MailConstants.MAIL_ALTERNATIVE_BODY, "Alternative World");
             }
@@ -151,10 +151,10 @@ public class MailConvertersTest 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:a").to("smtp://localhost?username=james@localhost");
 
                 from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
index 4e2206e..cc2ac9e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCopyToTest.java
@@ -78,9 +78,9 @@ public class MailCopyToTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones@localhost?password=secret&copyTo=backup&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
index 7fb4be8..364a352 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomContentTypeTest.java
@@ -111,9 +111,9 @@ public class MailCustomContentTypeTest 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("smtp://claus@localhost?contentType=text/html;charset=UTF-8");
                 from("direct:b").to("smtp://claus@localhost");
                 from("direct:c").to("smtp://claus@localhost?contentType=text/html;charset=iso-8859-1");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
index 5f54f29..7049d2f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailCustomMailSenderTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.mail;
 
 import java.util.Properties;
 
-import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.internet.MimeMessage;
 
@@ -36,7 +35,7 @@ public class MailCustomMailSenderTest extends CamelTestSupport {
     private MySender sender = new MySender();
 
     @Test
-    public void testSendWithCustomMailSender() throws Exception {
+    public void testSendWithCustomMailSender() {
         sendBody("smtp://claus@localhost?javaMailSender=#mySender", "Hello World");
 
         assertTrue(sent, "Should have used custom mail sender");
@@ -45,7 +44,7 @@ public class MailCustomMailSenderTest extends CamelTestSupport {
     private static class MySender implements JavaMailSender {
 
         @Override
-        public void send(MimeMessage mimeMessage) throws MessagingException {
+        public void send(MimeMessage mimeMessage) {
             sent = true;
         }
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
index 157ed75..34d5ebe 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDefaultDelayForMailConsumeTest.java
@@ -60,9 +60,9 @@ public class MailDefaultDelayForMailConsumeTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // we overrule the default of 60 sec to 1 so the unit test is faster
                 from("pop3://bond@localhost?delay=1000").to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
index 6d51dea..5e3f202 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDisconnectTest.java
@@ -48,9 +48,9 @@ public class MailDisconnectTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&disconnect=true&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
index 9321c62c..b1f419d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailDoNotDeleteIfProcessFailsTest.java
@@ -83,15 +83,15 @@ public class MailDoNotDeleteIfProcessFailsTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // no redelivery for unit test as we want it to be polled next time
                 onException(IllegalArgumentException.class).to("mock:error");
 
                 from("imap://localhost?username=claus&password=secret&unseen=true&initialDelay=100&delay=100")
                         .process(new Processor() {
-                            public void process(Exchange exchange) throws Exception {
+                            public void process(Exchange exchange) {
                                 counter++;
                                 if (counter < 3) {
                                     throw new IllegalArgumentException("Forced by unit test");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
index 27e1f90..b1331e6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
@@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 public class MailEndpointTest extends CamelTestSupport {
 
     @Test
-    public void testMailEndpointCtr() throws Exception {
+    public void testMailEndpointCtr() {
         MailEndpoint endpoint = new MailEndpoint();
         assertNull(endpoint.getConfiguration());
         assertNull(endpoint.getContentTypeResolver());
@@ -45,7 +45,7 @@ public class MailEndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testMailEndpointCtrEndpoint() throws Exception {
+    public void testMailEndpointCtrEndpoint() {
         MailEndpoint endpoint = new MailEndpoint("smtp://myhost");
         assertNull(endpoint.getContentTypeResolver());
         assertNotNull(endpoint.getConfiguration());
@@ -64,7 +64,7 @@ public class MailEndpointTest extends CamelTestSupport {
     }
 
     @Test
-    public void testMailEndpointCtrEndpointConfig() throws Exception {
+    public void testMailEndpointCtrEndpointConfig() {
         MailConfiguration cfg = new MailConfiguration();
         cfg.setPort(21);
         cfg.configureProtocol("smtp");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
index b752d50..72fc193 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTlsTest.java
@@ -44,7 +44,7 @@ public class MailEndpointTlsTest extends CamelTestSupport {
 
     @ParameterizedTest
     @MethodSource("data")
-    public void testMailEndpointTlsConfig(String protocol) throws Exception {
+    public void testMailEndpointTlsConfig(String protocol) {
         Properties properties = new Properties();
         properties.setProperty("mail." + protocol + ".starttls.enable", "true");
 
@@ -65,7 +65,7 @@ public class MailEndpointTlsTest extends CamelTestSupport {
 
     @ParameterizedTest
     @MethodSource("data")
-    public void testMailEndpointNoTlsConfig(String protocol) throws Exception {
+    public void testMailEndpointNoTlsConfig(String protocol) {
         MailConfiguration cfg = new MailConfiguration();
         cfg.setPort(21);
         cfg.configureProtocol(protocol);
@@ -93,7 +93,7 @@ public class MailEndpointTlsTest extends CamelTestSupport {
 
     @ParameterizedTest
     @MethodSource("data")
-    public void testMailEndpointTlsSslContextParametersConfig(String protocol) throws Exception {
+    public void testMailEndpointTlsSslContextParametersConfig(String protocol) {
         Properties properties = new Properties();
         properties.setProperty("mail." + protocol + ".starttls.enable", "true");
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
index 9f684ae..6bdeee4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeTest.java
@@ -97,9 +97,9 @@ public class MailFetchSizeTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&fetchSize=2&delay=2000"
                      + "&delete=true").to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
index d9a6bc6..014c23e 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailFetchSizeZeroTest.java
@@ -79,9 +79,9 @@ public class MailFetchSizeZeroTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&fetchSize=0&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
index b47c984..ab3fd13 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHeaderOverrulePreConfigurationRecipientsTest.java
@@ -52,9 +52,9 @@ public class MailHeaderOverrulePreConfigurationRecipientsTest extends CamelTestS
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://claus@localhost?to=someone@outhere.com&cc=none@world.com&initialDelay=100&delay=100")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
index eb6cfb5..aa5e5c9 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
@@ -99,9 +99,9 @@ public class MailHtmlAttachmentTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
index dba3758..d4a2a34 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateNotRemoveTest.java
@@ -51,9 +51,9 @@ public class MailIdempotentRepositoryDuplicateNotRemoveTest extends MailIdempote
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&idempotentRepositoryRemoveOnCommit=false&initialDelay=100&delay=100")
                         .routeId("foo").noAutoStartup()
                         .to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
index 2eccfa1..861160f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryDuplicateTest.java
@@ -93,9 +93,9 @@ public class MailIdempotentRepositoryDuplicateTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&initialDelay=100&delay=100")
                         .routeId("foo").noAutoStartup()
                         .to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
index 20913be..fee1436 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailIdempotentRepositoryTest.java
@@ -89,9 +89,9 @@ public class MailIdempotentRepositoryTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones@localhost?password=secret&idempotentRepository=#myRepo&initialDelay=100&delay=100")
                         .routeId("foo").noAutoStartup()
                         .to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
index a4573c3..7c340f7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMaxMessagesPerPollTest.java
@@ -84,9 +84,9 @@ public class MailMaxMessagesPerPollTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&maxMessagesPerPoll=3"
                      + "&delete=true").to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
index a16c76f..5328351 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMimeDecodeHeadersTest.java
@@ -86,9 +86,9 @@ public class MailMimeDecodeHeadersTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("direct:longSubject")
                         .setHeader("subject", constant(longSubject))
                         .to("smtp://plain@localhost", "smtp://decoded@localhost");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
index 389ddb3..84c1318 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMoveToTest.java
@@ -110,12 +110,12 @@ public class MailMoveToTest extends CamelTestSupport {
     @Override
     protected RoutesBuilder[] createRouteBuilders() {
         return new RoutesBuilder[] { new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones@localhost?password=secret&delete=false&moveTo=moveToFolder&initialDelay=100&delay=100")
                         .to("mock:result");
             }
         }, new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("imap://jones2@localhost?password=secret&delete=true&moveTo=moveToFolder&initialDelay=100&delay=100")
                         .to("mock:result2");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
index 98b1d12..bfa358c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
@@ -67,7 +67,7 @@ public class MailMultipleRecipientsTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
-    private void assertMailbox(String name) throws Exception {
+    private void assertMailbox(String name) {
         MockEndpoint mock = getMockEndpoint("mock:" + name);
         mock.expectedMessageCount(1);
         mock.expectedBodiesReceived("Hello World");
@@ -75,9 +75,9 @@ public class MailMultipleRecipientsTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://claus@localhost?initialDelay=100&delay=100").to("mock:claus");
 
                 from("pop3://willem@localhost?initialDelay=100&delay=100").to("mock:willem");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
index 7eabf87..895dbcc 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsUsingHeadersTest.java
@@ -57,9 +57,9 @@ public class MailMultipleRecipientsUsingHeadersTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // no routes
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
index 4a8b750..c6f1e24 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNameAndEmailInRecipientTest.java
@@ -45,7 +45,7 @@ public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
         assertMockEndpointsSatisfied();
     }
 
-    private void assertMailbox(String name) throws Exception {
+    private void assertMailbox(String name) {
         MockEndpoint mock = getMockEndpoint("mock:" + name);
         mock.expectedBodiesReceived("Hello World");
         mock.message(0).header("to").isEqualTo("Claus Ibsen <da...@localhost>");
@@ -53,9 +53,9 @@ public class MailNameAndEmailInRecipientTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://davsclaus@localhost?initialDelay=100&delay=100").to("mock:davsclaus");
 
                 from("pop3://jstrachan@localhost?initialDelay=100&delay=100").to("mock:jstrachan");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
index 0153cbf..8187b39 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailNoRecipientsTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 public class MailNoRecipientsTest extends CamelTestSupport {
 
     @Test
-    public void testMailNoRecipients() throws Exception {
+    public void testMailNoRecipients() {
         try {
             template.sendBody("direct:a", "Hello World");
             fail("Should have thrown exception");
@@ -42,9 +42,9 @@ public class MailNoRecipientsTest 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("smtp://localhost");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
index db4a974..ea6cca2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichNoMailTest.java
@@ -70,9 +70,9 @@ public class MailPollEnrichNoMailTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("direct:start")
                         .pollEnrich("pop3://bill@localhost?password=secret&initialDelay=100&delay=100", 0)
                         .to("log:mail", "mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
index 133791b..d5d5970 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPollEnrichTest.java
@@ -90,9 +90,9 @@ public class MailPollEnrichTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("direct:start")
                         .pollEnrich("pop3://bill@localhost?password=secret&initialDelay=100&delay=100", 5000)
                         .to("log:mail", "mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
index ee9845d..21c3685 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailPostProcessActionTest.java
@@ -95,9 +95,9 @@ public class MailPostProcessActionTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&postProcessAction=#postProcessAction&initialDelay=100&delay=100")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
index e07c512..b57d292 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProcessOnlyUnseenMessagesTest.java
@@ -85,9 +85,9 @@ public class MailProcessOnlyUnseenMessagesTest 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("smtp://claus@localhost");
 
                 from("imap://localhost?username=claus&password=secret&unseen=true&initialDelay=100&delay=100")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
index 2b55bba..b9abc56 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
@@ -62,7 +62,7 @@ public class MailProducerConcurrentTest 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.sendBodyAndHeader("direct:start", "Message " + index, "To", "someone@localhost");
                     latch.countDown();
                     return null;
@@ -90,10 +90,10 @@ public class MailProducerConcurrentTest 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("smtp://camel@localhost", "mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
index c960209..5b14e4a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java
@@ -77,10 +77,10 @@ public class MailProducerTest 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("smtp://camel@localhost", "mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
index 7037be1..29a3ee4 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
@@ -43,7 +43,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
 
         context.addRoutes(new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=true")
                         .to("mock:result");
             }
@@ -73,7 +73,7 @@ public class MailProducerUnsupportedCharsetTest extends CamelTestSupport {
 
         context.addRoutes(new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100&ignoreUnsupportedCharset=false")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
index fbb9e51..256cd39 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsPipeIssueTest.java
@@ -50,9 +50,9 @@ public class MailRecipientsPipeIssueTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 String recipients = "&to=camel|pipes@riders.org;easy@riders.org";
 
                 from("direct:a").to("smtp://you@mymailserver.com?password=secret&from=you@apache.org" + recipients);
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
index 89d9b37..bc76ef7 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRecipientsTest.java
@@ -126,9 +126,9 @@ public class MailRecipientsTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // START SNIPPET: e1
                 // all the recipients of this mail are:
                 // to: camel@riders.org , easy@riders.org
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
index f81fdc3..dedae19 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailReplyToTest.java
@@ -76,9 +76,9 @@ public class MailReplyToTest 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("smtp://christian@localhost?subject=Camel");
 
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
index fff7b0c6..3bcca89 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailRouteTest.java
@@ -82,7 +82,7 @@ public class MailRouteTest extends CamelTestSupport {
 
         template.send("direct:a", new Processor() {
 
-            public void process(Exchange exchange) throws Exception {
+            public void process(Exchange exchange) {
                 exchange.getIn().setBody(body);
                 exchange.getIn().setHeader("subject", subject);
                 exchange.setProperty(Exchange.CHARSET_NAME, "US-ASCII");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
index c7e96bf..1ff46bc 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermTest.java
@@ -118,9 +118,9 @@ public class MailSearchTermTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&searchTerm=#myTerm&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
index 0ed7976..2caa67f 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigBeanTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
 public class MailSearchTermUriConfigBeanTest extends MailSearchTermUriConfigTest {
 
     @BindToRegistry("mySearchTerm")
-    public SimpleSearchTerm addSearchTerm() throws Exception {
+    public SimpleSearchTerm addSearchTerm() {
         SimpleSearchTerm mySearchTerm = new SimpleSearchTerm();
         mySearchTerm.setSubjectOrBody("Camel");
 
@@ -30,9 +30,9 @@ public class MailSearchTermUriConfigBeanTest extends MailSearchTermUriConfigTest
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&searchTerm=#mySearchTerm").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
index f9039af..5b29a9c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigLast24HoursTest.java
@@ -119,9 +119,9 @@ public class MailSearchTermUriConfigLast24HoursTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&searchTerm.fromSentDate=now-24h&initialDelay=100&delay=100")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
index 10c3dbb..09cc031 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSearchTermUriConfigTest.java
@@ -104,9 +104,9 @@ public class MailSearchTermUriConfigTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://bill@localhost?password=secret&searchTerm.subjectOrBody=Camel&initialDelay=100&delay=100")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
index 153d1b8..bfdbb4b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteAllTasksTest.java
@@ -55,7 +55,7 @@ public class MailShutdownCompleteAllTasksTest extends CamelTestSupport {
         context.getShutdownStrategy().setTimeout(20);
         context.addRoutes(new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100").routeId("route1")
                         // let it complete all tasks during shutdown
                         .shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
index e97238a..b7ffa8b 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailShutdownCompleteCurrentTaskOnlyTest.java
@@ -83,9 +83,9 @@ public class MailShutdownCompleteCurrentTaskOnlyTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://jones@localhost?password=secret&initialDelay=100&delay=100").routeId("route1")
                         // let it complete only current task so we shutdown faster
                         .shutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly)
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
index c257829..442b983 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java
@@ -107,9 +107,9 @@ public class MailSortTermTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate&initialDelay=100&delay=100")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
index f598733..14bcfa1 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java
@@ -107,9 +107,9 @@ public class MailSortTermThreeTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate&initialDelay=100&delay=100")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
index 0f55c3d..9a8842c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeUriConfigTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
 
 public class MailSortTermThreeUriConfigTest extends MailSortTermThreeTest {
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("pop3://bill@localhost?password=secret&sortTerm=reverse,date").to("mock:resultDescendingImap");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
index a995c4f..386a2a6 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java
@@ -107,9 +107,9 @@ public class MailSortTermTwoTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate&initialDelay=100&delay=100")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
index 491940d..ac8342c 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoUriConfigTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
 
 public class MailSortTermTwoUriConfigTest extends MailSortTermTwoTest {
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("pop3://bill@localhost?password=secret&sortTerm=reverse,date").to("mock:resultDescending");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
index 3ab4f12..90a0afa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermUriConfigTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
 
 public class MailSortTermUriConfigTest extends MailSortTermTest {
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 context.setAutoStartup(false);
 
                 from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=date").to("mock:resultAscending");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java
index fa786d4..f135f83 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSorterTest.java
@@ -93,7 +93,7 @@ public class MailSorterTest extends CamelTestSupport {
     }
 
     @Test
-    public void testSortMessagesReverse() throws Exception {
+    public void testSortMessagesReverse() {
         Message[] expected = new Message[] { MESSAGES[2], MESSAGES[1], MESSAGES[0] };
 
         // Sort using all the terms. Message order should be the same no matter what term is used
@@ -109,7 +109,7 @@ public class MailSorterTest extends CamelTestSupport {
     }
 
     @Test
-    public void testSortMessagesMulti() throws Exception {
+    public void testSortMessagesMulti() {
         Message[] expected = new Message[] { MESSAGES[0], MESSAGES[1], MESSAGES[2] };
 
         // Sort using all the terms. Message order should be the same no matter what term is used. The second term
@@ -129,7 +129,7 @@ public class MailSorterTest extends CamelTestSupport {
     }
 
     @Test
-    public void testSortMessagesWithTie() throws Exception {
+    public void testSortMessagesWithTie() {
         Message[] given = new Message[] { MESSAGES[2], TIE_BREAKER };
 
         // Sort according to the whole list. Only the last element breaks the tie
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
index 616540d..9c4adba 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSplitAttachmentsTest.java
@@ -88,13 +88,13 @@ public class MailSplitAttachmentsTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
 
         splitAttachmentsExpression = new SplitAttachmentsExpression();
 
         return new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 // START SNIPPET: e1
                 from("pop3://james@mymailserver.com?password=secret&initialDelay=100&delay=100")
                         .to("log:email")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
index adac38e..b0c1301 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSubjectTest.java
@@ -50,9 +50,9 @@ public class MailSubjectTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // START SNIPPET: e1
                 from("direct:a").setHeader("subject", constant(subject)).to("smtp://james2@localhost");
                 // END SNIPPET: e1
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
index e807650..dd7a8c2 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
@@ -57,10 +57,10 @@ public class MailToMultipleEndpointsTest 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:a").to("smtp://localhost?username=james2&password=secret&to=a@a.com&from=me@me.com");
 
                 from("direct:b").to("smtp://localhost?username=james&password=secret&to=b@b.com&from=you@you.com");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
index 10b9d0d..7c1dc90 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsernameWithAtSignTest.java
@@ -41,9 +41,9 @@ public class MailUsernameWithAtSignTest 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("smtp://localhost?username=james@localhost");
 
                 from("pop3://localhost?username=james&password=secret&initialDelay=100&delay=100").to("mock:result");
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
index 6e1229f..7d8a3fa 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingCustomSessionTest.java
@@ -79,10 +79,10 @@ public class MailUsingCustomSessionTest extends CamelTestSupport {
     }
 
     @Override
-    protected RoutesBuilder createRouteBuilder() throws Exception {
+    protected RoutesBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://james@localhost?session=#myCustomMailSession&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
index c68e6bf..8503fe3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailUsingHeadersTest.java
@@ -80,9 +80,9 @@ public class MailUsingHeadersTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 // no routes
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
index 95367e2..8d24250 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
@@ -43,7 +43,7 @@ public class MimeMultipartAlternativeTest extends CamelTestSupport {
     private String alternativeBody = "hello world! (plain text)";
     private String htmlBody = "<html><body><h1>Hello</h1>World<img src=\"cid:0001\"></body></html>";
 
-    private void sendMultipartEmail(boolean useInlineattachments) throws Exception {
+    private void sendMultipartEmail(boolean useInlineattachments) {
         Mailbox.clearAll();
 
         // create an exchange with a normal body and attachment to be produced as email
@@ -100,9 +100,9 @@ public class MimeMultipartAlternativeTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://ryan@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
index 8479156..870d6c5 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithContentTypeTest.java
@@ -39,7 +39,7 @@ public class MimeMultipartAlternativeWithContentTypeTest extends CamelTestSuppor
     private String alternativeBody = "hello world! (plain text)";
     private String htmlBody = "<html><body><h1>Hello</h1>World</body></html>";
 
-    private void sendMultipartEmail() throws Exception {
+    private void sendMultipartEmail() {
         Mailbox.clearAll();
 
         // create an exchange with a normal body and attachment to be produced as email
@@ -87,9 +87,9 @@ public class MimeMultipartAlternativeWithContentTypeTest extends CamelTestSuppor
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://sachin@mymailserver.com?password=secret&initialDelay=100&delay=100&contentType=text/html; charset=UTF-8")
                         .to("mock:result");
             }
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
index a872025..ae48d2a 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
@@ -43,7 +43,7 @@ public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSup
     private String alternativeBody = "hello world! (plain text)";
     private String htmlBody = "<html><body><h1>Hello</h1>World<img src=\"cid:myCoolLogo.jpeg\"></body></html>";
 
-    private void sendMultipartEmail(boolean useInlineattachments) throws Exception {
+    private void sendMultipartEmail(boolean useInlineattachments) {
         Mailbox.clearAll();
 
         // create an exchange with a normal body and attachment to be produced as email
@@ -100,9 +100,9 @@ public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSup
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://ryan@mymailserver.com?password=secret&initialDelay=100&delay=100").to("mock:result");
             }
         };
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
index 152b5a6..ac39e31 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/RawMailMessageTest.java
@@ -157,9 +157,9 @@ public class RawMailMessageTest extends CamelTestSupport {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
-            public void configure() throws Exception {
+            public void configure() {
                 from("pop3://davsclaus@apache.org").to("mock:mail");
 
                 from("pop3://jonesRawPop3@localhost?password=secret&initialDelay=100&delay=100&delete=true&mapMailMessage=false")
diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
index 8d1b36d..df67df3 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/SearchTermBuilderTest.java
@@ -117,7 +117,7 @@ public class SearchTermBuilderTest {
     }
 
     @Test
-    public void testComparison() throws Exception {
+    public void testComparison() {
         assertEquals(1, Comparison.LE.asNum());
         assertEquals(2, Comparison.LT.asNum());
         assertEquals(3, Comparison.EQ.asNum());
diff --git a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
index ce9558e..aafe37d 100644
--- a/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
+++ b/components/camel-mail/src/test/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormatTest.java
@@ -513,7 +513,7 @@ public class MimeMultipartDataFormatTest extends CamelTestSupport {
         return att;
     }
 
-    private void addAttachment(DataSource ds, String attFileName, Map<String, String> headers) throws IOException {
+    private void addAttachment(DataSource ds, String attFileName, Map<String, String> headers) {
         DefaultAttachment attachment = new DefaultAttachment(ds);
         if (headers != null) {
             for (String headerName : headers.keySet()) {