Skip to content

Commit 7d46e88

Browse files
authored
CAMEL-22796: camel-debezium - Upgrade to dbz 3.4.0 (#20577)
1 parent a9725c6 commit 7d46e88

File tree

53 files changed

+2723
-2251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2723
-2251
lines changed

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json

Lines changed: 142 additions & 140 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json

Lines changed: 132 additions & 130 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json

Lines changed: 196 additions & 194 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json

Lines changed: 248 additions & 246 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json

Lines changed: 192 additions & 190 deletions
Large diffs are not rendered by default.

catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json

Lines changed: 160 additions & 158 deletions
Large diffs are not rendered by default.

components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/GenerateConnectorConfigMojo.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,23 @@
3535

3636
@Mojo(name = "generate-connector-config", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
3737
public class GenerateConnectorConfigMojo extends AbstractMojo {
38+
3839
@Parameter(defaultValue = "${project.build.directory}/generated-sources/connector-configurations")
3940
private File generatedSrcDir;
4041

4142
/**
4243
* Debezium connector's class name, this has to be fully name with the package, e.g:
4344
* 'io.debezium.connector.mysql.MySqlConnector'
4445
*/
45-
@Parameter(
46-
property = "camel.debezium.connector.class",
46+
@Parameter(property = "camel.debezium.connector.class",
4747
required = true)
4848
private String connectorClassName;
4949

5050
/**
5151
* Debezium connector's config class name, this has to be fully name with the package, e.g:
5252
* 'io.debezium.connector.mysql.MySqlConnectorConfig'
5353
*/
54-
@Parameter(
55-
property = "camel.debezium.connector.config.class",
54+
@Parameter(property = "camel.debezium.connector.config.class",
5655
required = true)
5756
private String connectorConfigClassName;
5857

components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigField.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ public String getDefaultValueAsStringLiteral() {
8080
|| fieldDef.type() == ConfigDef.Type.CLASS && defaultValue instanceof Class) {
8181
defaultValue = ConfigDef.convertToString(defaultValue, fieldDef.type());
8282
}
83-
return String.format("\"%s\"", defaultValue);
83+
// its converted to a string so we need to escape \. as \\.
84+
String answer = String.format("\"%s\"", defaultValue);
85+
answer = answer.replace("\\.", "\\\\.");
86+
return answer;
8487
}
8588

8689
public String getDefaultValueAsString() {
@@ -161,14 +164,20 @@ private String getDefaultValueWrappedInString(final ConfigDef.ConfigKey field) {
161164
if (defaultValue == null) {
162165
return null;
163166
}
167+
String answer;
164168
if (fieldDef.type() == ConfigDef.Type.LIST
165169
|| fieldDef.type() == ConfigDef.Type.CLASS && defaultValue instanceof Class) {
166-
return String.format("\"%s\"", ConfigDef.convertToString(defaultValue, fieldDef.type()));
170+
answer = String.format("\"%s\"", ConfigDef.convertToString(defaultValue, fieldDef.type()));
167171
} else if (field.type() == ConfigDef.Type.STRING || field.type() == ConfigDef.Type.PASSWORD
168172
|| field.type() == ConfigDef.Type.CLASS) {
169-
return String.format("\"%s\"", defaultValue);
173+
answer = String.format("\"%s\"", defaultValue);
174+
} else {
175+
answer = defaultValue.toString();
176+
170177
}
171-
return defaultValue.toString();
178+
// its converted to a string so we need to escape \. as \\.
179+
answer = answer.replace("\\.", "\\\\.");
180+
return answer;
172181
}
173182

174183
private String removeNonAsciiChars(final String text) {

components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/src/main/java/org/apache/camel/maven/config/ConnectorConfigGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private ConnectorConfigGenerator(final SourceConnector connector, final Map<Stri
6363
/**
6464
* @deprecated use {@link #create(SourceConnector, Class, String)} instead
6565
*/
66-
@Deprecated(since = "3.9.0", forRemoval = true)
66+
@Deprecated(since = "4.9.0", forRemoval = true)
6767
public static ConnectorConfigGenerator create(
6868
final SourceConnector connector, final Class<?> dbzConfigClass) {
6969
return create(connector, dbzConfigClass, null, Collections.emptySet(), Collections.emptyMap());
@@ -77,7 +77,7 @@ public static ConnectorConfigGenerator create(
7777
/**
7878
* @deprecated use {@link #create(SourceConnector, Class, String, Set)} instead
7979
*/
80-
@Deprecated(since = "3.9.0", forRemoval = true)
80+
@Deprecated(since = "4.9.0", forRemoval = true)
8181
public static ConnectorConfigGenerator create(
8282
final SourceConnector connector, final Class<?> dbzConfigClass,
8383
final Set<String> requiredFields) {
@@ -93,7 +93,7 @@ public static ConnectorConfigGenerator create(
9393
/**
9494
* @deprecated use {@link #create(SourceConnector, Class, String, Map)} instead
9595
*/
96-
@Deprecated(since = "3.9.0", forRemoval = true)
96+
@Deprecated(since = "4.9.0", forRemoval = true)
9797
public static ConnectorConfigGenerator create(
9898
final SourceConnector connector, final Class<?> dbzConfigClass,
9999
final Map<String, Object> overriddenDefaultValues) {

components/camel-debezium/camel-debezium-db2/src/generated/java/org/apache/camel/component/debezium/db2/DebeziumDb2ComponentConfigurer.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
5252
case "converters": getOrCreateConfiguration(target).setConverters(property(camelContext, java.lang.String.class, value)); return true;
5353
case "custommetrictags":
5454
case "customMetricTags": getOrCreateConfiguration(target).setCustomMetricTags(property(camelContext, java.lang.String.class, value)); return true;
55+
case "customsanitizepattern":
56+
case "customSanitizePattern": getOrCreateConfiguration(target).setCustomSanitizePattern(property(camelContext, java.lang.String.class, value)); return true;
5557
case "databasedbname":
5658
case "databaseDbname": getOrCreateConfiguration(target).setDatabaseDbname(property(camelContext, java.lang.String.class, value)); return true;
5759
case "databasehostname":
@@ -241,6 +243,8 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
241243
case "converters": return java.lang.String.class;
242244
case "custommetrictags":
243245
case "customMetricTags": return java.lang.String.class;
246+
case "customsanitizepattern":
247+
case "customSanitizePattern": return java.lang.String.class;
244248
case "databasedbname":
245249
case "databaseDbname": return java.lang.String.class;
246250
case "databasehostname":
@@ -431,6 +435,8 @@ public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
431435
case "converters": return getOrCreateConfiguration(target).getConverters();
432436
case "custommetrictags":
433437
case "customMetricTags": return getOrCreateConfiguration(target).getCustomMetricTags();
438+
case "customsanitizepattern":
439+
case "customSanitizePattern": return getOrCreateConfiguration(target).getCustomSanitizePattern();
434440
case "databasedbname":
435441
case "databaseDbname": return getOrCreateConfiguration(target).getDatabaseDbname();
436442
case "databasehostname":

0 commit comments

Comments
 (0)