Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Upgrade version of io.debezium #33526

Closed
wants to merge 5 commits into from
Closed

[WIP] Upgrade version of io.debezium #33526

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
526ce3e
Upgrade version of io.debezium
damccorm Jan 7, 2025
d768658
Update exception type
damccorm Jan 7, 2025
1bb59f1
Update version in expected string
damccorm Jan 7, 2025
a70073b
More progress towards update
damccorm Jan 8, 2025
3d77c8a
Upgrade antlr
damccorm Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdks/java/io/debezium/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ dependencies {
permitUnusedDeclared "org.apache.kafka:connect-json:2.5.0" // BEAM-11761

// Debezium dependencies
implementation group: 'io.debezium', name: 'debezium-core', version: '1.3.1.Final'
testImplementation group: 'io.debezium', name: 'debezium-connector-mysql', version: '1.3.1.Final'
testImplementation group: 'io.debezium', name: 'debezium-connector-postgres', version: '1.3.1.Final'
implementation group: 'io.debezium', name: 'debezium-core', version: '1.9.8.Final'
testImplementation group: 'io.debezium', name: 'debezium-connector-mysql', version: '1.9.8.Final'
testImplementation group: 'io.debezium', name: 'debezium-connector-postgres', version: '1.9.8.Final'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion ...ava/io/debezium/src/test/java/org/apache/beam/io/debezium/DebeziumIOMySqlConnectorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public void testDebeziumIOMySql() {
.withMaxNumberOfRecords(30)
.withCoder(StringUtf8Coder.of()));
String expected =
"{\"metadata\":{\"connector\":\"mysql\",\"version\":\"1.3.1.Final\",\"name\":\"dbserver1\","
"{\"metadata\":{\"connector\":\"mysql\",\"version\":\"1.9.8.Final\",\"name\":\"dbserver1\","
+ "\"database\":\"inventory\",\"schema\":\"mysql-bin.000003\",\"table\":\"addresses\"},\"before\":null,"
+ "\"after\":{\"fields\":{\"zip\":\"76036\",\"city\":\"Euless\","
+ "\"street\":\"3183 Moore Avenue\",\"id\":10,\"state\":\"Texas\",\"customer_id\":1001,"
Expand Down
14 changes: 7 additions & 7 deletions ...o/debezium/src/test/java/org/apache/beam/io/debezium/DebeziumReadSchemaTransformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertThrows;

import io.debezium.DebeziumException;
import java.time.Duration;
import java.util.Arrays;
import java.util.stream.Collectors;
Expand All @@ -28,7 +29,6 @@
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionRowTuple;
import org.apache.beam.sdk.values.Row;
import org.apache.kafka.connect.errors.ConnectException;
import org.hamcrest.Matchers;
import org.junit.ClassRule;
import org.junit.Test;
Expand Down Expand Up @@ -130,9 +130,9 @@ public void testNoProblem() {
@Test
public void testWrongUser() {
Pipeline readPipeline = Pipeline.create();
ConnectException ex =
DebeziumException ex =
assertThrows(
ConnectException.class,
DebeziumException.class,
() -> {
PCollectionRowTuple.empty(readPipeline)
.apply(
Expand All @@ -151,9 +151,9 @@ public void testWrongUser() {
@Test
public void testWrongPassword() {
Pipeline readPipeline = Pipeline.create();
ConnectException ex =
DebeziumException ex =
assertThrows(
ConnectException.class,
DebeziumException.class,
() -> {
PCollectionRowTuple.empty(readPipeline)
.apply(
Expand All @@ -172,9 +172,9 @@ public void testWrongPassword() {
@Test
public void testWrongPort() {
Pipeline readPipeline = Pipeline.create();
ConnectException ex =
DebeziumException ex =
assertThrows(
ConnectException.class,
DebeziumException.class,
() -> {
PCollectionRowTuple.empty(readPipeline)
.apply(makePtransform(userName, password, database, 12345, "localhost"))
Expand Down
1 change: 0 additions & 1 deletion ...ogle-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubGrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.beam.sdk.io.gcp.pubsub;

import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't used in this file and keeps getting removed by my linter, including it here.

import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkState;

import com.google.auth.Credentials;
Expand Down
Loading