This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 31a143a Enhance some code lines (#5209)
31a143a is described below
commit 31a143ab63dcfbb530beaa459fe3c246d25e8dd8
Author: Boualem DJELAILI <[email protected]>
AuthorDate: Mon Mar 15 18:13:01 2021 +0100
Enhance some code lines (#5209)
enhance some code lines
---
.../catalog/lucene/CamelCatalogLuceneTest.java | 2 +-
.../maven/DefaultMavenArtifactProvider.java | 30 ++++----
.../camel/catalog/maven/MavenVersionManager.java | 2 +-
.../catalog/maven/MavenVersionManagerTest.java | 10 +--
.../org/apache/camel/catalog/CamelCatalogTest.java | 86 +++++++++++-----------
.../java/org/apache/camel/maven/GenerateMojo.java | 2 +-
.../org/apache/camel/maven/RouteCoverageMojo.java | 5 +-
.../java/org/apache/camel/maven/ValidateMojo.java | 2 +-
.../org/apache/camel/parser/XmlRouteParser.java | 20 ++---
.../camel/parser/helper/CamelJavaParserHelper.java | 15 ++--
.../helper/CamelJavaRestDslParserHelper.java | 10 ++-
.../parser/helper/CamelJavaTreeParserHelper.java | 10 ++-
.../apache/camel/parser/helper/CamelXmlHelper.java | 7 +-
.../parser/helper/CamelXmlTreeParserHelper.java | 3 +-
.../camel/parser/helper/XmlLineNumberParser.java | 9 +--
.../camel/parser/model/CamelRouteDetails.java | 12 +--
.../camel/parser/java/MyRouteDuplicateIdTest.java | 2 +-
...oasterConcatFieldRouteBuilderConfigureTest.java | 2 +-
.../parser/java/RoasterEndpointInjectTest.java | 2 +-
.../RoasterFieldRouteBuilderConfigureTest.java | 2 +-
.../camel/parser/java/RoasterJavaDslTest.java | 2 +-
.../parser/java/RoasterJavaDslTwoRoutesTest.java | 2 +-
.../java/RoasterJavaPartialRouteDslTest.java | 2 +-
.../camel/parser/java/RoasterJavaRestDslTest.java | 4 +-
...RoasterMethodCallRouteBuilderConfigureTest.java | 2 +-
...MyFieldMethodCallRouteBuilderConfigureTest.java | 2 +-
.../java/RoasterMyLocalAddRouteBuilderTest.java | 2 +-
.../camel/parser/java/RoasterMyNettyTest.java | 2 +-
.../parser/java/RoasterMySedaRouteBuilderTest.java | 2 +-
...asterNewLineConstRouteBuilderConfigureTest.java | 2 +-
.../RoasterNewLineRouteBuilderConfigureTest.java | 2 +-
.../RoasterRouteBuilderCamelTestSupportTest.java | 2 +-
.../java/RoasterRouteBuilderConfigureTest.java | 2 +-
.../java/RoasterRouteBuilderEmptyUriTest.java | 2 +-
...uteDuplicateIdBuilderDCamelTestSupportTest.java | 2 +-
.../parser/java/RoasterSimpleProcessorTest.java | 2 +-
.../camel/parser/java/RoasterSimpleToDTest.java | 2 +-
.../camel/parser/java/RoasterSimpleToFTest.java | 2 +-
.../parser/java/RoasterSplitTokenizeTest.java | 2 +-
.../camel/parser/java/SimpleProcessorTest.java | 6 +-
.../apache/camel/parser/xml/XmlParseTreeTest.java | 5 +-
.../parser/xml/XmlWithPrefixParseTreeTest.java | 5 +-
.../camel/component/dummy/DummyEndpoint.java | 4 +-
.../camel/component/dummy/DummyProducer.java | 2 +-
44 files changed, 145 insertions(+), 150 deletions(-)
diff --git
a/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
b/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
index bd1295f..acfa6c3 100644
---
a/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
+++
b/catalog/camel-catalog-lucene/src/test/java/org/apache/camel/catalog/lucene/CamelCatalogLuceneTest.java
@@ -39,7 +39,7 @@ public class CamelCatalogLuceneTest {
}
@Test
- public void validateProperties() throws Exception {
+ public void validateProperties() {
// spell typo error
EndpointValidationResult result =
catalog.validateEndpointProperties("log:mylog?levl=WARN");
assertFalse(result.isSuccess());
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index 1d912d0..273938c 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -112,23 +112,21 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
protected void scanCamelComponents(CamelCatalog camelCatalog, ClassLoader
classLoader, Set<String> names) {
// is there any custom Camel components in this library?
Properties properties = loadComponentProperties(log, classLoader);
- if (properties != null) {
- String components = (String) properties.get("components");
- if (components != null) {
- String[] part = components.split("\\s");
- for (String scheme : part) {
- if (!camelCatalog.findComponentNames().contains(scheme)) {
- // find the class name
- String javaType = extractComponentJavaType(log,
classLoader, scheme);
- if (javaType != null) {
- String json = loadComponentJSonSchema(log,
classLoader, scheme);
- if (json != null) {
- if (log) {
- LOG.info("Adding component: {}", scheme);
- }
- camelCatalog.addComponent(scheme, javaType,
json);
- names.add(scheme);
+ String components = (String) properties.get("components");
+ if (components != null) {
+ String[] part = components.split("\\s");
+ for (String scheme : part) {
+ if (!camelCatalog.findComponentNames().contains(scheme)) {
+ // find the class name
+ String javaType = extractComponentJavaType(log,
classLoader, scheme);
+ if (javaType != null) {
+ String json = loadComponentJSonSchema(log,
classLoader, scheme);
+ if (json != null) {
+ if (log) {
+ LOG.info("Adding component: {}", scheme);
}
+ camelCatalog.addComponent(scheme, javaType, json);
+ names.add(scheme);
}
}
}
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index f403e7e..108bdbc 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -200,6 +200,6 @@ public class MavenVersionManager implements VersionManager,
Closeable {
}
@Override
- public void close() throws IOException {
+ public void close() {
}
}
diff --git
a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index e229584..29d07d4 100644
---
a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++
b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -59,7 +59,7 @@ public class MavenVersionManagerTest {
}
@Test
- public void testEndpointOptions217() throws Exception {
+ public void testEndpointOptions217() {
CamelCatalog catalog = new DefaultCamelCatalog(false);
catalog.setVersionManager(new MavenVersionManager());
catalog.loadVersion("2.17.1");
@@ -77,7 +77,7 @@ public class MavenVersionManagerTest {
}
@Test
- public void testEndpointOptions218OrNewer() throws Exception {
+ public void testEndpointOptions218OrNewer() {
CamelCatalog catalog = new DefaultCamelCatalog(false);
String json = catalog.componentJSonSchema("ahc");
@@ -88,7 +88,7 @@ public class MavenVersionManagerTest {
}
@Test
- public void testRuntimeProviderLoadVersion() throws Exception {
+ public void testRuntimeProviderLoadVersion() {
CamelCatalog catalog = new DefaultCamelCatalog(false);
catalog.setVersionManager(new MavenVersionManager());
catalog.setRuntimeProvider(new DefaultRuntimeProvider());
@@ -113,7 +113,7 @@ public class MavenVersionManagerTest {
}
@Test
- public void testRuntimeProviderLoadVersionWithCaching() throws Exception {
+ public void testRuntimeProviderLoadVersionWithCaching() {
CamelCatalog catalog = new DefaultCamelCatalog(true);
catalog.setVersionManager(new MavenVersionManager());
catalog.setRuntimeProvider(new DefaultRuntimeProvider());
@@ -138,7 +138,7 @@ public class MavenVersionManagerTest {
}
@Test
- public void testLoadUnknownVersion() throws Exception {
+ public void testLoadUnknownVersion() {
MavenVersionManager manager = new MavenVersionManager();
String current = manager.getLoadedVersion();
assertNull(current);
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index f4811de..cbc61e8 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -48,7 +48,7 @@ public class CamelCatalogTest {
}
@Test
- public void testGetVersion() throws Exception {
+ public void testGetVersion() {
String version = catalog.getCatalogVersion();
assertNotNull(version);
@@ -58,7 +58,7 @@ public class CamelCatalogTest {
}
@Test
- public void testLoadVersion() throws Exception {
+ public void testLoadVersion() {
boolean result = catalog.loadVersion("1.0");
assertFalse(result);
@@ -68,7 +68,7 @@ public class CamelCatalogTest {
}
@Test
- public void testFindComponentNames() throws Exception {
+ public void testFindComponentNames() {
List<String> names = catalog.findComponentNames();
assertNotNull(names);
assertTrue(names.contains("file"));
@@ -80,7 +80,7 @@ public class CamelCatalogTest {
}
@Test
- public void testFindOtherNames() throws Exception {
+ public void testFindOtherNames() {
List<String> names = catalog.findOtherNames();
assertTrue(names.contains("hystrix"));
@@ -97,7 +97,7 @@ public class CamelCatalogTest {
}
@Test
- public void testFindDataFormatNames() throws Exception {
+ public void testFindDataFormatNames() {
List<String> names = catalog.findDataFormatNames();
assertNotNull(names);
assertTrue(names.contains("bindy-csv"));
@@ -109,7 +109,7 @@ public class CamelCatalogTest {
}
@Test
- public void testFindLanguageNames() throws Exception {
+ public void testFindLanguageNames() {
List<String> names = catalog.findLanguageNames();
assertTrue(names.contains("simple"));
@@ -122,7 +122,7 @@ public class CamelCatalogTest {
}
@Test
- public void testFindModelNames() throws Exception {
+ public void testFindModelNames() {
List<String> names = catalog.findModelNames();
assertNotNull(names);
assertTrue(names.contains("from"));
@@ -136,7 +136,7 @@ public class CamelCatalogTest {
}
@Test
- public void testJsonSchema() throws Exception {
+ public void testJsonSchema() {
String schema = catalog.componentJSonSchema("docker");
assertNotNull(schema);
@@ -160,19 +160,19 @@ public class CamelCatalogTest {
}
@Test
- public void testXmlSchema() throws Exception {
+ public void testXmlSchema() {
String schema = catalog.springSchemaAsXml();
assertNotNull(schema);
}
@Test
- public void testArchetypeCatalog() throws Exception {
+ public void testArchetypeCatalog() {
String schema = catalog.archetypeCatalogAsXml();
assertNotNull(schema);
}
@Test
- public void testMain() throws Exception {
+ public void testMain() {
String schema = catalog.mainJsonSchema();
assertNotNull(schema);
}
@@ -607,7 +607,7 @@ public class CamelCatalogTest {
}
@Test
- public void validateActiveMQProperties() throws Exception {
+ public void validateActiveMQProperties() {
// add activemq as known component
catalog.addComponent("activemq",
"org.apache.camel.component.activemq.ActiveMQComponent");
@@ -628,7 +628,7 @@ public class CamelCatalogTest {
}
@Test
- public void validateJmsProperties() throws Exception {
+ public void validateJmsProperties() {
// jms
EndpointValidationResult result =
catalog.validateEndpointProperties("jms:temp-queue:cheese?jmsMessageType=Bytes");
assertTrue(result.isSuccess());
@@ -641,7 +641,7 @@ public class CamelCatalogTest {
}
@Test
- public void validateProperties() throws Exception {
+ public void validateProperties() {
// valid
EndpointValidationResult result =
catalog.validateEndpointProperties("log:mylog");
assertTrue(result.isSuccess());
@@ -808,7 +808,7 @@ public class CamelCatalogTest {
}
@Test
- public void validatePropertiesSummary() throws Exception {
+ public void validatePropertiesSummary() {
EndpointValidationResult result = catalog.validateEndpointProperties(
"yammer:MESSAGES?blah=yada&accessToken=aaa&consumerKey=&useJson=no&initialDelay=five&pollStrategy=myStrategy");
assertFalse(result.isSuccess());
@@ -822,7 +822,7 @@ public class CamelCatalogTest {
}
@Test
- public void validateTimePattern() throws Exception {
+ public void validateTimePattern() {
assertTrue(catalog.validateTimePattern("0"));
assertTrue(catalog.validateTimePattern("500"));
assertTrue(catalog.validateTimePattern("10000"));
@@ -843,7 +843,7 @@ public class CamelCatalogTest {
}
@Test
- public void testEndpointComponentName() throws Exception {
+ public void testEndpointComponentName() {
String name = catalog.endpointComponentName("jms:queue:foo");
assertEquals("jms", name);
}
@@ -1013,7 +1013,7 @@ public class CamelCatalogTest {
}
@Test
- public void testSimpleExpression() throws Exception {
+ public void testSimpleExpression() {
LanguageValidationResult result =
catalog.validateLanguageExpression(null, "simple", "${body}");
assertTrue(result.isSuccess());
assertEquals("${body}", result.getText());
@@ -1035,7 +1035,7 @@ public class CamelCatalogTest {
}
@Test
- public void testSimplePredicate() throws Exception {
+ public void testSimplePredicate() {
LanguageValidationResult result =
catalog.validateLanguagePredicate(null, "simple", "${body} == 'abc'");
assertTrue(result.isSuccess());
assertEquals("${body} == 'abc'", result.getText());
@@ -1050,7 +1050,7 @@ public class CamelCatalogTest {
}
@Test
- public void testPredicatePlaceholder() throws Exception {
+ public void testPredicatePlaceholder() {
LanguageValidationResult result =
catalog.validateLanguagePredicate(null, "simple", "${body} contains
'{{danger}}'");
assertTrue(result.isSuccess());
assertEquals("${body} contains '{{danger}}'", result.getText());
@@ -1066,7 +1066,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateLanguage() throws Exception {
+ public void testValidateLanguage() {
LanguageValidationResult result =
catalog.validateLanguageExpression(null, "simple", "${body}");
assertTrue(result.isSuccess());
assertEquals("${body}", result.getText());
@@ -1093,7 +1093,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateJSonPathLanguage() throws Exception {
+ public void testValidateJSonPathLanguage() {
LanguageValidationResult result =
catalog.validateLanguageExpression(null, "jsonpath", "$.store.book[?(@.price <
10)]");
assertTrue(result.isSuccess());
assertEquals("$.store.book[?(@.price < 10)]", result.getText());
@@ -1105,7 +1105,7 @@ public class CamelCatalogTest {
}
@Test
- public void testSpringCamelContext() throws Exception {
+ public void testSpringCamelContext() {
String xml = catalog.springSchemaAsXml();
assertNotNull(xml);
@@ -1113,7 +1113,7 @@ public class CamelCatalogTest {
}
@Test
- public void testComponentAsciiDoc() throws Exception {
+ public void testComponentAsciiDoc() {
String doc = catalog.componentAsciiDoc("mock");
assertNotNull(doc);
assertTrue(doc.contains("mock:someName"));
@@ -1131,7 +1131,7 @@ public class CamelCatalogTest {
}
@Test
- public void testTransactedAndPolicyNoOutputs() throws Exception {
+ public void testTransactedAndPolicyNoOutputs() {
String json = catalog.modelJSonSchema("transacted");
assertNotNull(json);
assertTrue(json.contains("\"output\": false"));
@@ -1144,7 +1144,7 @@ public class CamelCatalogTest {
}
@Test
- public void testDataFormatAsciiDoc() throws Exception {
+ public void testDataFormatAsciiDoc() {
String doc = catalog.dataFormatAsciiDoc("json-jackson");
assertNotNull(doc);
assertTrue(doc.contains("Jackson dataformat"));
@@ -1155,21 +1155,21 @@ public class CamelCatalogTest {
}
@Test
- public void testLanguageAsciiDoc() throws Exception {
+ public void testLanguageAsciiDoc() {
String doc = catalog.languageAsciiDoc("jsonpath");
assertNotNull(doc);
assertTrue(doc.contains("JSonPath language"));
}
@Test
- public void testOtherAsciiDoc() throws Exception {
+ public void testOtherAsciiDoc() {
String doc = catalog.otherAsciiDoc("swagger-java");
assertNotNull(doc);
assertTrue(doc.contains("Swagger"));
}
@Test
- public void testValidateEndpointTwitterSpecial() throws Exception {
+ public void testValidateEndpointTwitterSpecial() {
String uri = "twitter-search://java?{{%s}}";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
@@ -1177,7 +1177,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateApiEndpoint() throws Exception {
+ public void testValidateApiEndpoint() {
// there is a type converter that converts from and to to phone number
String uri = "twilio:call/create?applicationSid=123&from=#555&to=#999";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
@@ -1235,7 +1235,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateEndpointTimerDuration() throws Exception {
+ public void testValidateEndpointTimerDuration() {
String uri = "timer:foo?period=5s";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
assertTrue(result.isSuccess());
@@ -1247,7 +1247,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateEndpointHttpPropertyPlaceholder() throws Exception
{
+ public void testValidateEndpointHttpPropertyPlaceholder() {
String uri =
"http://api.openweathermap.org/data/2.5/weather?{{property.weatherUri}}";;
EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
assertTrue(result.isSuccess());
@@ -1264,7 +1264,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateEndpointJmsDefault() throws Exception {
+ public void testValidateEndpointJmsDefault() {
String uri = "jms:cheese?maxMessagesPerTask=-1";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri);
@@ -1274,7 +1274,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateEndpointConsumerOnly() throws Exception {
+ public void testValidateEndpointConsumerOnly() {
String uri = "file:inbox?bufferSize=4096&readLock=changed&delete=true";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri, false, true, false);
assertTrue(result.isSuccess());
@@ -1287,7 +1287,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateEndpointProducerOnly() throws Exception {
+ public void testValidateEndpointProducerOnly() {
String uri = "file:outbox?bufferSize=4096&fileExist=Append";
EndpointValidationResult result =
catalog.validateEndpointProperties(uri, false, false, true);
assertTrue(result.isSuccess());
@@ -1317,7 +1317,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyComponent() throws Exception {
+ public void testValidateConfigurationPropertyComponent() {
String text = "camel.component.seda.queueSize=1234";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1353,7 +1353,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyLanguage() throws Exception {
+ public void testValidateConfigurationPropertyLanguage() {
String text = "camel.language.tokenize.token=;";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1374,7 +1374,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyDataformat() throws Exception
{
+ public void testValidateConfigurationPropertyDataformat() {
String text = "camel.dataformat.bindy-csv.type=csv";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1405,7 +1405,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyComponentQuartz() throws
Exception {
+ public void testValidateConfigurationPropertyComponentQuartz() {
String text = "camel.component.quartz.auto-start-scheduler=true";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1448,7 +1448,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyComponentJClouds() throws
Exception {
+ public void testValidateConfigurationPropertyComponentJClouds() {
String text = "camel.component.jclouds.autowiredEnabled=true";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1490,7 +1490,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyMain() throws Exception {
+ public void testValidateConfigurationPropertyMain() {
String text = "camel.main.allow-use-original-message=true";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1561,7 +1561,7 @@ public class CamelCatalogTest {
}
@Test
- public void testValidateConfigurationPropertyMainMap() throws Exception {
+ public void testValidateConfigurationPropertyMainMap() {
String text = "camel.rest.api-properties=#foo";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
@@ -1589,7 +1589,7 @@ public class CamelCatalogTest {
}
@Test
- public void validateEnvVariableInSyntax() throws Exception {
+ public void validateEnvVariableInSyntax() {
EndpointValidationResult result
=
catalog.validateEndpointProperties("netty-http:http://foo-bar.{{env:NAMESPACE}}.svc.cluster.local/samples";);
assertTrue(result.isSuccess());
diff --git
a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
index 5791c10..8bdc986 100644
---
a/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
+++
b/catalog/camel-csimple-maven-plugin/src/main/java/org/apache/camel/maven/GenerateMojo.java
@@ -137,7 +137,7 @@ public class GenerateMojo extends AbstractExecMojo {
doExecuteRoutes(generator);
}
- protected void doExecuteRoutes(CSimpleCodeGenerator generator) throws
MojoExecutionException, MojoFailureException {
+ protected void doExecuteRoutes(CSimpleCodeGenerator generator) {
List<CamelCSimpleExpressionDetails> csimpleExpressions = new
ArrayList<>();
Set<File> javaFiles = new LinkedHashSet<>();
Set<File> xmlFiles = new LinkedHashSet<>();
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index ede3826..0f64535 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -141,7 +141,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
// CHECKSTYLE:OFF
@Override
- public void execute() throws MojoExecutionException, MojoFailureException {
+ public void execute() throws MojoExecutionException {
Set<File> javaFiles = new LinkedHashSet<>();
Set<File> xmlFiles = new LinkedHashSet<>();
@@ -401,8 +401,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
@SuppressWarnings("unchecked")
private String templateCoverageData(
String fileName, String routeId, List<RouteCoverageNode> model,
AtomicInteger notCovered,
- AtomicInteger coveredNodes)
- throws MojoExecutionException {
+ AtomicInteger coveredNodes) {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
PrintStream sw = new PrintStream(bos);
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 32751a0..a422cdf 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -372,7 +372,7 @@ public class ValidateMojo extends AbstractExecMojo {
return -1;
}
- protected void doExecuteRoutes(CamelCatalog catalog) throws
MojoExecutionException, MojoFailureException {
+ protected void doExecuteRoutes(CamelCatalog catalog) throws
MojoExecutionException {
List<CamelEndpointDetails> endpoints = new ArrayList<>();
List<CamelSimpleExpressionDetails> simpleExpressions = new
ArrayList<>();
List<CamelRouteDetails> routeIds = new ArrayList<>();
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
index 9a463ae..3b51e00 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java
@@ -93,7 +93,7 @@ public final class XmlRouteParser {
String column = (String)
route.getUserData(XmlLineNumberParser.COLUMN_NUMBER);
if (column != null) {
- node.setLinePosition(Integer.valueOf(column));
+ node.setLinePosition(Integer.parseInt(column));
}
// parse the route and gather all its EIPs
@@ -115,8 +115,7 @@ public final class XmlRouteParser {
*/
public static void parseXmlRouteEndpoints(
InputStream xml, String baseDir, String fullyQualifiedFileName,
- List<CamelEndpointDetails> endpoints)
- throws Exception {
+ List<CamelEndpointDetails> endpoints) {
// find all the endpoints (currently only <endpoint> and within
<route>)
// try parse it as dom
@@ -161,7 +160,7 @@ public final class XmlRouteParser {
String column = (String)
node.getUserData(XmlLineNumberParser.COLUMN_NUMBER);
if (column != null) {
- detail.setLinePosition(Integer.valueOf(column));
+ detail.setLinePosition(Integer.parseInt(column));
}
detail.setEndpointInstance(id);
@@ -185,8 +184,7 @@ public final class XmlRouteParser {
*/
public static void parseXmlRouteSimpleExpressions(
InputStream xml, String baseDir, String fullyQualifiedFileName,
- List<CamelSimpleExpressionDetails> simpleExpressions)
- throws Exception {
+ List<CamelSimpleExpressionDetails> simpleExpressions) {
// find all the simple expressions
// try parse it as dom
@@ -217,7 +215,7 @@ public final class XmlRouteParser {
String column = (String)
node.getUserData(XmlLineNumberParser.COLUMN_NUMBER);
if (column != null) {
- detail.setLinePosition(Integer.valueOf(column));
+ detail.setLinePosition(Integer.parseInt(column));
}
// is it used as predicate or not
@@ -240,8 +238,7 @@ public final class XmlRouteParser {
*/
public static void parseXmlRouteCSimpleExpressions(
InputStream xml, String baseDir, String fullyQualifiedFileName,
- List<CamelCSimpleExpressionDetails> csimpleExpressions)
- throws Exception {
+ List<CamelCSimpleExpressionDetails> csimpleExpressions) {
// find all the simple expressions
// try parse it as dom
@@ -272,7 +269,7 @@ public final class XmlRouteParser {
String column = (String)
node.getUserData(XmlLineNumberParser.COLUMN_NUMBER);
if (column != null) {
- detail.setLinePosition(Integer.valueOf(column));
+ detail.setLinePosition(Integer.parseInt(column));
}
// is it used as predicate or not
@@ -295,8 +292,7 @@ public final class XmlRouteParser {
*/
public static void parseXmlRouteRouteIds(
InputStream xml, String baseDir, String fullyQualifiedFileName,
- List<CamelRouteDetails> routes)
- throws Exception {
+ List<CamelRouteDetails> routes) {
// find all the endpoints (currently only <route> and within <route>)
// try parse it as dom
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
index 1e6ea23..5d66ba0 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaParserHelper.java
@@ -121,8 +121,8 @@ public final class CamelJavaParserHelper {
Block block = md.getBody();
if (block != null) {
List statements = block.statements();
- for (int i = 0; i < statements.size(); i++) {
- Statement stmt = (Statement) statements.get(i);
+ for (Object statement : statements) {
+ Statement stmt = (Statement) statement;
Expression exp = null;
if (stmt instanceof ReturnStatement) {
ReturnStatement rs = (ReturnStatement) stmt;
@@ -149,8 +149,7 @@ public final class CamelJavaParserHelper {
}
if (isRouteBuilder && cic.getAnonymousClassDeclaration()
!= null) {
List body =
cic.getAnonymousClassDeclaration().bodyDeclarations();
- for (int j = 0; j < body.size(); j++) {
- Object line = body.get(j);
+ for (Object line : body) {
if (line instanceof MethodDeclaration) {
MethodDeclaration amd = (MethodDeclaration)
line;
if
("configure".equals(amd.getName().toString())) {
@@ -704,16 +703,18 @@ public final class CamelJavaParserHelper {
// include extended when we concat on 2 or more lines
List extended = ie.extendedOperands();
if (extended != null) {
+ StringBuilder answerBuilder = new
StringBuilder(answer);
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block,
(Expression) ext);
if (numeric) {
long num3 = val3 != null ?
Long.parseLong(val3) : 0;
- long num = Long.parseLong(answer);
- answer = Long.toString(num + num3);
+ long num =
Long.parseLong(answerBuilder.toString());
+ answerBuilder = new
StringBuilder(Long.toString(num + num3));
} else {
- answer += val3 != null ? val3 : "";
+ answerBuilder.append(val3 != null ? val3 : "");
}
}
+ answer = answerBuilder.toString();
}
}
}
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index 59b801f..eaee4b1 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -629,16 +629,18 @@ public final class CamelJavaRestDslParserHelper {
// include extended when we concat on 2 or more lines
List extended = ie.extendedOperands();
if (extended != null) {
+ StringBuilder answerBuilder = new
StringBuilder(answer);
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block,
(Expression) ext);
if (numeric) {
long num3 = val3 != null ?
Long.parseLong(val3) : 0;
- long num = Long.parseLong(answer);
- answer = Long.toString(num + num3);
+ long num =
Long.parseLong(answerBuilder.toString());
+ answerBuilder = new
StringBuilder(Long.toString(num + num3));
} else {
- answer += val3 != null ? val3 : "";
+ answerBuilder.append(val3 != null ? val3 : "");
}
}
+ answer = answerBuilder.toString();
}
}
}
@@ -666,7 +668,7 @@ public final class CamelJavaRestDslParserHelper {
try {
int current = 0;
- try (BufferedReader br = new BufferedReader(new FileReader(new
File(fullyQualifiedFileName)))) {
+ try (BufferedReader br = new BufferedReader(new
FileReader(fullyQualifiedFileName))) {
String line;
while ((line = br.readLine()) != null) {
lines++;
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
index c5a5d54..ef0778c 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaTreeParserHelper.java
@@ -452,16 +452,18 @@ public final class CamelJavaTreeParserHelper {
// include extended when we concat on 2 or more lines
List extended = ie.extendedOperands();
if (extended != null) {
+ StringBuilder answerBuilder = new
StringBuilder(answer);
for (Object ext : extended) {
String val3 = getLiteralValue(clazz, block,
(Expression) ext);
if (numeric) {
long num3 = val3 != null ?
Long.parseLong(val3) : 0;
- long num = Long.parseLong(answer);
- answer = Long.toString(num + num3);
+ long num =
Long.parseLong(answerBuilder.toString());
+ answerBuilder = new
StringBuilder(Long.toString(num + num3));
} else {
- answer += val3 != null ? val3 : "";
+ answerBuilder.append(val3 != null ? val3 : "");
}
}
+ answer = answerBuilder.toString();
}
}
}
@@ -489,7 +491,7 @@ public final class CamelJavaTreeParserHelper {
try {
int current = 0;
- try (BufferedReader br = new BufferedReader(new FileReader(new
File(fullyQualifiedFileName)))) {
+ try (BufferedReader br = new BufferedReader(new
FileReader(fullyQualifiedFileName))) {
String line;
while ((line = br.readLine()) != null) {
lines++;
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
index 52f89c5..f7e87d2 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlHelper.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -197,9 +198,8 @@ public final class CamelXmlHelper {
private static Document loadCamelXmlFileAsDom(InputStream
resourceInputStream) throws Exception {
// must enforce the namespace to be
http://camel.apache.org/schema/spring which is what the camel-core JAXB model
uses
- Document root = XmlLineNumberParser.parseXml(resourceInputStream,
"camelContext,routes,rests",
+ return XmlLineNumberParser.parseXml(resourceInputStream,
"camelContext,routes,rests",
"http://camel.apache.org/schema/spring";);
- return root;
}
private static Node findCamelNodeInDocument(Document root, String key) {
@@ -232,6 +232,7 @@ public final class CamelXmlHelper {
}
}
}
+ //FIXME : selectedNode is always null
return selectedNode;
}
@@ -295,7 +296,7 @@ public final class CamelXmlHelper {
}
private static boolean equal(Object a, Object b) {
- return a == b || a != null && a.equals(b);
+ return Objects.equals(a, b);
}
}
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
index 6e8f7b6..ea6ea70 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java
@@ -49,8 +49,7 @@ public final class CamelXmlTreeParserHelper {
CamelNodeDetails parent = outputs.get(0);
// we dont want the route element and only start with from
- for (int i = 0; i < outputs.size(); i++) {
- CamelNodeDetails node = outputs.get(i);
+ for (CamelNodeDetails node : outputs) {
String name = node.getName();
if ("from".equals(name)) {
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
index 0c04095..de1c25b 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.parser.helper;
-import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.util.ArrayList;
@@ -39,7 +38,6 @@ import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -136,8 +134,7 @@ public final class XmlLineNumberParser {
}
@Override
- public void startElement(final String uri, final String localName,
final String qName, final Attributes attributes)
- throws SAXException {
+ public void startElement(final String uri, final String localName,
final String qName, final Attributes attributes) {
addTextIfNeeded();
if (rootNames != null && !found) {
@@ -227,12 +224,12 @@ public final class XmlLineNumberParser {
}
@Override
- public void characters(final char ch[], final int start, final int
length) throws SAXException {
+ public void characters(final char ch[], final int start, final int
length) {
textBuffer.append(ch, start, length);
}
@Override
- public InputSource resolveEntity(String publicId, String systemId)
throws IOException, SAXException {
+ public InputSource resolveEntity(String publicId, String systemId)
{
// do not resolve external dtd
return new InputSource(new StringReader(""));
}
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelRouteDetails.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelRouteDetails.java
index 31632fe..9904968 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelRouteDetails.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelRouteDetails.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.parser.model;
+import java.util.Objects;
+
/**
* Details about a parsed and discovered Camel route.
*/
@@ -90,19 +92,19 @@ public class CamelRouteDetails {
if (!fileName.equals(that.fileName)) {
return false;
}
- if (lineNumber != null ? !lineNumber.equals(that.lineNumber) :
that.lineNumber != null) {
+ if (!Objects.equals(lineNumber, that.lineNumber)) {
return false;
}
- if (lineNumberEnd != null ? !lineNumberEnd.equals(that.lineNumberEnd)
: that.lineNumberEnd != null) {
+ if (!Objects.equals(lineNumberEnd, that.lineNumberEnd)) {
return false;
}
- if (className != null ? !className.equals(that.className) :
that.className != null) {
+ if (!Objects.equals(className, that.className)) {
return false;
}
- if (methodName != null ? !methodName.equals(that.methodName) :
that.methodName != null) {
+ if (!Objects.equals(methodName, that.methodName)) {
return false;
}
- if (routeId != null ? !routeId.equals(that.routeId) : that.routeId !=
null) {
+ if (!Objects.equals(routeId, that.routeId)) {
return false;
}
return true;
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
index 4c7eea8..1996112 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java
@@ -28,7 +28,7 @@ public class MyRouteDuplicateIdTest extends CamelTestSupport {
}
@Test
- void testFoo() throws Exception {
+ void testFoo() {
// noop
}
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
index 51f0697..fd266ca 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterConcatFieldRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterConcatFieldRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterConcatFieldRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyConcatFieldRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
index 9a7dbf0..1c32526 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
@@ -38,7 +38,7 @@ public class RoasterEndpointInjectTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterEndpointInjectTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
index b013835..b5453e8 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterFieldRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterFieldRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterFieldRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyFieldRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
index cad0a79..cd315b0 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java
@@ -41,7 +41,7 @@ public class RoasterJavaDslTest extends CamelTestSupport {
}
@Test
- void parseTree() throws Exception {
+ void parseTree() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java"));
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
index 644b34f..9b8eb6a 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java
@@ -41,7 +41,7 @@ public class RoasterJavaDslTwoRoutesTest extends
CamelTestSupport {
}
@Test
- void parseTree() throws Exception {
+ void parseTree() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java"));
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
index 5be33e6..d79a705 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaPartialRouteDslTest.java
@@ -36,7 +36,7 @@ class RoasterJavaPartialRouteDslTest extends CamelTestSupport
{
private static final Logger LOG =
LoggerFactory.getLogger(RoasterJavaPartialRouteDslTest.class);
@Test
- void parseTree() throws Exception {
+ void parseTree() {
String pathToFile =
"src/test/java/org/apache/camel/parser/java/MyPartialRoute.java";
JavaClassSource clazz = (JavaClassSource) Roaster.parse(new
File(pathToFile));
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
index 7d3c2e6..a608227 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaRestDslTest.java
@@ -38,7 +38,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
}
@Test
- void parseRestConfiguration() throws Exception {
+ void parseRestConfiguration() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
@@ -74,7 +74,7 @@ public class RoasterJavaRestDslTest extends CamelTestSupport {
}
@Test
- void parseRestService() throws Exception {
+ void parseRestService() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRestDslRouteBuilder.java"));
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
index 2e1e42a..e90be85 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMethodCallRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterMethodCallRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterMethodCallRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyMethodCallRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
index b074e25..39dac29 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyFieldMethodCallRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class
RoasterMyFieldMethodCallRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterMyFieldMethodCallRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyFieldMethodCallRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
index b522599..e0b1a2c 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyLocalAddRouteBuilderTest.java
@@ -36,7 +36,7 @@ public class RoasterMyLocalAddRouteBuilderTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterMyLocalAddRouteBuilderTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyLocalAddRouteBuilderTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
index e08e61e..f4a9ffd 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMyNettyTest.java
@@ -35,7 +35,7 @@ public class RoasterMyNettyTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterMyNettyTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz
= (JavaClassSource) Roaster.parse(new
File("src/test/java/org/apache/camel/parser/java/MyNettyTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
index ac82588..f374723 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterMySedaRouteBuilderTest.java
@@ -37,7 +37,7 @@ public class RoasterMySedaRouteBuilderTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterMySedaRouteBuilderTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MySedaRouteBuilder.java"));
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
index 7b9f4c1..e4f2be1 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineConstRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterNewLineConstRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterNewLineConstRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyNewLineConstRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
index 0009256..3f14e35 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterNewLineRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterNewLineRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterNewLineRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyNewLineRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
index 8bf3b94..e1505d2 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderCamelTestSupportTest.java
@@ -35,7 +35,7 @@ public class RoasterRouteBuilderCamelTestSupportTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterRouteBuilderCamelTestSupportTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz
= (JavaClassSource) Roaster.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRouteTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
index 3d92f77..21b27a3 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderConfigureTest.java
@@ -35,7 +35,7 @@ public class RoasterRouteBuilderConfigureTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterRouteBuilderConfigureTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz
= (JavaClassSource) Roaster.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRouteBuilder.java"));
MethodSource<JavaClassSource> method = clazz.getMethod("configure");
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
index dd8de71..aea00a3 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteBuilderEmptyUriTest.java
@@ -36,7 +36,7 @@ public class RoasterRouteBuilderEmptyUriTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterRouteBuilderEmptyUriTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRouteEmptyUriTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
index 98022881..29479d0 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.java
@@ -35,7 +35,7 @@ public class
RoasterRouteDuplicateIdBuilderDCamelTestSupportTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterRouteDuplicateIdBuilderDCamelTestSupportTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/MyRouteDuplicateIdTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
index 92e0e90..4527814 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleProcessorTest.java
@@ -38,7 +38,7 @@ public class RoasterSimpleProcessorTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterSimpleProcessorTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
index e3e5775..268cd80 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToDTest.java
@@ -38,7 +38,7 @@ public class RoasterSimpleToDTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterSimpleToDTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz
= (JavaClassSource) Roaster.parse(new
File("src/test/java/org/apache/camel/parser/java/MySimpleToDRoute.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
index 8b52230..88f5580 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSimpleToFTest.java
@@ -38,7 +38,7 @@ public class RoasterSimpleToFTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterSimpleToFTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz
= (JavaClassSource) Roaster.parse(new
File("src/test/java/org/apache/camel/parser/java/MySimpleToFRoute.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
index fb351bd..b2bef5c 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterSplitTokenizeTest.java
@@ -38,7 +38,7 @@ public class RoasterSplitTokenizeTest {
private static final Logger LOG =
LoggerFactory.getLogger(RoasterSplitTokenizeTest.class);
@Test
- void parse() throws Exception {
+ void parse() {
JavaClassSource clazz = (JavaClassSource) Roaster
.parse(new
File("src/test/java/org/apache/camel/parser/java/SplitTokenizeTest.java"));
MethodSource<JavaClassSource> method =
CamelJavaParserHelper.findConfigureMethod(clazz);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
index c488dd4..3db12e7 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/SimpleProcessorTest.java
@@ -37,11 +37,7 @@ public class SimpleProcessorTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:start").routeId("myRoute").process(new
Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getMessage().setBody("Bye World");
- }
- });
+ from("direct:start").routeId("myRoute").process(exchange ->
exchange.getMessage().setBody("Bye World"));
}
};
}
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
index 62d0220..d47d72f 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlParseTreeTest.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class XmlParseTreeTest {
@@ -51,8 +52,8 @@ public class XmlParseTreeTest {
CamelNodeDetails details = list.get(0);
assertEquals("src/test/resources/org/apache/camel/camel/parser/xml/mycamel.xml",
details.getFileName());
assertEquals("myRoute", details.getRouteId());
- assertEquals(null, details.getMethodName());
- assertEquals(null, details.getClassName());
+ assertNull(details.getMethodName());
+ assertNull(details.getClassName());
String tree = details.dump(0);
LOG.info("\n" + tree);
diff --git
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlWithPrefixParseTreeTest.java
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlWithPrefixParseTreeTest.java
index 74eea72..69e12c1 100644
---
a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlWithPrefixParseTreeTest.java
+++
b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/xml/XmlWithPrefixParseTreeTest.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class XmlWithPrefixParseTreeTest {
@@ -52,8 +53,8 @@ public class XmlWithPrefixParseTreeTest {
assertEquals("src/test/resources/org/apache/camel/camel/parser/xml/mycamel-withNamespacePrefix.xml",
details.getFileName());
assertEquals("myRoute", details.getRouteId());
- assertEquals(null, details.getMethodName());
- assertEquals(null, details.getClassName());
+ assertNull(details.getMethodName());
+ assertNull(details.getClassName());
String tree = details.dump(0);
LOG.info("\n" + tree);
diff --git
a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyEndpoint.java
b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyEndpoint.java
index 8564d99..3636416 100644
---
a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyEndpoint.java
+++
b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyEndpoint.java
@@ -44,12 +44,12 @@ public class DummyEndpoint extends DefaultEndpoint {
}
@Override
- public Producer createProducer() throws Exception {
+ public Producer createProducer() {
return new DummyProducer(this, drink, amount, celebrity);
}
@Override
- public Consumer createConsumer(Processor processor) throws Exception {
+ public Consumer createConsumer(Processor processor) {
throw new UnsupportedOperationException();
}
diff --git
a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyProducer.java
b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyProducer.java
index bb85dc0..46dc939 100644
---
a/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyProducer.java
+++
b/catalog/dummy-component/src/main/java/org/apache/camel/component/dummy/DummyProducer.java
@@ -36,7 +36,7 @@ public class DummyProducer extends DefaultProducer {
}
@Override
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
total += amount;
exchange.getIn().setBody("total " + total + " of " +
drink.name().toLowerCase() + " ordered"
