jprdonnelly/airbyte
1
0
Fork 0
mirror of synced 2025-12-25 02:09:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "Ensure no file change" build issue. Only checkstyle changes, no logic chnages (#17885)

Browse Source
This commit is contained in:
Eugene
2022-10-12 15:06:28 +03:00
committed by GitHub
parent 0abeff9289
commit 33dfd5d6be
130 changed files with 4836 additions and 6725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java
View File

@@ -48,7 +48,6 @@ import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;

3
airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSourceOperations.java
View File

@@ -30,7 +30,6 @@ import static com.mysql.cj.MysqlType.TINYINT_UNSIGNED;
import static com.mysql.cj.MysqlType.TINYTEXT;
import static com.mysql.cj.MysqlType.VARCHAR;
import static com.mysql.cj.MysqlType.YEAR;
import static io.airbyte.db.DataTypeUtils.TIME_FORMATTER;
import static io.airbyte.db.jdbc.JdbcConstants.INTERNAL_COLUMN_NAME;
import static io.airbyte.db.jdbc.JdbcConstants.INTERNAL_COLUMN_SIZE;
import static io.airbyte.db.jdbc.JdbcConstants.INTERNAL_COLUMN_TYPE;
@@ -44,7 +43,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.mysql.cj.MysqlType;
import com.mysql.cj.jdbc.result.ResultSetMetaData;
import com.mysql.cj.result.Field;
import io.airbyte.commons.json.Jsons;
import io.airbyte.db.DataTypeUtils;
import io.airbyte.db.SourceOperations;
import io.airbyte.db.jdbc.AbstractJdbcCompatibleSourceOperations;
@@ -58,7 +56,6 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.format.DateTimeParseException;
import java.util.Collections;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/helpers/CdcConfigurationHelper.java
View File

@@ -22,8 +22,8 @@ import org.slf4j.LoggerFactory;
* 2. checking whether binlog required from saved cdc offset is available on mysql server
* #checkBinlog method
* </p>
* 3. configuring initial CDC wait time. TODO : There is a lot of shared logic for this functionality
* between MySQL and Postgres. Refactor it to reduce code de-duplication.
* 3. configuring initial CDC wait time. TODO : There is a lot of shared logic for this
* functionality between MySQL and Postgres. Refactor it to reduce code de-duplication.
*/
public class CdcConfigurationHelper {

2
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractMySqlSourceDatatypeTest.java
View File

@@ -279,7 +279,7 @@ public abstract class AbstractMySqlSourceDatatypeTest extends AbstractSourceData
.fullSourceDataType(fullSourceType)
.airbyteType(JsonSchemaType.STRING_TIME_WITHOUT_TIMEZONE)
// JDBC driver can process only "clock"(00:00:00-23:59:59) values.
.addInsertValues("'-22:59:59'","'23:59:59'", "'00:00:00'")
.addInsertValues("'-22:59:59'", "'23:59:59'", "'00:00:00'")
.addExpectedValues("22:59:59.000000", "23:59:59.000000", "00:00:00.000000")
.build());

4
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractMySqlSslCertificateSourceAcceptanceTest.java
View File

@@ -33,8 +33,8 @@ public abstract class AbstractMySqlSslCertificateSourceAcceptanceTest extends My
var sslMode = getSslConfig();
final JsonNode replicationMethod = Jsons.jsonNode(ImmutableMap.builder()
.put("method", "STANDARD")
.build());
.put("method", "STANDARD")
.build());
config = Jsons.jsonNode(ImmutableMap.builder()
.put(JdbcUtils.HOST_KEY, container.getHost())
.put(JdbcUtils.PORT_KEY, container.getFirstMappedPort())

1
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshMySqlSourceAcceptanceTest.java
View File

@@ -89,4 +89,5 @@ public abstract class AbstractSshMySqlSourceAcceptanceTest extends SourceAccepta
protected boolean supportsPerStream() {
return true;
}
}

4
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcBinlogsMySqlSourceDatatypeTest.java
View File

@@ -84,8 +84,8 @@ public class CdcBinlogsMySqlSourceDatatypeTest extends AbstractMySqlSourceDataty
container = new MySQLContainer<>("mysql:8.0");
container.start();
final JsonNode replicationMethod = Jsons.jsonNode(ImmutableMap.builder()
.put("method", "CDC")
.put("initial_waiting_seconds", INITIAL_CDC_WAITING_SECONDS)
.put("method", "CDC")
.put("initial_waiting_seconds", INITIAL_CDC_WAITING_SECONDS)
.build());
config = Jsons.jsonNode(ImmutableMap.builder()
.put(JdbcUtils.HOST_KEY, container.getHost())

1
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcInitialSnapshotMySqlSourceDatatypeTest.java
View File

@@ -21,6 +21,7 @@ import org.testcontainers.containers.MySQLContainer;
public class CdcInitialSnapshotMySqlSourceDatatypeTest extends AbstractMySqlSourceDatatypeTest {
private DSLContext dslContext;
@Override
protected void tearDown(final TestDestinationEnv testEnv) {
dslContext.close();

4
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcMySqlSslCaCertificateSourceAcceptanceTest.java
View File

@@ -111,8 +111,8 @@ public class CdcMySqlSslCaCertificateSourceAcceptanceTest extends SourceAcceptan
.put("client_key_password", "Passw0rd")
.build();
final JsonNode replicationMethod = Jsons.jsonNode(ImmutableMap.builder()
.put("method", "CDC")
.put("initial_waiting_seconds", INITIAL_CDC_WAITING_SECONDS)
.put("method", "CDC")
.put("initial_waiting_seconds", INITIAL_CDC_WAITING_SECONDS)
.build());
config = Jsons.jsonNode(ImmutableMap.builder()

4
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MySqlSslSourceAcceptanceTest.java
View File

@@ -23,8 +23,8 @@ public class MySqlSslSourceAcceptanceTest extends MySqlSourceAcceptanceTest {
container = new MySQLContainer<>("mysql:8.0");
container.start();
final JsonNode replicationMethod = Jsons.jsonNode(ImmutableMap.builder()
.put("method", "STANDARD")
.build());
.put("method", "STANDARD")
.build());
var sslMode = ImmutableMap.builder()
.put(JdbcUtils.MODE_KEY, "required")

5
airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/utils/TestConstants.java
View File

@@ -1,6 +1,11 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/
package io.airbyte.integrations.io.airbyte.integration_tests.sources.utils;
public class TestConstants {
public static final int INITIAL_CDC_WAITING_SECONDS = 5;
}

4
airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/CdcConfigurationHelperTest.java
View File

@@ -1,3 +1,7 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/
package io.airbyte.integrations.source.mysql;
import static io.airbyte.integrations.source.mysql.helpers.CdcConfigurationHelper.MAX_FIRST_RECORD_WAIT_TIME;

4
airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlJdbcSourceAcceptanceTest.java
View File

@@ -161,7 +161,8 @@ class MySqlJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
((ObjectNode) config).put(JdbcUtils.USERNAME_KEY, "fake");
final AirbyteConnectionStatus status = source.check(config);
assertEquals(AirbyteConnectionStatus.Status.FAILED, status.getStatus());
// do not test for message since there seems to be flakiness where sometimes the test will get the message with
// do not test for message since there seems to be flakiness where sometimes the test will get the
// message with
// State code: 08001 or State code: 28000
}
@@ -293,5 +294,4 @@ class MySqlJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
return true;
}
}