You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/01 12:56:48 UTC
[camel] branch master updated: CAMEL-13801 - camel3 - Use
@BindToRegistry wherever possible, Camel-SQL
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 c75958f CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-SQL
c75958f is described below
commit c75958f7ad5c2e321e2b9cd3c25669bcf6a44b2a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 14:56:27 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-SQL
---
.../camel/component/sql/SqlConsumerDynamicParameterTest.java | 10 +++-------
.../org/apache/camel/component/sql/SqlDataSourceRefTest.java | 10 ++++++----
.../org/apache/camel/component/sql/SqlDataSourceTest.java | 12 +++++++-----
.../org/apache/camel/component/sql/SqlEndpointLikeTest.java | 10 ++++++----
.../sql/SqlProducerAlwaysPopulateStatementFalseTest.java | 10 +++-------
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 9 ++-------
.../apache/camel/component/sql/SqlTransactedRouteTest.java | 6 ++++--
.../camel/component/sql/stored/SqlStoredDataSourceTest.java | 10 ++++++----
8 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
index c6839aa..3918155 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.sql;
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;
@@ -34,6 +35,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class SqlConsumerDynamicParameterTest extends CamelTestSupport {
EmbeddedDatabase db;
+
+ @BindToRegistry("myIdGenerator")
MyIdGenerator idGenerator = new MyIdGenerator();
@Before
@@ -51,13 +54,6 @@ public class SqlConsumerDynamicParameterTest extends CamelTestSupport {
db.shutdown();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myIdGenerator", idGenerator);
- return jndi;
- }
-
@Test
public void testDynamicConsume() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
index 887d91f..a7bf4e9 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
@@ -23,6 +23,8 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Test;
@@ -35,8 +37,8 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
private EmbeddedDatabase db;
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ SimpleRegistry reg = new SimpleRegistry();
// START SNIPPET: e2
// this is the database we create with some initial data for our unit test
@@ -44,9 +46,9 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/createAndPopulateDatabase.sql").build();
// END SNIPPET: e2
- jndi.bind("jdbc/myDataSource", db);
+ reg.bind("jdbc/myDataSource", db);
- return jndi;
+ return reg;
}
@Test
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
index ccd4f7d..8e16c20 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
@@ -23,6 +23,8 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Test;
@@ -35,16 +37,16 @@ public class SqlDataSourceTest extends CamelTestSupport {
private EmbeddedDatabase db;
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
-
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
+
// 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);
+ reg.bind("dataSource", db);
- return jndi;
+ return reg;
}
@Test
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
index 28ab048..f174dea 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
@@ -19,6 +19,8 @@ package org.apache.camel.component.sql;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Test;
@@ -41,13 +43,13 @@ public class SqlEndpointLikeTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
// 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("jdbc/myDataSource", db);
- return jndi;
+ reg.bind("jdbc/myDataSource", db);
+ return reg;
}
@After
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
index 2b27702..66e4c8c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
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;
@@ -36,6 +37,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSupport {
private EmbeddedDatabase db;
+
+ @BindToRegistry("myStrategy")
private SqlPrepareStatementStrategy strategy;
private volatile boolean invoked;
@@ -55,13 +58,6 @@ public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSuppor
super.setUp();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myStrategy", strategy);
- return jndi;
- }
-
@After
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
index 402ed13..b239a96 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
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;
@@ -36,6 +37,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
private EmbeddedDatabase db;
+ @BindToRegistry("myStrategy")
private SqlPrepareStatementStrategy strategy;
private volatile boolean invoked;
@@ -55,13 +57,6 @@ public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
super.setUp();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myStrategy", strategy);
- return jndi;
- }
-
@After
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index 5b61a35..6948519 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Before;
@@ -50,8 +52,8 @@ public class SqlTransactedRouteTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry reg = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
db = new EmbeddedDatabaseBuilder()
.setType(EmbeddedDatabaseType.DERBY).build();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
index 63bce97..ad4e5a6 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/SqlStoredDataSourceTest.java
@@ -20,6 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.After;
import org.junit.Test;
@@ -33,8 +35,8 @@ public class SqlStoredDataSourceTest extends CamelTestSupport {
private EmbeddedDatabase db;
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
// START SNIPPET: e2
// this is the database we create with some initial data for our unit test
@@ -42,9 +44,9 @@ public class SqlStoredDataSourceTest extends CamelTestSupport {
.setType(EmbeddedDatabaseType.DERBY).addScript("sql/storedProcedureTest.sql").build();
// END SNIPPET: e2
- jndi.bind("jdbc/myDataSource", db);
+ reg.bind("jdbc/myDataSource", db);
- return jndi;
+ return reg;
}
@After