This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1ad1deeb214 Polished
1ad1deeb214 is described below
commit 1ad1deeb214238a0dfb5a30d4cfd4975d69dfc09
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Nov 13 14:04:39 2024 +0100
Polished
---
.../dsl/yaml/common/ConstructorResolverTest.groovy | 18 ++++++++--------
.../camel/dsl/yaml/EmptyRouteFileTest.groovy | 6 +++---
.../apache/camel/dsl/yaml/ExpressionTest.groovy | 20 +++++++++---------
.../yaml/IntegrationLoaderDependenciesTest.groovy | 4 ++--
.../KameletBindingLoaderIntegrationSpecTest.groovy | 2 +-
.../dsl/yaml/KameletIntegrationLoaderTest.groovy | 4 ++--
.../dsl/yaml/KameletLoaderDependenciesTest.groovy | 2 +-
.../org/apache/camel/dsl/yaml/MarshalTest.groovy | 6 +++---
.../camel/dsl/yaml/MarshalVariableTest.groovy | 6 +++---
.../dsl/yaml/PipeLoaderIntegrationSpecTest.groovy | 2 +-
.../apache/camel/dsl/yaml/PipeLoaderTest.groovy | 4 ++--
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 24 +++++++++++-----------
.../org/apache/camel/dsl/yaml/RoutesTest.groovy | 4 ++--
.../org/apache/camel/dsl/yaml/SplitTest.groovy | 14 ++++++-------
.../camel/dsl/yaml/UnmarshalVariableTest.groovy | 2 +-
.../yaml/support/MockRestConsumerFactory.groovy | 2 +-
.../camel/dsl/yaml/support/YamlTestSupport.groovy | 2 +-
.../dsl/yaml/support/model/MyBeanBuilder.groovy | 2 +-
.../camel/dsl/yaml/support/model/MyCtrBean.groovy | 2 +-
.../dsl/yaml/support/model/MyDestroyBean.groovy | 14 ++++++-------
.../camel/dsl/yaml/support/model/MyFacBean.groovy | 4 ++--
.../dsl/yaml/support/model/MyFacHelper.groovy | 2 +-
.../yaml/support/model/MyUppercaseProcessor.groovy | 2 +-
23 files changed, 74 insertions(+), 74 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
index abbda8e5a88..25fb7ae3523 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/test/groovy/org/apache/camel/dsl/yaml/common/ConstructorResolverTest.groovy
@@ -29,9 +29,9 @@ import spock.lang.Specification
class ConstructorResolverTest extends Specification {
static int getJavaMajorVersion() {
- String javaSpecVersion =
System.getProperty("java.specification.version");
+ String javaSpecVersion =
System.getProperty("java.specification.version")
- return Integer.parseInt(javaSpecVersion);
+ return Integer.parseInt(javaSpecVersion)
}
@@ -40,7 +40,7 @@ class ConstructorResolverTest extends Specification {
def settings = LoadSettings.builder().build()
when:
def ctr = new YamlDeserializationContext(settings)
- ctr.setCamelContext(new DefaultCamelContext());
+ ctr.setCamelContext(new DefaultCamelContext())
ctr.addResolver(new LocalResolver())
def load = new Load(settings, ctr)
@@ -71,19 +71,19 @@ class ConstructorResolverTest extends Specification {
switch (id) {
case 'my-node':
case
'org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNode':
- return new MyNodeConstructor();
+ return new MyNodeConstructor()
case 'nested':
case
'org.apache.camel.dsl.yaml.common.ConstructorResolverTest$MyNested':
- return new MyNestedConstructor();
+ return new MyNestedConstructor()
}
- return null;
+ return null
}
}
@ToString
static class MyNode {
String message
- MyNested nested;
+ MyNested nested
}
@ToString
@@ -117,7 +117,7 @@ class ConstructorResolverTest extends Specification {
target.nested = asType(value, MyNested.class)
break
default:
- return false;
+ return false
}
return true
@@ -147,7 +147,7 @@ class ConstructorResolverTest extends Specification {
target.message = ((ScalarNode)value).value
break
default:
- return false;
+ return false
}
return true
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EmptyRouteFileTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EmptyRouteFileTest.groovy
index 9173fbf10c9..e211691d0ab 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EmptyRouteFileTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/EmptyRouteFileTest.groovy
@@ -27,11 +27,11 @@ class EmptyRouteFileTest extends YamlTestSupport {
def "empty file"() {
when:
- RoutesLoader loader = PluginHelper.getRoutesLoader(context);
- Resource res = ResourceHelper.fromString("dummy.yaml", "");
+ RoutesLoader loader = PluginHelper.getRoutesLoader(context)
+ Resource res = ResourceHelper.fromString("dummy.yaml", "")
then:
try {
- loader.loadRoutes(res);
+ loader.loadRoutes(res)
fail("Should have thrown exception")
} catch (IOException e) {
Assertions.assertEquals("Resource is empty: dummy.yaml",
e.getMessage())
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
index 300f3ff9b9b..28643995194 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/ExpressionTest.groovy
@@ -39,10 +39,10 @@ class ExpressionTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (IllegalArgumentException e) {
- Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage())
}
}
@@ -62,10 +62,10 @@ class ExpressionTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (IllegalArgumentException e) {
- Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage())
}
}
@@ -85,10 +85,10 @@ class ExpressionTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (IllegalArgumentException e) {
- Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage())
}
}
@@ -106,10 +106,10 @@ class ExpressionTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (Exception e) {
- Assertions.assertTrue(e.getMessage().contains("additional
properties"), e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("additional
properties"), e.getMessage())
}
}
@@ -128,10 +128,10 @@ class ExpressionTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (Exception e) {
- Assertions.assertTrue(e.getMessage().contains("0 are valid"),
e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("0 are valid"),
e.getMessage())
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/IntegrationLoaderDependenciesTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/IntegrationLoaderDependenciesTest.groovy
index 2f2ee3c62a0..e0318dee911 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/IntegrationLoaderDependenciesTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/IntegrationLoaderDependenciesTest.groovy
@@ -28,7 +28,7 @@ class IntegrationLoaderDependenciesTest extends
YamlTestSupport {
context.registry.bind("myDep", new DependencyStrategy() {
@Override
void onDependency(String dependency) {
- deps.add(dependency);
+ deps.add(dependency)
}
})
@@ -70,7 +70,7 @@ class IntegrationLoaderDependenciesTest extends
YamlTestSupport {
with (context.routeDefinitions[0]) {
input.endpointUri == 'sql:SELECT * FROM
table1?dataSource=#bean:myDatasource'
- input.lineNumber == 11;
+ input.lineNumber == 11
outputs.size() == 2
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderIntegrationSpecTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderIntegrationSpecTest.groovy
index 9675683884b..37bef89a4f9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderIntegrationSpecTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderIntegrationSpecTest.groovy
@@ -28,7 +28,7 @@ class KameletBindingLoaderIntegrationSpecTest extends
YamlTestSupport {
context.registry.bind("myDep", new DependencyStrategy() {
@Override
void onDependency(String dependency) {
- deps.add(dependency);
+ deps.add(dependency)
}
})
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletIntegrationLoaderTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletIntegrationLoaderTest.groovy
index ea7cee7b17f..dedef4e1af5 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletIntegrationLoaderTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletIntegrationLoaderTest.groovy
@@ -51,11 +51,11 @@ class KameletIntegrationLoaderTest extends YamlTestSupport {
with (context.routeDefinitions[0]) {
input.endpointUri == 'kamelet:timer-source?message=Hello Camel
K&period=1234'
- input.lineNumber == 8;
+ input.lineNumber == 8
outputs.size() == 1
with (outputs[0], KameletDefinition) {
name == 'log-sink?showStreams=false&showHeaders=false'
- lineNumber == 11;
+ lineNumber == 11
}
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
index 3bb3544bf69..af1197cdd30 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
@@ -28,7 +28,7 @@ class KameletLoaderDependenciesTest extends YamlTestSupport {
context.registry.bind("myDep", new DependencyStrategy() {
@Override
void onDependency(String dependency) {
- deps.add(dependency);
+ deps.add(dependency)
}
})
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
index 6f6bc029af4..7ce4877cb22 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalTest.groovy
@@ -101,10 +101,10 @@ class MarshalTest extends YamlTestSupport {
'''
then:
try {
- loadRoutes(route);
+ loadRoutes(route)
Assertions.fail("Should have thrown exception")
} catch (IllegalArgumentException e) {
- Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage());
+ Assertions.assertTrue(e.getMessage().contains("2 are valid"),
e.getMessage())
}
}
@@ -117,7 +117,7 @@ class MarshalTest extends YamlTestSupport {
- marshal: {}
- to: "mock:result"
'''
- loadRoutes(route);
+ loadRoutes(route)
then:
context.routeDefinitions.size() == 1
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
index 05ba3cf1742..b07efd6f068 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/MarshalVariableTest.groovy
@@ -256,14 +256,14 @@ class MarshalVariableTest extends YamlTestSupport {
@Override
void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
- String line = "Bye " + graph.toString();
- stream.write(line.getBytes());
+ String line = "Bye " + graph.toString()
+ stream.write(line.getBytes())
}
@Override
Object unmarshal(Exchange exchange, InputStream stream) throws
Exception {
// noop
- return null;
+ return null
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderIntegrationSpecTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderIntegrationSpecTest.groovy
index 8b0110f0767..02ab2e856e2 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderIntegrationSpecTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderIntegrationSpecTest.groovy
@@ -28,7 +28,7 @@ class PipeLoaderIntegrationSpecTest extends YamlTestSupport {
context.registry.bind("myDep", new DependencyStrategy() {
@Override
void onDependency(String dependency) {
- deps.add(dependency);
+ deps.add(dependency)
}
})
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
index 767f788885c..9f175e88ed2 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/PipeLoaderTest.groovy
@@ -374,9 +374,9 @@ class PipeLoaderTest extends YamlTestSupport {
context.registry.bind 'chaos', new Processor() {
@Override
void process(Exchange exchange) throws Exception {
- throw new IllegalArgumentException("Forced");
+ throw new IllegalArgumentException("Forced")
}
- };
+ }
loadBindings('''
apiVersion: camel.apache.org/v1
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
index b471381aeb3..327e609607d 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RouteTemplateTest.groovy
@@ -259,14 +259,14 @@ class RouteTemplateTest extends YamlTestSupport {
Assertions.assertNotNull(context.hasEndpoint("mock:result?retainFirst=1"))
MockEndpoint mock = context.getEndpoint("mock:result?retainFirst=1",
MockEndpoint)
mock.expectedBodiesReceived("Hello World")
- context.createProducerTemplate().sendBody("direct:start", "Hello
World");
+ context.createProducerTemplate().sendBody("direct:start", "Hello
World")
mock.assertIsSatisfied()
mock.reset()
context.addRouteFromTemplate("myRoute2", "myTemplate", [foo: "start2"])
MockEndpoint mock2 = context.getEndpoint("mock:result", MockEndpoint)
mock2.expectedBodiesReceived("Bye World")
- context.createProducerTemplate().sendBody("direct:start2", "Bye
World");
+ context.createProducerTemplate().sendBody("direct:start2", "Bye World")
mock2.assertIsSatisfied()
}
@@ -416,19 +416,19 @@ class RouteTemplateTest extends YamlTestSupport {
id: "end"
"""
when:
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("foo", "one");
- parameters.put("bar", "cheese");
- context.addRouteFromTemplate("first", "myTemplate", "aaa", parameters);
-
- parameters.put("foo", "two");
- parameters.put("bar", "cake");
- context.addRouteFromTemplate("second", "myTemplate", "bbb",
parameters);
+ Map<String, Object> parameters = new HashMap<>()
+ parameters.put("foo", "one")
+ parameters.put("bar", "cheese")
+ context.addRouteFromTemplate("first", "myTemplate", "aaa", parameters)
+
+ parameters.put("foo", "two")
+ parameters.put("bar", "cake")
+ context.addRouteFromTemplate("second", "myTemplate", "bbb", parameters)
context.start()
then:
- Assertions.assertEquals(3,
context.getRoute("first").filter("aaa*").size());
- Assertions.assertEquals(3,
context.getRoute("second").filter("bbb*").size());
+ Assertions.assertEquals(3,
context.getRoute("first").filter("aaa*").size())
+ Assertions.assertEquals(3,
context.getRoute("second").filter("bbb*").size())
}
def "Error: kebab-case: route-template"() {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
index f3970c28742..57067b019cf 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
@@ -423,8 +423,8 @@ class RoutesTest extends YamlTestSupport {
context.routeDefinitions.size() == 2
context.start()
- Assertions.assertEquals(2,
context.getRoute("foo").filter("aaa*").size());
- Assertions.assertEquals(2,
context.getRoute("bar").filter("bbb*").size());
+ Assertions.assertEquals(2,
context.getRoute("foo").filter("aaa*").size())
+ Assertions.assertEquals(2,
context.getRoute("bar").filter("bbb*").size())
}
def "Error: kebab-case: stream-cache"() {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
index 2e4c2d0a234..837cae9e138 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SplitTest.groovy
@@ -115,13 +115,13 @@ class SplitTest extends YamlTestSupport {
}
protected String createBody() {
- StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n");
- sb.append("<orders>\n");
- sb.append(" <order>Camel in Action</order>\n");
- sb.append(" <order>ActiveMQ in Action</order>\n");
- sb.append(" <order>DSL in Action</order>\n");
- sb.append("</orders>");
- return sb.toString();
+ StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n")
+ sb.append("<orders>\n")
+ sb.append(" <order>Camel in Action</order>\n")
+ sb.append(" <order>ActiveMQ in Action</order>\n")
+ sb.append(" <order>DSL in Action</order>\n")
+ sb.append("</orders>")
+ return sb.toString()
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalVariableTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalVariableTest.groovy
index a03879a6186..4e6decc1bdc 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalVariableTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/UnmarshalVariableTest.groovy
@@ -261,7 +261,7 @@ class UnmarshalVariableTest extends YamlTestSupport {
@Override
Object unmarshal(Exchange exchange, InputStream stream) throws
Exception {
- return "Bye " +
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
stream);
+ return "Bye " +
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
stream)
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/MockRestConsumerFactory.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/MockRestConsumerFactory.groovy
index 2460198f672..d4db93ac4d9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/MockRestConsumerFactory.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/MockRestConsumerFactory.groovy
@@ -34,6 +34,6 @@ class MockRestConsumerFactory implements RestConsumerFactory {
String produces,
RestConfiguration configuration,
Map<String, Object> parameters) {
- return null;
+ return null
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
index ba4f063e44b..ad54dd79380 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/YamlTestSupport.groovy
@@ -75,7 +75,7 @@ class YamlTestSupport extends Specification implements
HasCamelContext {
closure.delegate = routeTemplate(name)
closure.call()
}
- });
+ })
}
def loadRoutes(Resource... resources) {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyBeanBuilder.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyBeanBuilder.groovy
index 8bd930cb953..3c8196d6e03 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyBeanBuilder.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyBeanBuilder.groovy
@@ -32,7 +32,7 @@ class MyBeanBuilder {
}
MyBeanBuilder nested(MyFooBar fooBar) {
- this.nested = fooBar;
+ this.nested = fooBar
return this
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyCtrBean.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyCtrBean.groovy
index 40ca33e356c..3d5c901c270 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyCtrBean.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyCtrBean.groovy
@@ -19,7 +19,7 @@ package org.apache.camel.dsl.yaml.support.model
class MyCtrBean {
String field1
String field2
- int age;
+ int age
MyCtrBean(String field1, String field2) {
this.field1 = field1
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyDestroyBean.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyDestroyBean.groovy
index f1a563c058f..54b2be6b149 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyDestroyBean.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyDestroyBean.groovy
@@ -20,14 +20,14 @@ import java.util.concurrent.atomic.AtomicBoolean
class MyDestroyBean {
- public static final AtomicBoolean initCalled = new AtomicBoolean();
- public static final AtomicBoolean destroyCalled = new AtomicBoolean();
+ public static final AtomicBoolean initCalled = new AtomicBoolean()
+ public static final AtomicBoolean destroyCalled = new AtomicBoolean()
String field1
String field2
- int age;
+ int age
- public MyDestroyBean(String field1, String field2) {
+ MyDestroyBean(String field1, String field2) {
this.field1 = field1
this.field2 = field2
}
@@ -49,14 +49,14 @@ class MyDestroyBean {
}
String hello(String body) {
- return field1 + " " + body + ". I am " + field2 + " and " + age + "
years old!";
+ return field1 + " " + body + ". I am " + field2 + " and " + age + "
years old!"
}
void initMe() {
- initCalled.set(true);
+ initCalled.set(true)
}
void destroyMe() {
- destroyCalled.set(true);
+ destroyCalled.set(true)
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacBean.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacBean.groovy
index ce9267d0863..0cc6e570d00 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacBean.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacBean.groovy
@@ -19,10 +19,10 @@ package org.apache.camel.dsl.yaml.support.model
class MyFacBean {
String field1
String field2
- int age;
+ int age
static MyFacBean createBean(String field1, String field2) {
- return new MyFacBean(field1, field2);
+ return new MyFacBean(field1, field2)
}
private MyFacBean(String field1, String field2) {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacHelper.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacHelper.groovy
index 93e19d044ed..41adf0283f1 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacHelper.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyFacHelper.groovy
@@ -19,7 +19,7 @@ package org.apache.camel.dsl.yaml.support.model
class MyFacHelper {
static MyFacBean createBean(String field1, String field2) {
- return new MyFacBean(field1, field2);
+ return new MyFacBean(field1, field2)
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyUppercaseProcessor.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyUppercaseProcessor.groovy
index 814953dc5a8..82b364b7b7a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyUppercaseProcessor.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/support/model/MyUppercaseProcessor.groovy
@@ -22,6 +22,6 @@ import org.apache.camel.Processor
class MyUppercaseProcessor implements Processor {
@Override
void process(Exchange exchange) throws Exception {
- exchange.in.body = exchange.in.getBody(String.class).toUpperCase();
+ exchange.in.body = exchange.in.getBody(String.class).toUpperCase()
}
}