This is an automated email from the ASF dual-hosted git repository.
acosentino 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 d3d1d6b Camel-Elsql: Fixed CS
d3d1d6b is described below
commit d3d1d6b10472ff340cec6bba2b95f3d4028c4af2
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 23 17:40:42 2019 +0200
Camel-Elsql: Fixed CS
---
.../camel/component/elsql/ElSqlComponentTest.java | 14 ++++-----
.../elsql/ElSqlConsumerDynamicParameterTest.java | 13 ++++-----
.../camel/component/elsql/ElSqlConsumerTest.java | 8 ++---
.../camel/component/elsql/ElSqlDataSourceTest.java | 14 ++++-----
.../component/elsql/ElSqlProducerBatchTest.java | 34 +++++++++-------------
.../elsql/ElSqlProducerBodySimpleTest.java | 32 +++++++++-----------
.../elsql/ElSqlProducerStreamListTest.java | 34 +++++++---------------
7 files changed, 58 insertions(+), 91 deletions(-)
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlComponentTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlComponentTest.java
index b7e55d4..fca62d5 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlComponentTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlComponentTest.java
@@ -31,9 +31,8 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlComponentTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
@@ -50,7 +49,8 @@ public class ElSqlComponentTest extends CamelTestSupport {
// and each row in the list is a Map
Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0));
- // and we should be able the get the project from the map that should
be Linux
+ // and we should be able the get the project from the map that should
be
+ // Linux
assertEquals("Linux", row.get("PROJECT"));
}
@@ -68,10 +68,8 @@ public class ElSqlComponentTest extends CamelTestSupport {
getContext().getComponent("elsql",
ElsqlComponent.class).setDataSource(db);
getContext().getComponent("elsql",
ElsqlComponent.class).setResourceUri("elsql/projects.elsql");
- from("direct:simple")
- .to("elsql:projectsById")
- .to("mock:result");
+
from("direct:simple").to("elsql:projectsById").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
index bf8a594..034c1ee 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerDynamicParameterTest.java
@@ -35,10 +35,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
*/
public class ElSqlConsumerDynamicParameterTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
- @BindToRegistry("myIdGenerator")
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("myIdGenerator")
private MyIdGenerator idGenerator = new MyIdGenerator();
@After
@@ -75,8 +74,7 @@ public class ElSqlConsumerDynamicParameterTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("elsql:projectsByIdBean:elsql/projects.elsql?dataSource=#dataSource&consumer.initialDelay=0&consumer.delay=50")
- .routeId("foo").noAutoStartup()
+
from("elsql:projectsByIdBean:elsql/projects.elsql?dataSource=#dataSource&consumer.initialDelay=0&consumer.delay=50").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
@@ -87,7 +85,8 @@ public class ElSqlConsumerDynamicParameterTest extends
CamelTestSupport {
private int id = 1;
public int nextId() {
- // spring will call this twice, one for initializing query and 2nd
for actual value
+ // spring will call this twice, one for initializing query and 2nd
+ // for actual value
id++;
return id / 2;
}
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerTest.java
index 4c63aab..222e86b 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlConsumerTest.java
@@ -35,9 +35,8 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
*/
public class ElSqlConsumerTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@After
public void tearDown() throws Exception {
@@ -69,8 +68,7 @@ public class ElSqlConsumerTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("elsql:allProjects:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
+
from("elsql:allProjects:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
}
};
}
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlDataSourceTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlDataSourceTest.java
index 771d57d..6462ed8 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlDataSourceTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlDataSourceTest.java
@@ -31,9 +31,8 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlDataSourceTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
@@ -50,7 +49,8 @@ public class ElSqlDataSourceTest extends CamelTestSupport {
// and each row in the list is a Map
Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0));
- // and we should be able the get the project from the map that should
be Linux
+ // and we should be able the get the project from the map that should
be
+ // Linux
assertEquals("Linux", row.get("PROJECT"));
}
@@ -65,10 +65,8 @@ public class ElSqlDataSourceTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("direct:simple")
-
.to("elsql:projectsById:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
+
from("direct:simple").to("elsql:projectsById:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBatchTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBatchTest.java
index abdd2d2..c0ab8cd 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBatchTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBatchTest.java
@@ -32,10 +32,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlProducerBatchTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+
@After
public void tearDown() throws Exception {
super.tearDown();
@@ -48,17 +47,17 @@ public class ElSqlProducerBatchTest extends
CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).header(SqlConstants.SQL_UPDATE_COUNT).isEqualTo(1);
-
- Map<String, Object> batchParams = new HashMap<>();
+
+ Map<String, Object> batchParams = new HashMap<>();
batchParams.put("id", "4");
batchParams.put("license", "GNU");
batchParams.put("project", "Batch");
-
+
template.sendBody("direct:batch", batchParams);
mock.assertIsSatisfied();
}
-
+
@Test
public void testNonBatchMode() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -67,30 +66,25 @@ public class ElSqlProducerBatchTest extends
CamelTestSupport {
mock.message(0).header("id").isEqualTo("4");
mock.message(0).header("license").isEqualTo("GNU");
mock.message(0).header("project").isEqualTo("nonBatch");
-
- Map<String, Object> headers = new HashMap<>();
+
+ Map<String, Object> headers = new HashMap<>();
headers.put("id", "4");
headers.put("license", "GNU");
headers.put("project", "nonBatch");
-
+
template.sendBodyAndHeaders("direct:nonBatch", "", headers);
mock.assertIsSatisfied();
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
-
- from("direct:batch")
-
.to("elsql:insertProject:elsql/projects.elsql?dataSource=#dataSource&batch=true")
- .to("mock:result");
-
- from("direct:nonBatch")
-
.to("elsql:insertProject:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
+
+
from("direct:batch").to("elsql:insertProject:elsql/projects.elsql?dataSource=#dataSource&batch=true").to("mock:result");
+
+
from("direct:nonBatch").to("elsql:insertProject:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
}
};
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBodySimpleTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBodySimpleTest.java
index 6352c62..74772e0 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBodySimpleTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerBodySimpleTest.java
@@ -34,9 +34,8 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlProducerBodySimpleTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
@@ -56,7 +55,8 @@ public class ElSqlProducerBodySimpleTest extends
CamelTestSupport {
// and each row in the list is a Map
Map<?, ?> row = assertIsInstanceOf(Map.class, received.get(0));
- // and we should be able the get the project from the map that should
be Linux
+ // and we should be able the get the project from the map that should
be
+ // Linux
assertEquals("Linux", row.get("PROJECT"));
}
@@ -95,14 +95,14 @@ public class ElSqlProducerBodySimpleTest extends
CamelTestSupport {
assertEquals("Camel", row.get("PROJECT"));
}
-
+
@Test
public void testUpdateHeader() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).header(SqlConstants.SQL_UPDATE_COUNT).isEqualTo(1);
-
- Map<String, Object> headers = new HashMap<>();
+
+ Map<String, Object> headers = new HashMap<>();
headers.put("id", "3");
headers.put("lic", "GNU");
@@ -122,18 +122,12 @@ public class ElSqlProducerBodySimpleTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("direct:simple")
-
.to("elsql:projectsByIdBody:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
-
- from("direct:parameters")
-
.to("elsql:projectById:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
-
- from("direct:update")
-
.to("elsql:updateLicense:elsql/projects.elsql?dataSource=#dataSource")
- .to("mock:result");
+
from("direct:simple").to("elsql:projectsByIdBody:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
+
+
from("direct:parameters").to("elsql:projectById:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
+
+
from("direct:update").to("elsql:updateLicense:elsql/projects.elsql?dataSource=#dataSource").to("mock:result");
}
};
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerStreamListTest.java
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerStreamListTest.java
index f04a625..c47a46f 100644
---
a/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerStreamListTest.java
+++
b/components/camel-elsql/src/test/java/org/apache/camel/component/elsql/ElSqlProducerStreamListTest.java
@@ -33,9 +33,8 @@ import static org.hamcrest.CoreMatchers.instanceOf;
public class ElSqlProducerStreamListTest extends CamelTestSupport {
- @BindToRegistry("dataSource")
- private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new
EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testReturnAnIterator() throws Exception {
@@ -91,27 +90,14 @@ public class ElSqlProducerStreamListTest extends
CamelTestSupport {
public void configure() {
getContext().getComponent("elsql",
ElsqlComponent.class).setDataSource(db);
- from("direct:start")
-
.to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList")
- .to("log:stream")
- .to("mock:result");
-
- from("direct:withSplit")
-
.to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList")
- .to("log:stream")
- .split(body()).streaming()
- .to("log:row")
- .to("mock:result")
- .end();
-
- from("direct:withSplitModel")
-
.to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList&outputClass=org.apache.camel.component.elsql.Project")
- .to("log:stream")
- .split(body()).streaming()
- .to("log:row")
- .to("mock:result")
- .end();
+
from("direct:start").to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList").to("log:stream").to("mock:result");
+
+
from("direct:withSplit").to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList").to("log:stream").split(body()).streaming().to("log:row")
+ .to("mock:result").end();
+
+
from("direct:withSplitModel").to("elsql:allProjects:elsql/projects.elsql?outputType=StreamList&outputClass=org.apache.camel.component.elsql.Project")
+
.to("log:stream").split(body()).streaming().to("log:row").to("mock:result").end();
}
};
}
-}
\ No newline at end of file
+}
