You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/11 09:21:18 UTC
[camel] branch master updated: CAMEL-14284: Configuring endpoint
should set properties on endpoint and not configuration object - Debezium
component
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 8e4f1b5 CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Debezium component
8e4f1b5 is described below
commit 8e4f1b56c7fb26a5573eb701dd9414b68497b179
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 11 10:20:47 2019 +0100
CAMEL-14284: Configuring endpoint should set properties on endpoint and not configuration object - Debezium component
---
.../org/apache/camel/component/debezium/DebeziumComponent.java | 7 ++++---
.../java/org/apache/camel/component/debezium/DebeziumEndpoint.java | 5 +++--
.../camel/component/debezium/DebeziumMongodbComponentTest.java | 4 ++++
.../camel/component/debezium/DebeziumMySqlComponentTest.java | 4 ++++
.../camel/component/debezium/DebeziumPostgresComponentTest.java | 4 ++++
.../camel/component/debezium/DebeziumSqlserverComponentTest.java | 4 ++++
6 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
index 33ce9c9..3b48d0a 100644
--- a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
+++ b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumComponent.java
@@ -45,13 +45,14 @@ public abstract class DebeziumComponent<C extends EmbeddedDebeziumConfiguration>
throw new IllegalArgumentException(String.format("Connector name must be configured on endpoint using syntax debezium-%s:name", configuration.getConnectorDatabaseType()));
}
- setProperties(configuration, parameters);
-
// if we have name in path, we override the name in the configuration
if (!ObjectHelper.isEmpty(remaining)) {
configuration.setName(remaining);
}
+ DebeziumEndpoint endpoint = initializeDebeziumEndpoint(uri, configuration);
+ setProperties(endpoint, parameters);
+
// validate configurations
final ConfigurationValidation configurationValidation = configuration.validateConfiguration();
@@ -59,7 +60,7 @@ public abstract class DebeziumComponent<C extends EmbeddedDebeziumConfiguration>
throw new IllegalArgumentException(configurationValidation.getReason());
}
- return initializeDebeziumEndpoint(uri, configuration);
+ return endpoint;
}
protected abstract DebeziumEndpoint initializeDebeziumEndpoint(String uri, C configuration);
diff --git a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumEndpoint.java b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumEndpoint.java
index cb468e4..693eb45 100644
--- a/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumEndpoint.java
+++ b/components/camel-debezium-common/camel-debezium-common-component/src/main/java/org/apache/camel/component/debezium/DebeziumEndpoint.java
@@ -37,7 +37,6 @@ import org.apache.kafka.connect.source.SourceRecord;
*/
public abstract class DebeziumEndpoint<C extends EmbeddedDebeziumConfiguration> extends DefaultEndpoint {
-
protected DebeziumEndpoint(String uri, DebeziumComponent component) {
super(uri, component);
}
@@ -53,7 +52,9 @@ public abstract class DebeziumEndpoint<C extends EmbeddedDebeziumConfiguration>
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- return new DebeziumConsumer(this, processor);
+ DebeziumConsumer consumer = new DebeziumConsumer(this, processor);
+ configureConsumer(consumer);
+ return consumer;
}
public ExecutorService createExecutor() {
diff --git a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
index 1ad1805..abc00f9 100644
--- a/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
+++ b/components/camel-debezium-mongodb/src/test/java/org/apache/camel/component/debezium/DebeziumMongodbComponentTest.java
@@ -45,6 +45,7 @@ public class DebeziumMongodbComponentTest {
+ "databaseServerName=test&databaseHistoryFileName=/test";
final DebeziumComponent debeziumComponent = new DebeziumMongodbComponent(new DefaultCamelContext());
+ debeziumComponent.start();
final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
assertNotNull(debeziumEndpoint);
@@ -72,6 +73,7 @@ public class DebeziumMongodbComponentTest {
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumMongodbComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(configuration);
@@ -96,6 +98,7 @@ public class DebeziumMongodbComponentTest {
final String remaining = "";
final String uri = "debezium:";
final DebeziumComponent debeziumComponent = new DebeziumMongodbComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
@@ -109,6 +112,7 @@ public class DebeziumMongodbComponentTest {
final String remaining = "dummy";
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumMongodbComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
diff --git a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
index 65b1951..e4a2d91 100644
--- a/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
+++ b/components/camel-debezium-mysql/src/test/java/org/apache/camel/component/debezium/DebeziumMySqlComponentTest.java
@@ -46,6 +46,7 @@ public class DebeziumMySqlComponentTest {
+ "databaseServerName=test&databaseHistoryFileName=/test";
final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
+ debeziumComponent.start();
final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
assertNotNull(debeziumEndpoint);
@@ -74,6 +75,7 @@ public class DebeziumMySqlComponentTest {
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(configuration);
@@ -98,6 +100,7 @@ public class DebeziumMySqlComponentTest {
final String remaining = "";
final String uri = "debezium:";
final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
@@ -111,6 +114,7 @@ public class DebeziumMySqlComponentTest {
final String remaining = "dummy";
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumMySqlComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
diff --git a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
index 76878ce..296ead0 100644
--- a/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
+++ b/components/camel-debezium-postgres/src/test/java/org/apache/camel/component/debezium/DebeziumPostgresComponentTest.java
@@ -46,6 +46,7 @@ public class DebeziumPostgresComponentTest {
+ "databaseServerName=test&databaseHistoryFileName=/test";
final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
+ debeziumComponent.start();
final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
assertNotNull(debeziumEndpoint);
@@ -73,6 +74,7 @@ public class DebeziumPostgresComponentTest {
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(configuration);
@@ -97,6 +99,7 @@ public class DebeziumPostgresComponentTest {
final String remaining = "";
final String uri = "debezium:";
final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
@@ -110,6 +113,7 @@ public class DebeziumPostgresComponentTest {
final String remaining = "dummy";
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumPostgresComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
diff --git a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
index ccd5d1a..3dfbfb0 100644
--- a/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
+++ b/components/camel-debezium-sqlserver/src/test/java/org/apache/camel/component/debezium/DebeziumSqlserverComponentTest.java
@@ -46,6 +46,7 @@ public class DebeziumSqlserverComponentTest {
+ "databaseServerName=test&databaseHistoryFileName=/test";
final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
+ debeziumComponent.start();
final DebeziumEndpoint debeziumEndpoint = debeziumComponent.createEndpoint(uri, remaining, params);
assertNotNull(debeziumEndpoint);
@@ -73,6 +74,7 @@ public class DebeziumSqlserverComponentTest {
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(configuration);
@@ -97,6 +99,7 @@ public class DebeziumSqlserverComponentTest {
final String remaining = "";
final String uri = "debezium:";
final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);
@@ -110,6 +113,7 @@ public class DebeziumSqlserverComponentTest {
final String remaining = "dummy";
final String uri = "debezium:dummy";
final DebeziumComponent debeziumComponent = new DebeziumSqlserverComponent(new DefaultCamelContext());
+ debeziumComponent.start();
// set configurations
debeziumComponent.setConfiguration(null);