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/04/08 14:16:07 UTC

[camel] 03/09: CAMEL-17763: cleanup unused exceptions in camel-csimple-joor

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 51a18c5a768e24e614dfe3f09d06208ef13dbe66
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Apr 8 15:04:30 2022 +0200

    CAMEL-17763: cleanup unused exceptions in camel-csimple-joor
---
 .../language/csimple/joor/CSimpleBeanTest.java     |   4 +-
 .../csimple/joor/CSimpleDecHeaderTest.java         |   4 +-
 .../csimple/joor/CSimpleIncHeaderTest.java         |   4 +-
 .../joor/CSimpleSetHeaderPredicateTest.java        |   4 +-
 .../camel/language/csimple/joor/CSimpleTest.java   |   4 +-
 .../csimple/joor/JoorCSimpleCompilerTest.java      |   4 +-
 .../csimple/joor/OriginalSimpleOperatorTest.java   |  90 +++----
 .../language/csimple/joor/OriginalSimpleTest.java  | 266 ++++++++++-----------
 8 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
index 30e2b665063..456dbbc6d8b 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleBeanTest.java
@@ -37,10 +37,10 @@ public class CSimpleBeanTest 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")
                         .transform().csimple("${bean:foo?method=doSomething}")
                         .to("mock:result");
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
index ce489772d59..f8e28d0f1e5 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleDecHeaderTest.java
@@ -36,10 +36,10 @@ public class CSimpleDecHeaderTest 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").setHeader("myCounter", csimple("${header.myCounter}--")).to("mock:result");
             }
         };
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
index 6e90421579d..f04904c39b5 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleIncHeaderTest.java
@@ -36,10 +36,10 @@ public class CSimpleIncHeaderTest 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").setHeader("myCounter", csimple("${header.myCounter}++")).to("mock:result");
             }
         };
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
index 165071fadd1..d01cb0a0d51 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
@@ -51,10 +51,10 @@ public class CSimpleSetHeaderPredicateTest 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").setHeader("bar").csimple("${header.foo} == 'Camel'", boolean.class).to("mock:result");
 
                 from("direct:other").setHeader("param1", constant("hello")).log("param1 = ${header.param1}").setHeader("param2")
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
index 2700874f300..fb2f23f37c1 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleTest.java
@@ -39,10 +39,10 @@ public class CSimpleTest 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")
                         .choice()
                         .when(csimple("${bodyAs(int)} > 10")).to("mock:high")
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java
index 19db7a924d0..66c04a29c81 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompilerTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 public class JoorCSimpleCompilerTest extends CamelTestSupport {
 
     @Test
-    public void testCompiler() throws Exception {
+    public void testCompiler() {
         JoorCSimpleCompiler compiler = new JoorCSimpleCompiler();
         compiler.start();
 
@@ -42,7 +42,7 @@ public class JoorCSimpleCompilerTest extends CamelTestSupport {
     }
 
     @Test
-    public void testCompilerPredicate() throws Exception {
+    public void testCompilerPredicate() {
         JoorCSimpleCompiler compiler = new JoorCSimpleCompiler();
         compiler.start();
 
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java
index dd3b62e55df..6264b5405b8 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleOperatorTest.java
@@ -31,13 +31,13 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     private MyFileNameGenerator generator = new MyFileNameGenerator();
 
     @Test
-    public void testValueWithSpace() throws Exception {
+    public void testValueWithSpace() {
         exchange.getIn().setBody("Hello Big World");
         assertPredicate("${in.body} == 'Hello Big World'", true);
     }
 
     @Test
-    public void testNullValue() throws Exception {
+    public void testNullValue() {
         exchange.getIn().setBody("Value");
         assertPredicate("${in.body} != null", true);
         assertPredicate("${body} == null", false);
@@ -48,7 +48,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEmptyValue() throws Exception {
+    public void testEmptyValue() {
         exchange.getIn().setBody("");
         assertPredicate("${in.body} == null", false);
         assertPredicate("${body} == null", false);
@@ -67,7 +67,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testAnd() throws Exception {
+    public void testAnd() {
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == 123", true);
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == 444", false);
         assertPredicate("${in.header.foo} == 'def' && ${in.header.bar} == 123", false);
@@ -78,14 +78,14 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testTwoAnd() throws Exception {
+    public void testTwoAnd() {
         exchange.getIn().setBody("Hello World");
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == 123 && ${body} == 'Hello World'", true);
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == 123 && ${body} == 'Bye World'", false);
     }
 
     @Test
-    public void testThreeAnd() throws Exception {
+    public void testThreeAnd() {
         exchange.getIn().setBody("Hello World");
         assertPredicate(
                 "${in.header.foo} == 'abc' && ${in.header.bar} == 123 && ${body} == 'Hello World' && ${in.header.xx} == null",
@@ -93,7 +93,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testTwoOr() throws Exception {
+    public void testTwoOr() {
         exchange.getIn().setBody("Hello World");
         assertPredicate("${in.header.foo} == 'abc' || ${in.header.bar} == 44 || ${body} == 'Bye World'", true);
         assertPredicate("${in.header.foo} == 'xxx' || ${in.header.bar} == 44 || ${body} == 'Bye World'", false);
@@ -102,7 +102,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testThreeOr() throws Exception {
+    public void testThreeOr() {
         exchange.getIn().setBody("Hello World");
         assertPredicate(
                 "${in.header.foo} == 'xxx' || ${in.header.bar} == 44 || ${body} == 'Bye Moon' || ${body} contains 'World'",
@@ -122,7 +122,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testAndWithQuotation() throws Exception {
+    public void testAndWithQuotation() {
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == '123'", true);
         assertPredicate("${in.header.foo} == 'abc' && ${in.header.bar} == '444'", false);
         assertPredicate("${in.header.foo} == 'def' && ${in.header.bar} == '123'", false);
@@ -133,7 +133,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOr() throws Exception {
+    public void testOr() {
         assertPredicate("${in.header.foo} == 'abc' || ${in.header.bar} == 123", true);
         assertPredicate("${in.header.foo} == 'abc' || ${in.header.bar} == 444", true);
         assertPredicate("${in.header.foo} == 'def' || ${in.header.bar} == 123", true);
@@ -146,7 +146,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOrWithQuotation() throws Exception {
+    public void testOrWithQuotation() {
         assertPredicate("${in.header.foo} == 'abc' || ${in.header.bar} == '123'", true);
         assertPredicate("${in.header.foo} == 'abc' || ${in.header.bar} == '444'", true);
         assertPredicate("${in.header.foo} == 'def' || ${in.header.bar} == '123'", true);
@@ -159,7 +159,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEqualOperator() throws Exception {
+    public void testEqualOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} == 'abc'", true);
         assertPredicate("${in.header.foo} == 'def'", false);
@@ -189,7 +189,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEqualIgnoreOperator() throws Exception {
+    public void testEqualIgnoreOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} =~ 'abc'", true);
         assertPredicate("${in.header.foo} =~ 'ABC'", true);
@@ -206,7 +206,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotEqualOperator() throws Exception {
+    public void testNotEqualOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} != 'abc'", false);
         assertPredicate("${in.header.foo} != 'def'", true);
@@ -221,7 +221,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotEqualIgnoreOperator() throws Exception {
+    public void testNotEqualIgnoreOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} !=~ 'abc'", false);
         assertPredicate("${in.header.foo} !=~ 'ABC'", false);
@@ -238,7 +238,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testFloatingNumber() throws Exception {
+    public void testFloatingNumber() {
         // set a String value
         exchange.getIn().setBody("0.02");
 
@@ -258,7 +258,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testGreaterThanOperator() throws Exception {
+    public void testGreaterThanOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} > 'aaa'", true);
         assertPredicate("${in.header.foo} > 'def'", false);
@@ -272,7 +272,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testGreaterThanStringToInt() throws Exception {
+    public void testGreaterThanStringToInt() {
         // set a String value
         exchange.getIn().setHeader("num", "70");
 
@@ -291,7 +291,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testLessThanStringToInt() throws Exception {
+    public void testLessThanStringToInt() {
         // set a String value
         exchange.getIn().setHeader("num", "70");
 
@@ -310,7 +310,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testGreaterThanOrEqualOperator() throws Exception {
+    public void testGreaterThanOrEqualOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} >= 'aaa'", true);
         assertPredicate("${in.header.foo} >= 'abc'", true);
@@ -325,7 +325,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testLessThanOperator() throws Exception {
+    public void testLessThanOperator() {
         // string to string comparison
         assertPredicate("${in.header.foo} < 'aaa'", false);
         assertPredicate("${in.header.foo} < 'def'", true);
@@ -339,7 +339,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testAgainstNegativeValue() throws Exception {
+    public void testAgainstNegativeValue() {
         assertPredicate("${in.header.bar} == 123", true);
         assertPredicate("${in.header.bar} == -123", false);
         assertPredicate("${in.header.bar} =~ 123", true);
@@ -385,7 +385,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testLessThanOrEqualOperator() throws Exception {
+    public void testLessThanOrEqualOperator() {
         context.getTypeConverterRegistry().getStatistics().setStatisticsEnabled(true);
         context.getTypeConverterRegistry().getStatistics().reset();
 
@@ -412,7 +412,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testTypeCoerceNoConversionNeeded() throws Exception {
+    public void testTypeCoerceNoConversionNeeded() {
         context.getTypeConverterRegistry().getStatistics().setStatisticsEnabled(true);
         context.getTypeConverterRegistry().getStatistics().reset();
 
@@ -459,26 +459,26 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIsNull() throws Exception {
+    public void testIsNull() {
         assertPredicate("${in.header.foo} == null", false);
         assertPredicate("${in.header.none} == null", true);
     }
 
     @Test
-    public void testIsNotNull() throws Exception {
+    public void testIsNotNull() {
         assertPredicate("${in.header.foo} != null", true);
         assertPredicate("${in.header.none} != null", false);
     }
 
     @Test
-    public void testRightOperatorIsSimpleLanguage() throws Exception {
+    public void testRightOperatorIsSimpleLanguage() {
         // operator on right side is also using ${ } placeholders
         assertPredicate("${in.header.foo} == ${in.header.foo}", true);
         assertPredicate("${in.header.foo} == ${in.header.bar}", false);
     }
 
     @Test
-    public void testRightOperatorIsBeanLanguage() throws Exception {
+    public void testRightOperatorIsBeanLanguage() {
         // operator on right side is also using ${ } placeholders
         assertPredicate("${in.header.foo} == ${bean:generator.generateFilename}", true);
 
@@ -487,7 +487,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testContains() throws Exception {
+    public void testContains() {
         assertPredicate("${in.header.foo} contains 'a'", true);
         assertPredicate("${in.header.foo} contains 'ab'", true);
         assertPredicate("${in.header.foo} contains 'abc'", true);
@@ -495,7 +495,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testContainsNumberInString() throws Exception {
+    public void testContainsNumberInString() {
         exchange.getMessage().setBody("The answer is 42 and is the answer to life the universe and everything");
         assertPredicate("${body} contains '42'", true);
         assertPredicate("${body} contains 42", true);
@@ -504,7 +504,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotContains() throws Exception {
+    public void testNotContains() {
         assertPredicate("${in.header.foo} not contains 'a'", false);
         assertPredicate("${in.header.foo} not contains 'ab'", false);
         assertPredicate("${in.header.foo} not contains 'abc'", false);
@@ -516,7 +516,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testContainsIgnoreCase() throws Exception {
+    public void testContainsIgnoreCase() {
         assertPredicate("${in.header.foo} ~~ 'A'", true);
         assertPredicate("${in.header.foo} ~~ 'Ab'", true);
         assertPredicate("${in.header.foo} ~~ 'Abc'", true);
@@ -524,7 +524,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotContainsIgnoreCase() throws Exception {
+    public void testNotContainsIgnoreCase() {
         assertPredicate("${in.header.foo} !~~ 'A'", false);
         assertPredicate("${in.header.foo} !~~ 'Ab'", false);
         assertPredicate("${in.header.foo} !~~ 'Abc'", false);
@@ -532,7 +532,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testRegex() throws Exception {
+    public void testRegex() {
         assertPredicate("${in.header.foo} regex '^a..$'", true);
         assertPredicate("${in.header.foo} regex '^ab.$'", true);
         assertPredicate("${in.header.foo} regex '^ab.$'", true);
@@ -543,7 +543,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotRegex() throws Exception {
+    public void testNotRegex() {
         assertPredicate("${in.header.foo} not regex '^a..$'", false);
         assertPredicate("${in.header.foo} not regex '^ab.$'", false);
         assertPredicate("${in.header.foo} not regex '^ab.$'", false);
@@ -554,7 +554,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIn() throws Exception {
+    public void testIn() {
         // string to string
         assertPredicate("${in.header.foo} in 'foo,abc,def'", true);
         assertPredicate("${in.header.foo} in ${bean:generator.generateFilename}", true);
@@ -568,7 +568,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotIn() throws Exception {
+    public void testNotIn() {
         // string to string
         assertPredicate("${in.header.foo} not in 'foo,abc,def'", false);
         assertPredicate("${in.header.foo} not in ${bean:generator.generateFilename}", false);
@@ -589,7 +589,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIs() throws Exception {
+    public void testIs() {
         assertPredicate("${in.header.foo} is 'java.lang.String'", true);
         assertPredicate("${in.header.foo} is 'java.lang.Integer'", false);
 
@@ -605,7 +605,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIsNot() throws Exception {
+    public void testIsNot() {
         assertPredicate("${in.header.foo} not is 'java.lang.String'", false);
         assertPredicate("${in.header.foo} not is 'java.lang.Integer'", true);
         assertPredicate("${in.header.foo} !is 'java.lang.String'", false);
@@ -631,7 +631,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testRange() throws Exception {
+    public void testRange() {
         assertPredicate("${in.header.bar} range '100..200'", true);
         assertPredicate("${in.header.bar} range '200..300'", false);
 
@@ -669,7 +669,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNotRange() throws Exception {
+    public void testNotRange() {
         assertPredicate("${in.header.bar} not range '100..200'", false);
         assertPredicate("${in.header.bar} not range '200..300'", true);
         assertPredicate("${in.header.bar} !range '100..200'", false);
@@ -727,7 +727,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testUnaryInc() throws Exception {
+    public void testUnaryInc() {
         assertExpression("${in.header.bar}++", 124);
         assertExpression("+++++++++++++", "+++++++++++++");
         assertExpression("Logging ++ start ++", "Logging ++ start ++");
@@ -741,7 +741,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testUnaryDec() throws Exception {
+    public void testUnaryDec() {
         assertExpression("${in.header.bar}--", 122);
         assertExpression("-------------", "-------------");
         assertExpression("Logging -- start --", "Logging -- start --");
@@ -755,7 +755,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testStartsWith() throws Exception {
+    public void testStartsWith() {
         exchange.getIn().setBody("Hello there");
         assertPredicate("${in.body} starts with 'Hello'", true);
         assertPredicate("${in.body} starts with 'H'", true);
@@ -772,7 +772,7 @@ public class OriginalSimpleOperatorTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEndsWith() throws Exception {
+    public void testEndsWith() {
         exchange.getIn().setBody("Hello there");
         assertPredicate("${in.body} ends with 'there'", true);
         assertPredicate("${in.body} ends with 're'", true);
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index 20e341af29a..501b370ef61 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -72,7 +72,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleExpressionOrPredicate() throws Exception {
+    public void testSimpleExpressionOrPredicate() {
         Predicate predicate = context.resolveLanguage("csimple").createPredicate("${header.bar} == 123");
         assertTrue(predicate.matches(exchange));
 
@@ -98,7 +98,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testResultType() throws Exception {
+    public void testResultType() {
         assertEquals(123, context.resolveLanguage("csimple").createExpression("${header.bar}").evaluate(exchange, int.class));
         assertEquals("123",
                 context.resolveLanguage("csimple").createExpression("${header.bar}").evaluate(exchange, String.class));
@@ -109,7 +109,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testRefExpression() throws Exception {
+    public void testRefExpression() {
         assertExpressionResultInstanceOf("${ref:myAnimal}", Animal.class);
 
         assertExpression("${ref:myAnimal}", "Donkey");
@@ -119,22 +119,22 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testConstantExpression() throws Exception {
+    public void testConstantExpression() {
         assertExpression("Hello World", "Hello World");
     }
 
     @Test
-    public void testNull() throws Exception {
+    public void testNull() {
         assertNull(context.resolveLanguage("csimple").createExpression("${null}").evaluate(exchange, Object.class));
     }
 
     @Test
-    public void testSimpleFileDir() throws Exception {
+    public void testSimpleFileDir() {
         assertExpression("file:mydir", "file:mydir");
     }
 
     @Test
-    public void testEmptyExpression() throws Exception {
+    public void testEmptyExpression() {
         assertExpression("", "");
         try {
             assertExpression(null, null);
@@ -154,7 +154,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testExchangeExpression() throws Exception {
+    public void testExchangeExpression() {
         Expression exp = context.resolveLanguage("csimple").createExpression("${exchange}");
         assertNotNull(exp);
         assertEquals(exchange, exp.evaluate(exchange, Object.class));
@@ -163,7 +163,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testExchangeOgnlExpression() throws Exception {
+    public void testExchangeOgnlExpression() {
         Expression exp = context.resolveLanguage("csimple").createExpression("${exchange.exchangeId}");
         assertNotNull(exp);
         assertEquals(exchange.getExchangeId(), exp.evaluate(exchange, Object.class));
@@ -173,7 +173,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyExpression() throws Exception {
+    public void testBodyExpression() {
         Expression exp = context.resolveLanguage("csimple").createExpression("${body}");
         assertNotNull(exp);
     }
@@ -192,13 +192,13 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyExpressionUsingAlternativeStartToken() throws Exception {
+    public void testBodyExpressionUsingAlternativeStartToken() {
         Expression exp = context.resolveLanguage("csimple").createExpression("$simple{body}");
         assertNotNull(exp);
     }
 
     @Test
-    public void testBodyExpressionNotStringType() throws Exception {
+    public void testBodyExpressionNotStringType() {
         exchange.getIn().setBody(123);
         Expression exp = context.resolveLanguage("csimple").createExpression("${body}");
         assertNotNull(exp);
@@ -208,7 +208,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyExpressionWithArray() throws Exception {
+    public void testBodyExpressionWithArray() {
         exchange.getIn().setBody(new MyClass());
         Expression exp = context.resolveLanguage("csimple").createExpression("${bodyAs(MyClass).myArray}");
         assertNotNull(exp);
@@ -217,7 +217,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleExpressions() throws Exception {
+    public void testSimpleExpressions() {
         assertExpression("${exchangeId}", exchange.getExchangeId());
         assertExpression("${id}", exchange.getIn().getMessageId());
         assertExpression("${body}", "<hello id='m123'>world!</hello>");
@@ -232,7 +232,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testTrimSimpleExpressions() throws Exception {
+    public void testTrimSimpleExpressions() {
         assertExpression(" \t${exchangeId}\n".trim(), exchange.getExchangeId());
         assertExpression("\n${id}\r".trim(), exchange.getIn().getMessageId());
         assertExpression("\t\r ${body}".trim(), "<hello id='m123'>world!</hello>");
@@ -240,40 +240,40 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleThreadName() throws Exception {
+    public void testSimpleThreadName() {
         String name = Thread.currentThread().getName();
         assertExpression("${threadName}", name);
         assertExpression("The name is ${threadName}", "The name is " + name);
     }
 
     @Test
-    public void testSimpleHostname() throws Exception {
+    public void testSimpleHostname() {
         String name = InetAddressUtil.getLocalHostNameSafe();
         assertExpression("${hostname}", name);
         assertExpression("The host is ${hostname}", "The host is " + name);
     }
 
     @Test
-    public void testSimpleStepId() throws Exception {
+    public void testSimpleStepId() {
         assertExpression("${stepId}", null);
         exchange.setProperty(Exchange.STEP_ID, "foo");
         assertExpression("${stepId}", "foo");
     }
 
     @Test
-    public void testSimpleExchangePropertyExpressions() throws Exception {
+    public void testSimpleExchangePropertyExpressions() {
         exchange.setProperty("medal", "gold");
         assertExpression("${exchangeProperty.medal}", "gold");
     }
 
     @Test
-    public void testSimpleSystemPropertyExpressions() throws Exception {
+    public void testSimpleSystemPropertyExpressions() {
         System.setProperty("who", "I was here");
         assertExpression("${sys.who}", "I was here");
     }
 
     @Test
-    public void testSimpleSystemEnvironmentExpressions() throws Exception {
+    public void testSimpleSystemEnvironmentExpressions() {
         String path = System.getenv("PATH");
         if (path != null) {
             assertExpression("${sysenv.PATH}", path);
@@ -284,7 +284,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleSystemEnvironmentExpressionsIfDash() throws Exception {
+    public void testSimpleSystemEnvironmentExpressionsIfDash() {
         String foo = System.getenv("FOO_SERVICE_HOST");
         if (foo != null) {
             assertExpression("${sysenv.FOO-SERVICE-HOST}", foo);
@@ -295,7 +295,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleSystemEnvironmentExpressionsIfLowercase() throws Exception {
+    public void testSimpleSystemEnvironmentExpressionsIfLowercase() {
         String path = System.getenv("PATH");
         if (path != null) {
             assertExpression("${sysenv.path}", path);
@@ -306,12 +306,12 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleCamelId() throws Exception {
+    public void testSimpleCamelId() {
         assertExpression("${camelId}", context.getName());
     }
 
     @Test
-    public void testOGNLBodyListAndMap() throws Exception {
+    public void testOGNLBodyListAndMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("cool", "Camel rocks");
         map.put("dude", "Hey dude");
@@ -331,7 +331,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLBodyEmptyList() throws Exception {
+    public void testOGNLBodyEmptyList() {
         Map<String, List<String>> map = new HashMap<>();
         map.put("list", new ArrayList<String>());
 
@@ -341,14 +341,14 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLBodyExpression() throws Exception {
+    public void testOGNLBodyExpression() {
         exchange.getIn().setBody("hello world");
         assertPredicate("${body} == \"hello world\"", true);
         assertPredicate("${bodyAs(String).toUpperCase()} == \"HELLO WORLD\"", true);
     }
 
     @Test
-    public void testOGNLBodyAsExpression() throws Exception {
+    public void testOGNLBodyAsExpression() {
         byte[] body = "hello world".getBytes();
         exchange.getIn().setBody(body);
 
@@ -369,7 +369,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLMandatoryBodyAsExpression() throws Exception {
+    public void testOGNLMandatoryBodyAsExpression() {
         byte[] body = "hello world".getBytes();
         exchange.getIn().setBody(body);
 
@@ -390,7 +390,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLCallReplace() throws Exception {
+    public void testOGNLCallReplace() {
         Map<String, Object> map = new HashMap<>();
         map.put("cool", "Camel rocks");
         map.put("dude", "Hey dude");
@@ -400,7 +400,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLBodyListAndMapAndMethod() throws Exception {
+    public void testOGNLBodyListAndMapAndMethod() {
         Map<String, OrderLine> map = new HashMap<>();
         map.put("camel", new OrderLine(123, "Camel in Action"));
         map.put("amq", new OrderLine(456, "ActiveMQ in Action"));
@@ -422,7 +422,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLMandatoryBodyListAndMapAndMethod() throws Exception {
+    public void testOGNLMandatoryBodyListAndMapAndMethod() {
         Map<String, OrderLine> map = new HashMap<>();
         map.put("camel", new OrderLine(123, "Camel in Action"));
         map.put("amq", new OrderLine(456, "ActiveMQ in Action"));
@@ -454,7 +454,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLPropertyList() throws Exception {
+    public void testOGNLPropertyList() {
         List<String> lines = new ArrayList<>();
         lines.add("Camel in Action");
         lines.add("ActiveMQ in Action");
@@ -478,7 +478,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLPropertyLinesList() throws Exception {
+    public void testOGNLPropertyLinesList() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -503,7 +503,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLPropertyMap() throws Exception {
+    public void testOGNLPropertyMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("cool", "Camel rocks");
         map.put("dude", "Hey dude");
@@ -520,7 +520,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLExchangePropertyMap() throws Exception {
+    public void testOGNLExchangePropertyMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("cool", "Camel rocks");
         map.put("dude", "Hey dude");
@@ -537,7 +537,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLPropertyMapWithDot() throws Exception {
+    public void testOGNLPropertyMapWithDot() {
         Map<String, Object> map = new HashMap<>();
         map.put("this.code", "This code");
         exchange.setProperty("wicket", map);
@@ -546,12 +546,12 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLPropertyMapNotMap() throws Exception {
+    public void testOGNLPropertyMapNotMap() {
         assertExpression("${exchangeProperty.foobar[bar]}", null);
     }
 
     @Test
-    public void testOGNLPropertyMapIllegalSyntax() throws Exception {
+    public void testOGNLPropertyMapIllegalSyntax() {
         try {
             assertExpression("${exchangeProperty.foobar[bar}", null);
             fail("Should have thrown an exception");
@@ -563,7 +563,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLExchangePropertyMapIllegalSyntax() throws Exception {
+    public void testOGNLExchangePropertyMapIllegalSyntax() {
         try {
             assertExpression("${exchangeProperty.foobar[bar}", null);
             fail("Should have thrown an exception");
@@ -575,7 +575,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderEmptyTest() throws Exception {
+    public void testOGNLHeaderEmptyTest() {
         exchange.getIn().setHeader("beer", "");
         assertPredicate("${header.beer} == \"\"", true);
         assertPredicate("${header.beer} == \"\"", true);
@@ -597,7 +597,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testDateExpressions() throws Exception {
+    public void testDateExpressions() {
         Calendar inHeaderCalendar = Calendar.getInstance();
         inHeaderCalendar.set(1974, Calendar.APRIL, 20);
         exchange.getIn().setHeader("birthday", inHeaderCalendar.getTime());
@@ -626,7 +626,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testDateAndTimeExpressions() throws Exception {
+    public void testDateAndTimeExpressions() {
         Calendar cal = Calendar.getInstance();
         cal.set(1974, Calendar.APRIL, 20, 8, 55, 47);
         cal.set(Calendar.MILLISECOND, 123);
@@ -637,7 +637,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testDateWithTimezone() throws Exception {
+    public void testDateWithTimezone() {
         Calendar cal = Calendar.getInstance();
         cal.setTimeZone(TimeZone.getTimeZone("GMT+8"));
         cal.set(1974, Calendar.APRIL, 20, 8, 55, 47);
@@ -649,25 +649,25 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testDateNow() throws Exception {
+    public void testDateNow() {
         Object out = evaluateExpression("${date:now:hh:mm:ss a}", null);
         assertNotNull(out);
     }
 
     @Test
-    public void testDateExchangeCreated() throws Exception {
+    public void testDateExchangeCreated() {
         Object out = evaluateExpression("${date:exchangeCreated:hh:mm:ss a}", "" + exchange.getCreated());
         assertNotNull(out);
     }
 
     @Test
-    public void testDatePredicates() throws Exception {
+    public void testDatePredicates() {
         assertPredicate("${date:now} < ${date:now+60s}");
         assertPredicate("${date:now-2s+2s} == ${date:now}");
     }
 
     @Test
-    public void testComplexExpressions() throws Exception {
+    public void testComplexExpressions() {
         assertExpression("hey ${in.header.foo}", "hey abc");
         assertExpression("hey ${in.header:foo}", "hey abc");
         assertExpression("hey ${in.header.foo}!", "hey abc!");
@@ -685,7 +685,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testComplexExpressionsUsingAlternativeStartToken() throws Exception {
+    public void testComplexExpressionsUsingAlternativeStartToken() {
         assertExpression("hey $simple{in.header.foo}", "hey abc");
         assertExpression("hey $simple{in.header:foo}", "hey abc");
         assertExpression("hey $simple{in.header.foo}!", "hey abc!");
@@ -703,7 +703,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testInvalidComplexExpression() throws Exception {
+    public void testInvalidComplexExpression() {
         try {
             assertExpression("hey ${foo", "bad expression!");
             fail("Should have thrown an exception!");
@@ -713,21 +713,21 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testPredicates() throws Exception {
+    public void testPredicates() {
         assertPredicate("${body}");
         assertPredicate("${header.foo}");
         assertPredicate("${header.madeUpHeader}", false);
     }
 
     @Test
-    public void testExceptionMessage() throws Exception {
+    public void testExceptionMessage() {
         exchange.setException(new IllegalArgumentException("Just testing"));
         assertExpression("${exception.message}", "Just testing");
         assertExpression("Hello ${exception.message} World", "Hello Just testing World");
     }
 
     @Test
-    public void testExceptionStacktrace() throws Exception {
+    public void testExceptionStacktrace() {
         exchange.setException(new IllegalArgumentException("Just testing"));
 
         String out = context.resolveLanguage("csimple").createExpression("${exception.stacktrace}").evaluate(exchange,
@@ -738,7 +738,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testException() throws Exception {
+    public void testException() {
         exchange.setException(new IllegalArgumentException("Just testing"));
 
         Exception out = context.resolveLanguage("csimple").createExpression("${exception}").evaluate(exchange, Exception.class);
@@ -748,7 +748,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyAs() throws Exception {
+    public void testBodyAs() {
         assertExpression("${bodyAs(String)}", "<hello id='m123'>world!</hello>");
         assertExpression("${bodyAs(\"String\")}", "<hello id='m123'>world!</hello>");
 
@@ -769,7 +769,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testMandatoryBodyAs() throws Exception {
+    public void testMandatoryBodyAs() {
         assertExpression("${mandatoryBodyAs(String)}", "<hello id='m123'>world!</hello>");
         assertExpression("${mandatoryBodyAs(\"String\")}", "<hello id='m123'>world!</hello>");
 
@@ -796,7 +796,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeaderEmptyBody() throws Exception {
+    public void testHeaderEmptyBody() {
         // set an empty body
         exchange.getIn().setBody(null);
 
@@ -811,13 +811,13 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeadersWithBracket() throws Exception {
+    public void testHeadersWithBracket() {
         assertExpression("${headers[foo]}", "abc");
         assertExpression("${in.headers[foo]}", "abc");
     }
 
     @Test
-    public void testOgnlOnHeadersWithBracket() throws Exception {
+    public void testOgnlOnHeadersWithBracket() {
         assertOgnlOnHeadersWithSquareBrackets("order");
         assertOgnlOnHeadersWithSquareBrackets("purchase.order");
         assertOgnlOnHeadersWithSquareBrackets("foo.bar.qux");
@@ -839,14 +839,14 @@ public class OriginalSimpleTest extends LanguageTestSupport {
         assertOgnlOnExchangePropertiesWithBracket("purchase order");
     }
 
-    public void assertOgnlOnExchangePropertiesWithBracket(String key) throws Exception {
+    public void assertOgnlOnExchangePropertiesWithBracket(String key) {
         exchange.setProperty(key, new OrderLine(123, "Camel in Action"));
         assertExpression("${exchangePropertyAs(" + key + ", OrderLine).name}", "Camel in Action");
         assertExpression("${exchangePropertyAs(\"" + key + "\", OrderLine).name}", "Camel in Action");
     }
 
     @Test
-    public void testIsInstanceOfEmptyBody() throws Exception {
+    public void testIsInstanceOfEmptyBody() {
         // set an empty body
         exchange.getIn().setBody(null);
 
@@ -859,7 +859,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeaders() throws Exception {
+    public void testHeaders() {
         Map<String, Object> headers = exchange.getIn().getHeaders();
         assertEquals(2, headers.size());
 
@@ -868,7 +868,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeaderKeyWithSpace() throws Exception {
+    public void testHeaderKeyWithSpace() {
         Map<String, Object> headers = exchange.getIn().getHeaders();
         headers.put("some key", "Some Value");
         assertEquals(3, headers.size());
@@ -887,7 +887,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeaderAs() throws Exception {
+    public void testHeaderAs() {
         assertExpression("${headerAs(foo,String)}", "abc");
 
         assertExpression("${headerAs(bar,int)}", 123);
@@ -923,7 +923,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIllegalSyntax() throws Exception {
+    public void testIllegalSyntax() {
         try {
             assertExpression("hey ${xxx} how are you?", "");
             fail("Should have thrown an exception");
@@ -947,7 +947,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderList() throws Exception {
+    public void testOGNLHeaderList() {
         List<String> lines = new ArrayList<>();
         lines.add("Camel in Action");
         lines.add("ActiveMQ in Action");
@@ -970,7 +970,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderLinesList() throws Exception {
+    public void testOGNLHeaderLinesList() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -993,7 +993,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderMap() throws Exception {
+    public void testOGNLHeaderMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("cool", "Camel rocks");
         map.put("dude", "Hey dude");
@@ -1010,7 +1010,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderMapWithDot() throws Exception {
+    public void testOGNLHeaderMapWithDot() {
         Map<String, Object> map = new HashMap<>();
         map.put("this.code", "This code");
         exchange.getIn().setHeader("wicket", map);
@@ -1019,12 +1019,12 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testOGNLHeaderMapNotMap() throws Exception {
+    public void testOGNLHeaderMapNotMap() {
         assertExpression("${header.foo[bar]}", null);
     }
 
     @Test
-    public void testOGNLHeaderMapIllegalSyntax() throws Exception {
+    public void testOGNLHeaderMapIllegalSyntax() {
         try {
             assertExpression("${header.foo[bar}", null);
             fail("Should have thrown an exception");
@@ -1034,7 +1034,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLAsMap() throws Exception {
+    public void testBodyOGNLAsMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("foo", "Camel");
         map.put("bar", 6);
@@ -1045,7 +1045,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLAsMapWithDot() throws Exception {
+    public void testBodyOGNLAsMapWithDot() {
         Map<String, Object> map = new HashMap<>();
         map.put("foo.bar", "Camel");
         exchange.getIn().setBody(map);
@@ -1054,7 +1054,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLAsMapShorthand() throws Exception {
+    public void testBodyOGNLAsMapShorthand() {
         Map<String, Object> map = new HashMap<>();
         map.put("foo", "Camel");
         map.put("bar", 6);
@@ -1065,7 +1065,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLSimple() throws Exception {
+    public void testBodyOGNLSimple() {
         Animal camel = new Animal("Camel", 6);
         exchange.getIn().setBody(camel);
 
@@ -1074,7 +1074,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testExceptionOGNLSimple() throws Exception {
+    public void testExceptionOGNLSimple() {
         exchange.getIn().setHeader(Exchange.AUTHENTICATION_FAILURE_POLICY_ID, "myPolicy");
         exchange.setProperty(Exchange.EXCEPTION_CAUGHT,
                 new CamelAuthorizationException("The camel authorization exception", exchange));
@@ -1083,7 +1083,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLSimpleShorthand() throws Exception {
+    public void testBodyOGNLSimpleShorthand() {
         Animal camel = new Animal("Camel", 6);
         exchange.getIn().setBody(camel);
 
@@ -1092,7 +1092,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLSimpleOperator() throws Exception {
+    public void testBodyOGNLSimpleOperator() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1111,7 +1111,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLSimpleOperatorShorthand() throws Exception {
+    public void testBodyOGNLSimpleOperatorShorthand() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1130,7 +1130,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLNested() throws Exception {
+    public void testBodyOGNLNested() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1145,7 +1145,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLNestedShorthand() throws Exception {
+    public void testBodyOGNLNestedShorthand() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1160,7 +1160,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderList() throws Exception {
+    public void testBodyOGNLOrderList() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1176,7 +1176,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListShorthand() throws Exception {
+    public void testBodyOGNLOrderListShorthand() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1194,7 +1194,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLListMap() throws Exception {
+    public void testBodyOGNLListMap() {
         List<Map<String, String>> grid = new ArrayList<>();
         Map<String, String> cells = new LinkedHashMap<>();
         cells.put("ABC", "123");
@@ -1216,7 +1216,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLList() throws Exception {
+    public void testBodyOGNLList() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1231,7 +1231,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLListShorthand() throws Exception {
+    public void testBodyOGNLListShorthand() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1247,7 +1247,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
 
     @Test
 
-    public void testBodyAsIndexOGNL() throws Exception {
+    public void testBodyAsIndexOGNL() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1261,7 +1261,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLArray() throws Exception {
+    public void testBodyOGNLArray() {
         OrderLine[] lines = new OrderLine[2];
         lines[0] = new OrderLine(123, "Camel in Action");
         lines[1] = new OrderLine(456, "ActiveMQ in Action");
@@ -1276,7 +1276,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLArrayShorthand() throws Exception {
+    public void testBodyOGNLArrayShorthand() {
         OrderLine[] lines = new OrderLine[2];
         lines[0] = new OrderLine(123, "Camel in Action");
         lines[1] = new OrderLine(456, "ActiveMQ in Action");
@@ -1291,7 +1291,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListOutOfBounds() throws Exception {
+    public void testBodyOGNLOrderListOutOfBounds() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1309,7 +1309,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListOutOfBoundsShorthand() throws Exception {
+    public void testBodyOGNLOrderListOutOfBoundsShorthand() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1327,7 +1327,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListOutOfBoundsWithNullSafe() throws Exception {
+    public void testBodyOGNLOrderListOutOfBoundsWithNullSafe() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1339,7 +1339,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListOutOfBoundsWithNullSafeShorthand() throws Exception {
+    public void testBodyOGNLOrderListOutOfBoundsWithNullSafeShorthand() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1351,7 +1351,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListNoMethodNameWithNullSafe() throws Exception {
+    public void testBodyOGNLOrderListNoMethodNameWithNullSafe() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1369,7 +1369,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLOrderListNoMethodNameWithNullSafeShorthand() throws Exception {
+    public void testBodyOGNLOrderListNoMethodNameWithNullSafeShorthand() {
         List<OrderLine> lines = new ArrayList<>();
         lines.add(new OrderLine(123, "Camel in Action"));
         lines.add(new OrderLine(456, "ActiveMQ in Action"));
@@ -1387,7 +1387,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLNullSafeToAvoidNPE() throws Exception {
+    public void testBodyOGNLNullSafeToAvoidNPE() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1415,7 +1415,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLNullSafeToAvoidNPEShorthand() throws Exception {
+    public void testBodyOGNLNullSafeToAvoidNPEShorthand() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal camel = new Animal("Camel", 6);
         camel.setFriend(tiger);
@@ -1443,7 +1443,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLReentrant() throws Exception {
+    public void testBodyOGNLReentrant() {
         Animal camel = new Animal("Camel", 6);
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal elephant = new Animal("Big Ella", 48);
@@ -1460,7 +1460,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLReentrantShorthand() throws Exception {
+    public void testBodyOGNLReentrantShorthand() {
         Animal camel = new Animal("Camel", 6);
         Animal tiger = new Animal("Tony the Tiger", 13);
         Animal elephant = new Animal("Big Ella", 48);
@@ -1477,7 +1477,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOGNLBoolean() throws Exception {
+    public void testBodyOGNLBoolean() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         exchange.getIn().setBody(tiger);
 
@@ -1490,7 +1490,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOgnlOnString() throws Exception {
+    public void testBodyOgnlOnString() {
         exchange.getIn().setBody("Camel");
 
         assertExpression("${bodyAs(String).substring(2)}", "mel");
@@ -1503,7 +1503,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOgnlOnStringWithOgnlParams() throws Exception {
+    public void testBodyOgnlOnStringWithOgnlParams() {
         exchange.getIn().setBody("Camel");
         exchange.getIn().setHeader("max", 4);
         exchange.getIn().setHeader("min", 2);
@@ -1512,7 +1512,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testHeaderOgnlOnStringWithOgnlParams() throws Exception {
+    public void testHeaderOgnlOnStringWithOgnlParams() {
         exchange.getIn().setBody(null);
         exchange.getIn().setHeader("name", "Camel");
         exchange.getIn().setHeader("max", 4);
@@ -1522,28 +1522,28 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOgnlReplace() throws Exception {
+    public void testBodyOgnlReplace() {
         exchange.getIn().setBody("Kamel is a cool Kamel");
 
         assertExpression("${bodyAs(String).replace(\"Kamel\", \"Camel\")}", "Camel is a cool Camel");
     }
 
     @Test
-    public void testBodyOgnlReplaceEscapedChar() throws Exception {
+    public void testBodyOgnlReplaceEscapedChar() {
         exchange.getIn().setBody("foo$bar$baz");
 
         assertExpression("${bodyAs(String).replace(\"$\", \"-\")}", "foo-bar-baz");
     }
 
     @Test
-    public void testBodyOgnlReplaceEscapedBackslashChar() throws Exception {
+    public void testBodyOgnlReplaceEscapedBackslashChar() {
         exchange.getIn().setBody("foo\\bar\\baz");
 
         assertExpression("${bodyAs(String).replace(\"\\\", \"\\\\\")}", "foo\\\\bar\\\\baz");
     }
 
     @Test
-    public void testBodyOgnlReplaceFirst() throws Exception {
+    public void testBodyOgnlReplaceFirst() {
         exchange.getIn().setBody("http:camel.apache.org");
 
         assertExpression("${bodyAs(String).replaceFirst(\"http:\", \"https:\")}", "https:camel.apache.org");
@@ -1554,7 +1554,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOgnlReplaceSingleQuoteInDouble() throws Exception {
+    public void testBodyOgnlReplaceSingleQuoteInDouble() {
         exchange.getIn().setBody("Hello O\"Conner");
 
         assertExpression("${bodyAs(String).replace(\"O\"C\", \"OC\")}", "Hello OConner");
@@ -1565,7 +1565,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyOgnlSpaces() throws Exception {
+    public void testBodyOgnlSpaces() {
         exchange.getIn().setBody("Hello World");
 
         assertExpression("${bodyAs(String).compareTo('Hello World')}", 0);
@@ -1581,7 +1581,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodySingleQuote() throws Exception {
+    public void testBodySingleQuote() {
         exchange.getIn().setBody("It's a great World");
 
         assertExpression("${bodyAs(String).compareTo(\"It's a great World\")}", 0);
@@ -1589,7 +1589,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testClassSimpleName() throws Exception {
+    public void testClassSimpleName() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         exchange.getIn().setBody(tiger);
 
@@ -1599,7 +1599,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testExceptionClassSimpleName() throws Exception {
+    public void testExceptionClassSimpleName() {
         Animal tiger = new Animal("Tony the Tiger", 13);
         exchange.getIn().setBody(tiger);
 
@@ -1612,13 +1612,13 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSlashBeforeHeader() throws Exception {
+    public void testSlashBeforeHeader() {
         assertExpression("foo/${header.foo}", "foo/abc");
         assertExpression("foo\\${header.foo}", "foo\\abc");
     }
 
     @Test
-    public void testJSonLike() throws Exception {
+    public void testJSonLike() {
         exchange.getIn().setBody("Something");
 
         assertExpression("{\"oneline\": \"${body}\"}", "{\"oneline\": \"Something\"}");
@@ -1626,7 +1626,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testFunctionEnds() throws Exception {
+    public void testFunctionEnds() {
         exchange.getIn().setBody("Something");
 
         assertExpression("{{", "{{");
@@ -1638,7 +1638,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEscape() throws Exception {
+    public void testEscape() {
         exchange.getIn().setBody("Something");
 
         assertExpression("\\n${body}", "\nSomething");
@@ -1654,7 +1654,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testEscapeEndFunction() throws Exception {
+    public void testEscapeEndFunction() {
         exchange.getIn().setBody("Something");
 
         assertExpression("{hello\\}", "{hello}");
@@ -1662,13 +1662,13 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testCamelContextOGNL() throws Exception {
+    public void testCamelContextOGNL() {
         assertExpression("${camelContext.getName()}", context.getName());
         assertExpression("${camelContext.version}", context.getVersion());
     }
 
     @Test
-    public void testTypeConstant() throws Exception {
+    public void testTypeConstant() {
         assertExpression("${type:org.apache.camel.Exchange.FILE_NAME}", Exchange.FILE_NAME);
         assertExpression("${type:org.apache.camel.ExchangePattern.InOut}", ExchangePattern.InOut);
 
@@ -1678,14 +1678,14 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testTypeConstantInnerClass() throws Exception {
+    public void testTypeConstantInnerClass() {
         assertExpression("${type:org.apache.camel.language.csimple.joor.Constants$MyInnerStuff.FOO}", 123);
         assertExpression("${type:org.apache.camel.language.csimple.joor.Constants.MyInnerStuff.FOO}", 123);
         assertExpression("${type:org.apache.camel.language.csimple.joor.Constants.BAR}", 456);
     }
 
     @Test
-    public void testStringArrayLength() throws Exception {
+    public void testStringArrayLength() {
         exchange.getIn().setBody(new String[] { "foo", "bar" });
         assertExpression("${body[0]}", "foo");
         assertExpression("${body[1]}", "bar");
@@ -1696,7 +1696,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testByteArrayLength() throws Exception {
+    public void testByteArrayLength() {
         exchange.getIn().setBody(new byte[] { 65, 66, 67 });
         assertExpression("${body[0]}", 65);
         assertExpression("${body[1]}", 66);
@@ -1705,7 +1705,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testIntArrayLength() throws Exception {
+    public void testIntArrayLength() {
         exchange.getIn().setBody(new int[] { 1, 20, 300 });
         assertExpression("${body[0]}", 1);
         assertExpression("${body[1]}", 20);
@@ -1714,7 +1714,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleMapBoolean() throws Exception {
+    public void testSimpleMapBoolean() {
         Map<String, Object> map = new HashMap<>();
         exchange.getIn().setBody(map);
 
@@ -1735,7 +1735,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testSimpleRegexp() throws Exception {
+    public void testSimpleRegexp() {
         exchange.getIn().setBody("12345678");
         assertPredicate("${body} regex '\\d+'", true);
         assertPredicate("${body} regex '\\w{1,4}'", false);
@@ -1754,7 +1754,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testCollateEven() throws Exception {
+    public void testCollateEven() {
         List<Object> data = new ArrayList<>();
         data.add("A");
         data.add("B");
@@ -1781,7 +1781,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testCollateOdd() throws Exception {
+    public void testCollateOdd() {
         List<Object> data = new ArrayList<>();
         data.add("A");
         data.add("B");
@@ -1812,7 +1812,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testRandomExpression() throws Exception {
+    public void testRandomExpression() {
         int min = 1;
         int max = 10;
         int iterations = 30;
@@ -1852,7 +1852,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testListRemoveByInstance() throws Exception {
+    public void testListRemoveByInstance() {
         List<Object> data = new ArrayList<>();
         data.add("A");
         data.add("B");
@@ -1868,7 +1868,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testListRemoveIndex() throws Exception {
+    public void testListRemoveIndex() {
         List<Object> data = new ArrayList<>();
         data.add("A");
         data.add("B");
@@ -1884,7 +1884,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testBodyAsOneLine() throws Exception {
+    public void testBodyAsOneLine() {
         exchange.getIn().setBody("Hello" + System.lineSeparator() + "Great" + System.lineSeparator() + "World");
         assertExpression("${bodyOneLine}", "HelloGreatWorld");
         assertExpression("Hi ${bodyOneLine}", "Hi HelloGreatWorld");
@@ -1892,7 +1892,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testListIndexByNestedFunction() throws Exception {
+    public void testListIndexByNestedFunction() {
         List<String> alist = new ArrayList<>();
         alist.add("1");
         alist.add("99");
@@ -1908,7 +1908,7 @@ public class OriginalSimpleTest extends LanguageTestSupport {
     }
 
     @Test
-    public void testNestedFunction() throws Exception {
+    public void testNestedFunction() {
         exchange.getMessage().setBody("Tony");
         exchange.getMessage().setHeader("counter", 3);