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/07/30 13:42:58 UTC
[camel] branch master updated (1c8e0ed -> 4fa8db7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1c8e0ed CAMEL-7677: advice with - Allow to influence interceptor/onException/onCompletion
new 502f323 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-PGevent
new 4fa8db7 Removed unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../PgEventWithDefinedDatasourceIntegrationTest.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
[camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-PGevent
Posted by ac...@apache.org.
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 502f323233300b5790190649d35d8a52d4cc45ae
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 15:41:32 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-PGevent
---
.../integration/PgEventWithDefinedDatasourceIntegrationTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
index aa04d5d..9da8cb3 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
@@ -20,6 +20,7 @@ import java.util.Properties;
import com.impossibl.postgres.jdbc.PGDataSource;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
@@ -42,8 +43,8 @@ public class PgEventWithDefinedDatasourceIntegrationTest extends AbstractPgEvent
@EndpointInject("mock:result")
private MockEndpoint mockEndpoint;
- @Override
- protected JndiRegistry createRegistry() throws Exception {
+ @BindToRegistry("pgDataSource")
+ public PGDataSource loadDataSource() throws Exception {
Properties properties = new Properties();
properties.load(getClass().getResourceAsStream("/test-options.properties"));
@@ -54,10 +55,8 @@ public class PgEventWithDefinedDatasourceIntegrationTest extends AbstractPgEvent
dataSource.setUser(properties.getProperty("userName"));
dataSource.setPassword(properties.getProperty("password"));
- JndiRegistry registry = super.createRegistry();
- registry.bind("pgDataSource", dataSource);
- return registry;
+ return dataSource;
}
@Test
[camel] 02/02: Removed unused imports
Posted by ac...@apache.org.
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 4fa8db7b94c392d496ae136f1b73eb9a520b0404
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Jul 30 15:41:48 2019 +0200
Removed unused imports
---
.../pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
index 9da8cb3..3737b2a 100644
--- a/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
+++ b/components/camel-pgevent/src/test/java/org/apache/camel/pgevent/integration/PgEventWithDefinedDatasourceIntegrationTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class PgEventWithDefinedDatasourceIntegrationTest extends AbstractPgEventIntegrationTest {