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 97d80ed CAMEL-13261: Fix consumer configuration, speed up tests run 97d80ed is described below commit 97d80ed430fb17cf1f35294a7d7e7e16375192ae Author: Denis Istomin <istomin....@gmail.com> AuthorDate: Tue Apr 23 20:20:26 2019 +0500 CAMEL-13261: Fix consumer configuration, speed up tests run --- .../org/apache/camel/component/jooq/JooqEndpoint.java | 6 ++++-- .../apache/camel/component/jooq/JooqConsumerTest.java | 16 ++++++++++++++-- .../apache/camel/component/jooq/JooqPlainSQLTest.java | 2 +- .../camel-jooq/src/test/resources/config.properties | 2 ++ components/camel-jooq/src/test/resources/jooq-spring.xml | 2 ++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java index d3bd0ef..e6cff8f 100644 --- a/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java +++ b/components/camel-jooq/src/main/java/org/apache/camel/component/jooq/JooqEndpoint.java @@ -125,8 +125,10 @@ public class JooqEndpoint extends ScheduledPollEndpoint { } @Override - public Consumer createConsumer(Processor processor) { - return new JooqConsumer(this, processor); + public Consumer createConsumer(Processor processor) throws Exception { + JooqConsumer consumer = new JooqConsumer(this, processor); + configureConsumer(consumer); + return consumer; } @Override diff --git a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java index 4b53c92..65f08da 100644 --- a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java +++ b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqConsumerTest.java @@ -31,6 +31,13 @@ import org.junit.Test; public class JooqConsumerTest extends BaseJooqTest { @Test + public void testConsumerConfig() { + JooqConsumer consumer = (JooqConsumer) context.getRoute("consumer-config").getConsumer(); + Assert.assertEquals(1000, consumer.getInitialDelay()); + Assert.assertEquals(2000, consumer.getDelay()); + } + + @Test public void testConsumerNoDelete() throws InterruptedException { MockEndpoint mockResult = getMockEndpoint("mock:resultBookStoreRecord"); MockEndpoint mockInserted = getMockEndpoint("mock:insertedBookStoreRecord"); @@ -76,11 +83,16 @@ public class JooqConsumerTest extends BaseJooqTest { return new RouteBuilder() { @Override public void configure() { + // Only for configuration test + from("jooq://org.apache.camel.component.jooq.db.tables.records.BookRecord?initialDelay=1000&delay=2000") + .id("consumer-config") + .to("log:foo"); + // Book store from("direct:insertBookStoreRecord") .to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord"); - from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?consumeDelete=false") + from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?consumeDelete=false&initialDelay=0&delay=100") .to("mock:insertedBookStoreRecord") .transform() .method(BookStoreRecordBean.class, "select") @@ -91,7 +103,7 @@ public class JooqConsumerTest extends BaseJooqTest { from("direct:insertAuthorRecord") .to("jooq://org.apache.camel.component.jooq.db.tables.records.AuthorRecord"); - from("jooq://org.apache.camel.component.jooq.db.tables.records.AuthorRecord") + from("jooq://org.apache.camel.component.jooq.db.tables.records.AuthorRecord?initialDelay=0&delay=100") .to("mock:insertedAuthorRecord") .transform() .method(BookStoreRecordBean.class, "select") diff --git a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java index c900919..b4f0564 100644 --- a/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java +++ b/components/camel-jooq/src/test/java/org/apache/camel/component/jooq/JooqPlainSQLTest.java @@ -87,7 +87,7 @@ public class JooqPlainSQLTest extends BaseJooqTest { .to("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord/execute?query=delete from book_store x where x.name = 'test'"); // Consumer SQL query - from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?query=select * from book_store x where x.name = 'test'") + from("jooq://org.apache.camel.component.jooq.db.tables.records.BookStoreRecord?query=select * from book_store x where x.name = 'test'&initialDelay=0&delay=100") .to("mock:result"); } }; diff --git a/components/camel-jooq/src/test/resources/config.properties b/components/camel-jooq/src/test/resources/config.properties index 3257548..cdcb681 100644 --- a/components/camel-jooq/src/test/resources/config.properties +++ b/components/camel-jooq/src/test/resources/config.properties @@ -17,6 +17,8 @@ #Database Configuration db.driver=org.hsqldb.jdbcDriver db.url=jdbc:hsqldb:file:target/db;shutdown=true +db.pool.maxActive=50 +db.pool.maxIdle=20 db.username=sa db.password= diff --git a/components/camel-jooq/src/test/resources/jooq-spring.xml b/components/camel-jooq/src/test/resources/jooq-spring.xml index 0d5d744..4aca65a 100644 --- a/components/camel-jooq/src/test/resources/jooq-spring.xml +++ b/components/camel-jooq/src/test/resources/jooq-spring.xml @@ -31,6 +31,8 @@ <property name="driverClassName" value="${db.driver}"/> <property name="username" value="${db.username}"/> <property name="password" value="${db.password}"/> + <property name="maxActive" value="${db.pool.maxActive}" /> + <property name="maxIdle" value="${db.pool.maxIdle}" /> </bean> <bean id="transactionAwareDataSource"