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
commit 4d426cb2292fe370962ef2f0851fddc34fa68a79
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 23 17:36:21 2019 +0200
Camel-ElSql - Use BindToRegistry annotation where possible
---
.../camel/component/elsql/ElSqlComponentTest.java | 18 ++++--------------
.../elsql/ElSqlConsumerDynamicParameterTest.java | 20 +++++---------------
.../camel/component/elsql/ElSqlConsumerTest.java | 18 ++++--------------
.../camel/component/elsql/ElSqlDataSourceTest.java | 18 ++++--------------
.../component/elsql/ElSqlProducerBatchTest.java | 18 ++++--------------
.../component/elsql/ElSqlProducerBodySimpleTest.java | 18 ++++--------------
.../component/elsql/ElSqlProducerStreamListTest.java | 18 ++++--------------
7 files changed, 29 insertions(+), 99 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 5a8440b..5530bee 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.List;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -31,20 +32,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlComponentTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
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 5e5280e..ca228d8 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.List;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,23 +36,12 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
*/
public class ElSqlConsumerDynamicParameterTest extends CamelTestSupport {
- private EmbeddedDatabase db;
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
+ @BindToRegistry("myIdGenerator")
private MyIdGenerator idGenerator = new MyIdGenerator();
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myIdGenerator", idGenerator);
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
-
@After
public void tearDown() throws Exception {
super.tearDown();
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 8c8e9ca..544bf13 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.List;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,20 +36,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
*/
public class ElSqlConsumerTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@After
public void tearDown() throws Exception {
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 08b47ef..9b88252 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.List;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -31,20 +32,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlDataSourceTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
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 f3b94d0..4c564bb 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sql.SqlConstants;
@@ -32,20 +33,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlProducerBatchTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@After
public void tearDown() throws Exception {
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 d3771f6..dfc9359 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
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sql.SqlConstants;
@@ -34,20 +35,9 @@ import
org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class ElSqlProducerBodySimpleTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testSimpleBody() throws Exception {
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 01d18ca..17dc63d 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
@@ -19,6 +19,7 @@ package org.apache.camel.component.elsql;
import java.util.Iterator;
import java.util.Map;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
@@ -33,20 +34,9 @@ import static org.hamcrest.CoreMatchers.instanceOf;
public class ElSqlProducerStreamListTest extends CamelTestSupport {
- private EmbeddedDatabase db;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
- // this is the database we create with some initial data for our unit
test
- db = new EmbeddedDatabaseBuilder()
-
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
-
- jndi.bind("dataSource", db);
-
- return jndi;
- }
+ @BindToRegistry("dataSource")
+ private EmbeddedDatabase db = new EmbeddedDatabaseBuilder()
+
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
@Test
public void testReturnAnIterator() throws Exception {
