From 013a886f4f48d4d170a95d7b1e65425ff0403606 Mon Sep 17 00:00:00 2001 From: Topher Lubaway Date: Fri, 20 May 2022 07:26:55 -0500 Subject: [PATCH] Fixes Spotless and runs spotless (#13040) zipped files with JSON extension made this task sad --- ...estinationStrictEncryptAcceptanceTest.java | 4 +- .../ClickhouseDestinationAcceptanceTest.java | 7 ++- .../ClickhouseTestDataComparator.java | 30 ++++++----- ...shClickhouseDestinationAcceptanceTest.java | 7 +-- .../clickhouse/ClickhouseDestinationTest.java | 4 +- .../destination/gcs/GcsStorageOperations.java | 1 + .../jdbc/AbstractJdbcDestination.java | 6 +-- .../staging/StagingConsumerFactory.java | 3 +- .../jdbc/SqlOperationsUtilsTest.java | 4 +- ...bColumnstoreDestinationAcceptanceTest.java | 4 +- ...bColumnstoreDestinationAcceptanceTest.java | 3 +- ...trictEncryptDestinationAcceptanceTest.java | 22 ++++---- .../mssql/MSSQLDestinationAcceptanceTest.java | 7 +-- .../MSSQLDestinationAcceptanceTestSSL.java | 21 ++++---- .../SshMSSQLDestinationAcceptanceTest.java | 5 +- ...trictEncryptDestinationAcceptanceTest.java | 3 +- .../NneOracleDestinationAcceptanceTest.java | 8 +-- .../SshOracleDestinationAcceptanceTest.java | 3 +- ...ryptedOracleDestinationAcceptanceTest.java | 7 +-- .../SshPostgresDestinationAcceptanceTest.java | 4 +- .../redshift/RedshiftDestination.java | 4 +- .../RedshiftStagingS3Destination.java | 10 ++-- ...iftStagingS3DestinationAcceptanceTest.java | 8 ++- .../s3/AesCbcEnvelopeEncryption.java | 7 ++- ...AesCbcEnvelopeEncryptionBlobDecorator.java | 50 ++++++++++++------- .../destination/s3/BlobDecorator.java | 20 +++++--- .../destination/s3/EncryptionConfig.java | 11 +++- .../destination/s3/NoEncryption.java | 4 ++ .../s3/util/CompressionTypeHelper.java | 3 +- .../StreamTransferManagerWithMetadata.java | 11 +++- ...bcEnvelopeEncryptionBlobDecoratorTest.java | 36 ++++++------- .../destination/s3/BlobDecoratorTest.java | 20 ++++---- .../ScyllaDestinationAcceptanceTest.java | 5 +- .../source/bigquery/BigQuerySource.java | 1 + ...StrictEncryptJdbcSourceAcceptanceTest.java | 4 +- ...ractSshClickHouseSourceAcceptanceTest.java | 5 +- ...ockroachDbEncryptSourceAcceptanceTest.java | 5 +- .../source/cockroachdb/CockroachDbSource.java | 3 +- .../CockroachDbSourceAcceptanceTest.java | 5 +- .../CockroachDbSourceDatatypeTest.java | 5 +- .../CockroachDbJdbcSourceAcceptanceTest.java | 4 +- .../cockroachdb/CockroachDbSourceTest.java | 5 +- .../Db2StrictEncryptSource.java | 1 - ...ncryptSourceCertificateAcceptanceTest.java | 4 +- .../sources/Db2SourceAcceptanceTest.java | 3 +- .../Db2SourceCertificateAcceptanceTest.java | 3 +- .../sources/Db2SourceDatatypeTest.java | 5 +- .../source/jdbc/AbstractJdbcSource.java | 8 ++- .../jdbc/JdbcSourceSourceAcceptanceTest.java | 3 +- .../jdbc/test/JdbcSourceAcceptanceTest.java | 11 ++-- .../source/jdbc/test/JdbcStressTest.java | 9 ++-- .../MongoDbSource.java | 1 + .../MongoDbSourceAtlasAcceptanceTest.java | 1 - ...MongoDbSourceStandaloneAcceptanceTest.java | 1 - ...ssqlStrictEncryptSourceAcceptanceTest.java | 5 +- ...StrictEncryptJdbcSourceAcceptanceTest.java | 6 +-- .../AbstractSshMssqlSourceAcceptanceTest.java | 5 +- .../mssql/CdcMssqlSourceAcceptanceTest.java | 3 +- .../mssql/CdcMssqlSourceDatatypeTest.java | 16 +++--- .../mssql/MssqlRdsSourceAcceptanceTest.java | 6 +-- .../mssql/MssqlSourceAcceptanceTest.java | 5 +- .../source/mssql/MssqlSourceDatatypeTest.java | 5 +- .../SslEnabledMssqlSourceAcceptanceTest.java | 3 +- .../source/mssql/CdcMssqlSourceTest.java | 15 +++--- ...ySqlStrictEncryptSourceAcceptanceTest.java | 5 +- ...StrictEncryptJdbcSourceAcceptanceTest.java | 3 +- .../mysql/CdcMySqlSourceAcceptanceTest.java | 4 +- .../mysql/CdcMySqlSourceDatatypeTest.java | 6 ++- .../mysql/MySqlSourceAcceptanceTest.java | 3 +- .../source/mysql/MySqlSourceDatatypeTest.java | 3 +- .../mysql/MySqlSslSourceAcceptanceTest.java | 3 +- .../mysql/FillMySqlTestDbScriptTest.java | 3 +- .../MySqlSslJdbcSourceAcceptanceTest.java | 4 +- .../source/mysql/MySqlStressTest.java | 3 +- .../OracleSourceNneAcceptanceTest.java | 8 +-- ...acleStrictEncryptSourceAcceptanceTest.java | 4 +- ...AbstractSshOracleSourceAcceptanceTest.java | 2 +- .../oracle/OracleSourceDatatypeTest.java | 3 +- .../oracle/OracleSourceNneAcceptanceTest.java | 11 ++-- ...gresSourceStrictEncryptAcceptanceTest.java | 3 +- ...stractSshPostgresSourceAcceptanceTest.java | 3 +- .../CdcPostgresSourceAcceptanceTest.java | 3 +- .../CdcPostgresSourceDatatypeTest.java | 4 +- .../sources/PostgresSourceAcceptanceTest.java | 3 +- .../sources/PostgresSourceDatatypeTest.java | 4 +- .../FillPostgresTestDbScriptTest.java | 3 +- .../postgres/CdcPostgresSourceTest.java | 7 ++- .../postgres/PostgresSourceSSLTest.java | 43 ++++++++-------- .../source/postgres/PostgresSourceTest.java | 8 +-- .../sources/RedshiftSourceAcceptanceTest.java | 4 +- .../RedshiftSslSourceAcceptanceTest.java | 4 +- .../SnowflakeSourceAcceptanceTest.java | 3 +- .../sources/SnowflakeSourceDatatypeTest.java | 1 - .../source/tidb/TiDBSourceAcceptanceTest.java | 3 +- build.gradle | 1 + 95 files changed, 327 insertions(+), 333 deletions(-) diff --git a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java index f9822772d1d8d..de97c642e85f4 100644 --- a/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationStrictEncryptAcceptanceTest.java @@ -137,9 +137,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { config.get("username").asText(), config.has("password") ? config.get("password").asText() : null, ClickhouseDestination.DRIVER_CLASS, - jdbcStr - ) - ); + jdbcStr)); } @Override diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java index 1166411612c40..c98713f52516c 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationAcceptanceTest.java @@ -15,10 +15,10 @@ import io.airbyte.integrations.base.JavaBaseConstants; import io.airbyte.integrations.destination.ExtendedNameTransformer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.sql.SQLException; import java.util.List; import java.util.stream.Collectors; -import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import org.junit.jupiter.api.Disabled; import org.testcontainers.containers.ClickHouseContainer; @@ -136,9 +136,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { String.format(DatabaseDriver.CLICKHOUSE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); } @Override @@ -197,4 +195,5 @@ public void testSyncWithNormalization(final String messagesFilename, final Strin public void specNormalizationValueShouldBeCorrect() throws Exception { super.specNormalizationValueShouldBeCorrect(); } + } diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseTestDataComparator.java b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseTestDataComparator.java index df27099930971..ee620f16ec7cc 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseTestDataComparator.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/ClickhouseTestDataComparator.java @@ -1,25 +1,29 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.clickhouse; import io.airbyte.integrations.destination.ExtendedNameTransformer; import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; - import java.util.ArrayList; import java.util.List; public class ClickhouseTestDataComparator extends AdvancedTestDataComparator { - private final ExtendedNameTransformer namingResolver = new ExtendedNameTransformer(); + private final ExtendedNameTransformer namingResolver = new ExtendedNameTransformer(); - @Override - protected List resolveIdentifier(final String identifier) { - final List result = new ArrayList<>(); - final String resolved = namingResolver.getIdentifier(identifier); - result.add(identifier); - result.add(resolved); - if (!resolved.startsWith("\"")) { - result.add(resolved.toLowerCase()); - result.add(resolved.toUpperCase()); - } - return result; + @Override + protected List resolveIdentifier(final String identifier) { + final List result = new ArrayList<>(); + final String resolved = namingResolver.getIdentifier(identifier); + result.add(identifier); + result.add(resolved); + if (!resolved.startsWith("\"")) { + result.add(resolved.toLowerCase()); + result.add(resolved.toUpperCase()); } + return result; + } + } diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java index eeb4bd757ac2c..e42778b82c370 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test-integration/java/io/airbyte/integrations/destination/clickhouse/SshClickhouseDestinationAcceptanceTest.java @@ -16,11 +16,10 @@ import io.airbyte.integrations.base.ssh.SshTunnel; import io.airbyte.integrations.destination.ExtendedNameTransformer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; - -import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import org.junit.jupiter.api.Disabled; import org.testcontainers.containers.ClickHouseContainer; @@ -154,9 +153,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { String.format(DatabaseDriver.CLICKHOUSE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); } @Override diff --git a/airbyte-integrations/connectors/destination-clickhouse/src/test/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationTest.java b/airbyte-integrations/connectors/destination-clickhouse/src/test/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationTest.java index 765acaef02c18..49bedd273a493 100644 --- a/airbyte-integrations/connectors/destination-clickhouse/src/test/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationTest.java +++ b/airbyte-integrations/connectors/destination-clickhouse/src/test/java/io/airbyte/integrations/destination/clickhouse/ClickhouseDestinationTest.java @@ -134,9 +134,7 @@ void sanityTest() throws Exception { String.format("jdbc:clickhouse://%s:%s/%s", config.get("host").asText(), config.get("port").asText(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); final List actualRecords = database.bufferedResultSetQuery( connection -> connection.createStatement().executeQuery( diff --git a/airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsStorageOperations.java b/airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsStorageOperations.java index ec3b9022b2193..7ea0b80b8c42e 100644 --- a/airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsStorageOperations.java +++ b/airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsStorageOperations.java @@ -49,4 +49,5 @@ protected void cleanUpObjects(final String bucket, final List keysTo protected Map getMetadataMapping() { return new HashMap<>(); } + } diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/AbstractJdbcDestination.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/AbstractJdbcDestination.java index 7c866711c4d5a..7bbe227376922 100644 --- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/AbstractJdbcDestination.java +++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/AbstractJdbcDestination.java @@ -100,8 +100,7 @@ protected DataSource getDataSource(final JsonNode config) { jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, driverClass, jdbcConfig.get("jdbc_url").asText(), - getConnectionProperties(config) - ); + getConnectionProperties(config)); } protected JdbcDatabase getDatabase(final DataSource dataSource) { @@ -132,7 +131,8 @@ private void assertCustomParametersDontOverwriteDefaultParameters(final Map outputRecordCollector) { - return JdbcBufferedConsumerFactory.create(outputRecordCollector, getDatabase(getDataSource(config)), sqlOperations, namingResolver, config, catalog); + return JdbcBufferedConsumerFactory.create(outputRecordCollector, getDatabase(getDataSource(config)), sqlOperations, namingResolver, config, + catalog); } } diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java index 469b53f205f30..031d5a0f4a241 100644 --- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java +++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java @@ -212,7 +212,8 @@ private OnCloseFunction onCloseFunction(final JdbcDatabase database, } queryList.add(stagingOperations.copyTableQuery(database, schemaName, srcTableName, dstTableName)); } - stagingOperations.onDestinationCloseOperations(database, writeConfigs.stream().map(WriteConfig::getOutputSchemaName).collect(Collectors.toSet())); + stagingOperations.onDestinationCloseOperations(database, + writeConfigs.stream().map(WriteConfig::getOutputSchemaName).collect(Collectors.toSet())); LOGGER.info("Executing finalization of tables."); stagingOperations.executeTransaction(database, queryList); LOGGER.info("Finalizing tables in destination completed."); diff --git a/airbyte-integrations/connectors/destination-jdbc/src/test/java/io/airbyte/integrations/destination/jdbc/SqlOperationsUtilsTest.java b/airbyte-integrations/connectors/destination-jdbc/src/test/java/io/airbyte/integrations/destination/jdbc/SqlOperationsUtilsTest.java index a497ed32b57aa..6b7e668ed568c 100644 --- a/airbyte-integrations/connectors/destination-jdbc/src/test/java/io/airbyte/integrations/destination/jdbc/SqlOperationsUtilsTest.java +++ b/airbyte-integrations/connectors/destination-jdbc/src/test/java/io/airbyte/integrations/destination/jdbc/SqlOperationsUtilsTest.java @@ -53,9 +53,7 @@ void setup() { config.get("username").asText(), config.get("password").asText(), DatabaseDriver.POSTGRESQL.getDriverClassName(), - config.get("jdbc_url").asText() - ) - ); + config.get("jdbc_url").asText())); uuidSupplier = mock(Supplier.class); } diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java index d755925e4cc95..130eb81da2753 100644 --- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java @@ -111,9 +111,7 @@ private static JdbcDatabase getDatabase(final JsonNode config) { String.format(DatabaseDriver.MARIADB.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); } @Override diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java index 3b450643c706e..9bf1686c021bf 100644 --- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/SshMariadbColumnstoreDestinationAcceptanceTest.java @@ -111,7 +111,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) { String.format(DatabaseDriver.MARIADB.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.MARIADB); + config.get("database").asText()), + SQLDialect.MARIADB); return new Database(dslContext); } diff --git a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java index 50fdb56d3042c..cecb294d5233c 100644 --- a/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mssql_strict_encrypt/MssqlStrictEncryptDestinationAcceptanceTest.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.stream.Collectors; import org.jooq.DSLContext; -import org.jooq.SQLDialect; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -128,15 +127,15 @@ protected List resolveIdentifier(final String identifier) { private List retrieveRecordsFromTable(final String tableName, final String schemaName) throws SQLException { final DSLContext dslContext = DatabaseConnectionHelper.createDslContext(db, null); return new Database(dslContext).query( - ctx -> { - ctx.fetch(String.format("USE %s;", config.get("database"))); - return ctx - .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT)) - .stream() - .map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat())) - .map(Jsons::deserialize) - .collect(Collectors.toList()); - }); + ctx -> { + ctx.fetch(String.format("USE %s;", config.get("database"))); + return ctx + .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT)) + .stream() + .map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat())) + .map(Jsons::deserialize) + .collect(Collectors.toList()); + }); } private static DSLContext getDslContext(final JsonNode config) { @@ -146,7 +145,8 @@ private static DSLContext getDslContext(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java index 825921fc292db..8fe1ca5629d6c 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTest.java @@ -10,12 +10,12 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.commons.string.Strings; import io.airbyte.db.Database; +import io.airbyte.db.factory.DSLContextFactory; +import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.JavaBaseConstants; import io.airbyte.integrations.destination.ExtendedNameTransformer; import io.airbyte.integrations.standardtest.destination.JdbcDestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; -import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.test.utils.DatabaseConnectionHelper; import java.sql.SQLException; import java.util.List; @@ -125,7 +125,8 @@ private static DSLContext getDslContext(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java index cc8c68308587e..b9406b2eaa777 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/MSSQLDestinationAcceptanceTestSSL.java @@ -126,15 +126,15 @@ protected List resolveIdentifier(final String identifier) { private List retrieveRecordsFromTable(final String tableName, final String schemaName) throws SQLException { final DSLContext dslContext = DatabaseConnectionHelper.createDslContext(db, SQLDialect.DEFAULT); return new Database(dslContext).query( - ctx -> { - ctx.fetch(String.format("USE %s;", config.get("database"))); - return ctx - .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT)) - .stream() - .map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat())) - .map(Jsons::deserialize) - .collect(Collectors.toList()); - }); + ctx -> { + ctx.fetch(String.format("USE %s;", config.get("database"))); + return ctx + .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT)) + .stream() + .map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat())) + .map(Jsons::deserialize) + .collect(Collectors.toList()); + }); } @BeforeAll @@ -151,7 +151,8 @@ private static DSLContext getDslContext(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java index 1780fed4798af..54c754db65555 100644 --- a/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-mssql/src/test-integration/java/io/airbyte/integrations/destination/mssql/SshMSSQLDestinationAcceptanceTest.java @@ -11,7 +11,6 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.db.jdbc.JdbcUtils; import io.airbyte.integrations.base.JavaBaseConstants; @@ -23,7 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.sql.DataSource; import org.apache.commons.lang3.RandomStringUtils; import org.jooq.DSLContext; import org.testcontainers.containers.JdbcDatabaseContainer; @@ -130,7 +128,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%s", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); return new Database(dslContext); } diff --git a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java index a9bcfcd40a0ed..dbd2f55842345 100644 --- a/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/oracle_strict_encrypt/OracleStrictEncryptDestinationAcceptanceTest.java @@ -141,7 +141,8 @@ private static DSLContext getDslContext(final JsonNode config) { String.format(DatabaseDriver.ORACLE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("sid").asText()), null); + config.get("sid").asText()), + null); } @Override diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/NneOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/NneOracleDestinationAcceptanceTest.java index cb8c9200873d7..998f3c04c8887 100644 --- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/NneOracleDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/NneOracleDestinationAcceptanceTest.java @@ -41,9 +41,7 @@ public void testEncryption() throws SQLException { config.get("host").asText(), config.get("port").asInt(), config.get("sid").asText()), - getAdditionalProperties(algorithm) - ) - ); + getAdditionalProperties(algorithm))); final String networkServiceBanner = "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)"; @@ -78,9 +76,7 @@ public void testCheckProtocol() throws SQLException { clone.get("host").asText(), clone.get("port").asInt(), clone.get("sid").asText()), - getAdditionalProperties(algorithm) - ) - ); + getAdditionalProperties(algorithm))); final String networkServiceBanner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual"; final List collect = database.queryJsons(networkServiceBanner); diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java index 048f1d4773f8d..6df5846130a19 100644 --- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java @@ -162,7 +162,8 @@ private Database getDatabaseFromConfig(final JsonNode config) { String.format(DatabaseDriver.ORACLE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("sid").asText()), null); + config.get("sid").asText()), + null); return new Database(dslContext); } diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java index 7832949c8c07c..4825b35373b7f 100644 --- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java @@ -124,8 +124,8 @@ private List retrieveRecordsFromTable(final String tableName, final St try (final DSLContext dslContext = getDSLContext(config)) { final List result = getDatabase(dslContext) .query(ctx -> ctx.fetch( - String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName, - OracleDestination.COLUMN_NAME_EMITTED_AT)) + String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName, + OracleDestination.COLUMN_NAME_EMITTED_AT)) .stream() .collect(Collectors.toList())); return result @@ -142,7 +142,8 @@ private static DSLContext getDSLContext(final JsonNode config) { String.format(DatabaseDriver.ORACLE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("sid").asText()), null); + config.get("sid").asText()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java index e938456b230b3..8e94f51722be2 100644 --- a/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-postgres/src/test-integration/java/io/airbyte/integrations/destination/postgres/SshPostgresDestinationAcceptanceTest.java @@ -120,9 +120,7 @@ private static Database getDatabaseFromConfig(final JsonNode config) { config.get("host").asText(), config.get("port").asInt(), config.get("database").asText()), - SQLDialect.POSTGRES - ) - ); + SQLDialect.POSTGRES)); } private List retrieveRecordsFromTable(final String tableName, final String schemaName) throws Exception { diff --git a/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftDestination.java b/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftDestination.java index 883a752ccf88f..1853b43bc4c81 100644 --- a/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftDestination.java +++ b/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftDestination.java @@ -19,8 +19,8 @@ * {@link RedshiftInsertDestination} for more detail. The second inserts via streaming the data to * an S3 bucket, and Cop-ing the date into Redshift. This is more efficient, and recommended for * production workloads, but does require users to set up an S3 bucket and pass in additional - * credentials. See {@link RedshiftStagingS3Destination} for more detail. This class inspect the given - * arguments to determine which strategy to use. + * credentials. See {@link RedshiftStagingS3Destination} for more detail. This class inspect the + * given arguments to determine which strategy to use. */ public class RedshiftDestination extends SwitchingDestination { diff --git a/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3Destination.java b/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3Destination.java index 06e737fadf90e..0132dac48388f 100644 --- a/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3Destination.java +++ b/airbyte-integrations/connectors/destination-redshift/src/main/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3Destination.java @@ -82,11 +82,11 @@ public AirbyteConnectionStatus check(final JsonNode config) { public DataSource getDataSource(final JsonNode config) { final var jdbcConfig = getJdbcConfig(config); return DataSourceFactory.create( - jdbcConfig.get(USERNAME).asText(), - jdbcConfig.has(PASSWORD) ? jdbcConfig.get(PASSWORD).asText() : null, - RedshiftInsertDestination.DRIVER_CLASS, - jdbcConfig.get(JDBC_URL).asText(), - SSL_JDBC_PARAMETERS); + jdbcConfig.get(USERNAME).asText(), + jdbcConfig.has(PASSWORD) ? jdbcConfig.get(PASSWORD).asText() : null, + RedshiftInsertDestination.DRIVER_CLASS, + jdbcConfig.get(JDBC_URL).asText(), + SSL_JDBC_PARAMETERS); } @Override diff --git a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java index 8176a1b5696e5..dc4f8673be3e2 100644 --- a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftStagingS3DestinationAcceptanceTest.java @@ -25,8 +25,8 @@ import org.slf4j.LoggerFactory; /** - * Integration test testing {@link RedshiftStagingS3Destination}. The default Redshift integration test - * credentials contain S3 credentials - this automatically causes COPY to be selected. + * Integration test testing {@link RedshiftStagingS3Destination}. The default Redshift integration + * test credentials contain S3 credentials - this automatically causes COPY to be selected. */ public class RedshiftStagingS3DestinationAcceptanceTest extends JdbcDestinationAcceptanceTest { @@ -160,9 +160,7 @@ protected Database getDatabase() { baseConfig.get("port").asInt(), baseConfig.get("database").asText()), null, - RedshiftInsertDestination.SSL_JDBC_PARAMETERS - ) - ); + RedshiftInsertDestination.SSL_JDBC_PARAMETERS)); } public RedshiftSQLNameTransformer getNamingResolver() { diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryption.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryption.java index 22ce17ba5147a..1538951fd0f66 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryption.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryption.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import com.fasterxml.jackson.databind.JsonNode; @@ -8,7 +12,7 @@ import org.apache.commons.lang3.StringUtils; /** - * @param key The key to use for encryption. + * @param key The key to use for encryption. * @param keyType Where the key came from. */ public record AesCbcEnvelopeEncryption(@Nonnull byte[] key, @Nonnull KeyType keyType) implements EncryptionConfig { @@ -63,4 +67,5 @@ public int hashCode() { result = 31 * result + keyType.hashCode(); return result; } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecorator.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecorator.java index e105168e7802c..d62d748ca53cc 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecorator.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecorator.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import com.google.common.annotations.VisibleForTesting; @@ -21,21 +25,27 @@ import javax.crypto.spec.SecretKeySpec; /** - * This class implements the envelope encryption that Redshift and Snowflake use when loading encrypted files from S3 (or other blob stores): + * This class implements the envelope encryption that Redshift and Snowflake use when loading + * encrypted files from S3 (or other blob stores): *
    - *
  • A content-encrypting-key (CEK) is used to encrypt the actual data (i.e. the CSV file)
    • - *
  • A key-encrypting-key (KEK) is used to encrypt the CEK
    • - *
  • The encrypted CEK is stored in the S3 object metadata, along with the plaintext initialization vector
    • - *
  • The COPY command includes the KEK (in plaintext). Redshift/Snowflake will use it to decrypt the CEK, which it then uses to decrypt the CSV file.
    • + *
  • A content-encrypting-key (CEK) is used to encrypt the actual data (i.e. the CSV file)
    • + *
  • A key-encrypting-key (KEK) is used to encrypt the CEK
    • + *
  • The encrypted CEK is stored in the S3 object metadata, along with the plaintext + * initialization vector
    • + *
  • The COPY command includes the KEK (in plaintext). Redshift/Snowflake will use it to decrypt + * the CEK, which it then uses to decrypt the CSV file.
    • *
*

- * A new CEK is generated for each S3 object, but each sync uses a single KEK. The KEK may be either user-provided (if the user wants to keep the data - * for further use), or generated per-sync (if they simply want to add additional security around their COPY operation). + * A new CEK is generated for each S3 object, but each sync uses a single KEK. The KEK may be either + * user-provided (if the user wants to keep the data for further use), or generated per-sync (if + * they simply want to add additional security around their COPY operation). *

* Redshift does not support loading directly from GCS or Azure Blob Storage. *

- * Snowflake only supports client-side encryption in S3 and Azure Storage; it does not support this feature in GCS (https://docs.snowflake.com/en/sql-reference/sql/copy-into-table.html). - * Azure Storage uses a similar envelope encryption technique to S3 (https://docs.microsoft.com/en-us/azure/storage/common/storage-client-side-encryption?tabs=dotnet#encryption-via-the-envelope-technique). + * Snowflake only supports client-side encryption in S3 and Azure Storage; it does not support this + * feature in GCS (https://docs.snowflake.com/en/sql-reference/sql/copy-into-table.html). Azure + * Storage uses a similar envelope encryption technique to S3 + * (https://docs.microsoft.com/en-us/azure/storage/common/storage-client-side-encryption?tabs=dotnet#encryption-via-the-envelope-technique). */ public class AesCbcEnvelopeEncryptionBlobDecorator implements BlobDecorator { @@ -49,12 +59,15 @@ public class AesCbcEnvelopeEncryptionBlobDecorator implements BlobDecorator { public static final String KEY_ENCRYPTING_ALGO = "AES"; - // There's no specific KeyGenerator for AES/CBC/PKCS5Padding, so we just use a normal AES KeyGenerator + // There's no specific KeyGenerator for AES/CBC/PKCS5Padding, so we just use a normal AES + // KeyGenerator private static final String CONTENT_ENCRYPTING_KEY_ALGO = "AES"; // Redshift's UNLOAD command uses this cipher mode, so we'll use it here as well. - // TODO If we eventually want to expose client-side encryption in destination-s3, we should probably also implement - // AES-GCM, since it's mostly superior to CBC mode. (if we do that: make sure that the output is compatible with - // aws-java-sdk's AmazonS3EncryptionV2Client, which requires a slightly different set of metadata) + // TODO If we eventually want to expose client-side encryption in destination-s3, we should probably + // also implement + // AES-GCM, since it's mostly superior to CBC mode. (if we do that: make sure that the output is + // compatible with + // aws-java-sdk's AmazonS3EncryptionV2Client, which requires a slightly different set of metadata) private static final String CONTENT_ENCRYPTING_CIPHER_ALGO = "AES/CBC/PKCS5Padding"; // The real "secret key". Should be handled with great care. @@ -82,9 +95,8 @@ public AesCbcEnvelopeEncryptionBlobDecorator(final byte[] keyEncryptingKey) { } @SuppressFBWarnings( - value = {"PADORA", "CIPINT"}, - justification = "We're using this cipher for compatibility with Redshift/Snowflake." - ) + value = {"PADORA", "CIPINT"}, + justification = "We're using this cipher for compatibility with Redshift/Snowflake.") @Override public OutputStream wrap(final OutputStream stream) { try { @@ -97,9 +109,8 @@ public OutputStream wrap(final OutputStream stream) { } @SuppressFBWarnings( - value = {"CIPINT", "SECECB"}, - justification = "We're using this cipher for compatibility with Redshift/Snowflake." - ) + value = {"CIPINT", "SECECB"}, + justification = "We're using this cipher for compatibility with Redshift/Snowflake.") @Override public void updateMetadata(final Map metadata, final Map metadataKeyMapping) { try { @@ -129,4 +140,5 @@ private static byte[] randomInitializationVector() { SECURE_RANDOM.nextBytes(initializationVector); return initializationVector; } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/BlobDecorator.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/BlobDecorator.java index ad5b800d1e828..33ec4425b81be 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/BlobDecorator.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/BlobDecorator.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import com.google.common.annotations.VisibleForTesting; @@ -5,7 +9,8 @@ import java.util.Map; /** - * Represents the ability to modify how a blob is stored, by modifying the data being written and/or the blob's metadata. + * Represents the ability to modify how a blob is stored, by modifying the data being written and/or + * the blob's metadata. */ public interface BlobDecorator { @@ -14,19 +19,21 @@ public interface BlobDecorator { /** * Modifies the blob's metadata. *

- * In the most common case, BlobDecorator implementations will insert new entries into the metadata map. These entries may be vendor-specific. The - * metadataKeyMapping parameter defines a mapping from the "canonical" keys to the vendor-specific keys. See {@link - * S3StorageOperations#getMetadataMapping()} for an example. + * In the most common case, BlobDecorator implementations will insert new entries into the metadata + * map. These entries may be vendor-specific. The metadataKeyMapping parameter defines a mapping + * from the "canonical" keys to the vendor-specific keys. See + * {@link S3StorageOperations#getMetadataMapping()} for an example. *

* If a key is not defined in metadataKeyMapping, it will not be inserted into the metadata. * - * @param metadata The blob's metadata + * @param metadata The blob's metadata * @param metadataKeyMapping The mapping from canonical to vendor-specific key names */ void updateMetadata(Map metadata, Map metadataKeyMapping); /** - * A convenience method for subclasses. Handles inserting new metadata entries according to the metadataKeyMapping. + * A convenience method for subclasses. Handles inserting new metadata entries according to the + * metadataKeyMapping. */ @VisibleForTesting static void insertMetadata(final Map metadata, @@ -37,4 +44,5 @@ static void insertMetadata(final Map metadata, metadata.put(metadataKeyMapping.get(key), value); } } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/EncryptionConfig.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/EncryptionConfig.java index ed7875378461c..a4f746ee7d33d 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/EncryptionConfig.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/EncryptionConfig.java @@ -1,14 +1,20 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import com.fasterxml.jackson.databind.JsonNode; import java.util.Base64; import java.util.Base64.Decoder; -public sealed interface EncryptionConfig permits AesCbcEnvelopeEncryption, NoEncryption { +public sealed interface EncryptionConfig permits AesCbcEnvelopeEncryption,NoEncryption { + Decoder BASE64_DECODER = Base64.getDecoder(); static EncryptionConfig fromJson(final JsonNode encryptionNode) { - // For backwards-compatibility. Preexisting configs which don't contain the "encryption" key will pass a null JsonNode into this method. + // For backwards-compatibility. Preexisting configs which don't contain the "encryption" key will + // pass a null JsonNode into this method. if (encryptionNode == null) { return new NoEncryption(); } @@ -20,4 +26,5 @@ static EncryptionConfig fromJson(final JsonNode encryptionNode) { default -> throw new IllegalArgumentException("Invalid encryption type: " + encryptionType); }; } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/NoEncryption.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/NoEncryption.java index 67bff69a61d9c..91c6ffbdd018e 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/NoEncryption.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/NoEncryption.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; public final class NoEncryption implements EncryptionConfig { diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/CompressionTypeHelper.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/CompressionTypeHelper.java index 6f7df8dd53803..ec506158d0099 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/CompressionTypeHelper.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/CompressionTypeHelper.java @@ -11,8 +11,7 @@ public class CompressionTypeHelper { - private CompressionTypeHelper() { - } + private CompressionTypeHelper() {} /** * Sample expected input: { "compression_type": "No Compression" } diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/StreamTransferManagerWithMetadata.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/StreamTransferManagerWithMetadata.java index b29603c2883ce..cbde9943e24e7 100644 --- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/StreamTransferManagerWithMetadata.java +++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/util/StreamTransferManagerWithMetadata.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3.util; import alex.mojaki.s3upload.StreamTransferManager; @@ -7,9 +11,11 @@ import java.util.Map; /** - * A custom stream transfer manager which overwrites the metadata on the InitiateMultipartUploadRequest. + * A custom stream transfer manager which overwrites the metadata on the + * InitiateMultipartUploadRequest. *

- * This is, apparently, the correct way to implement this functionality. https://github.com/alexmojaki/s3-stream-upload/issues/3 + * This is, apparently, the correct way to implement this functionality. + * https://github.com/alexmojaki/s3-stream-upload/issues/3 */ public class StreamTransferManagerWithMetadata extends StreamTransferManager { @@ -34,4 +40,5 @@ public void customiseInitiateRequest(final InitiateMultipartUploadRequest reques request.setObjectMetadata(objectMetadata); } } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecoratorTest.java b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecoratorTest.java index e5c912706dce5..d61a361625d91 100644 --- a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecoratorTest.java +++ b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/AesCbcEnvelopeEncryptionBlobDecoratorTest.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import java.io.ByteArrayOutputStream; @@ -25,12 +29,14 @@ public class AesCbcEnvelopeEncryptionBlobDecoratorTest { public static final String INITIALIZATION_VECTOR = "04YDvMCXpvTb2ilggLbDJQ=="; // A small CSV file, which looks similar to what destination-s3 might upload public static final String PLAINTEXT = """ - adc66b6e-6051-42db-b683-d978a51c3c02,"{""campaign.resource_name"":""cus""}",2022-04-04 22:32:50.046 - 0e253b28-bec6-4a90-8622-629d3e542982,"{""campaign.resource_name"":""cus""}",2022-04-04 22:32:50.047 - """; - // The encryption of the plaintext, using the CEK and IV defined above (base64-encoded). Equivalent to: + adc66b6e-6051-42db-b683-d978a51c3c02,"{""campaign.resource_name"":""cus""}",2022-04-04 22:32:50.046 + 0e253b28-bec6-4a90-8622-629d3e542982,"{""campaign.resource_name"":""cus""}",2022-04-04 22:32:50.047 + """; + // The encryption of the plaintext, using the CEK and IV defined above (base64-encoded). Equivalent + // to: // base64Encode(encrypt("AES-CBC", PLAINTEXT, CONTENT_ENCRYPTING_KEY, INITIALIZATION_VECTOR) - public static final String CIPHERTEXT = "IRfz0FN05Y9yyne+0V+G14xYjA4B0+ter7qniDheIu9UM3Fdmu/mqjyFvYFIRTroP5kNJ1SH3FaArE5aHkrWMPwSkczkhArajfYX+UEfGH68YyWOSnpdxuviTTgK3Ee3OVTz3ZlziOB8jCMjupJ9pqkLnxg7Ghe3BQ1puOHGFDMmIgiP4Zfz0fkdlUyZOvsJ7xpncD24G6IIJNwOyo4CedULgueHdybmxr4oddhAja8QxJxZzlfZl4suJ+KWvt78MSdkRlp+Ip99U8n0O7BLJA=="; + public static final String CIPHERTEXT = + "IRfz0FN05Y9yyne+0V+G14xYjA4B0+ter7qniDheIu9UM3Fdmu/mqjyFvYFIRTroP5kNJ1SH3FaArE5aHkrWMPwSkczkhArajfYX+UEfGH68YyWOSnpdxuviTTgK3Ee3OVTz3ZlziOB8jCMjupJ9pqkLnxg7Ghe3BQ1puOHGFDMmIgiP4Zfz0fkdlUyZOvsJ7xpncD24G6IIJNwOyo4CedULgueHdybmxr4oddhAja8QxJxZzlfZl4suJ+KWvt78MSdkRlp+Ip99U8n0O7BLJA=="; // The encryption of the CEK, using the KEK defined above (base64-encoded). Equivalent to: // base64Encode(encrypt("AES-ECB", CONTENT_ENCRYPTING_KEY, KEY_ENCRYPTING_KEY) public static final String ENCRYPTED_CEK = "Ck5u5cKqcY+bcFBrpsPHHUNw5Qx8nYDJ2Vqt6XG6kwxjVAJQKKljPv9NDsG6Ncoc"; @@ -42,8 +48,7 @@ public void setup() { decorator = new AesCbcEnvelopeEncryptionBlobDecorator( new SecretKeySpec(BASE64_DECODER.decode(KEY_ENCRYPTING_KEY), "AES"), new SecretKeySpec(BASE64_DECODER.decode(CONTENT_ENCRYPTING_KEY), "AES"), - BASE64_DECODER.decode(INITIALIZATION_VECTOR) - ); + BASE64_DECODER.decode(INITIALIZATION_VECTOR)); } @Test @@ -54,14 +59,12 @@ public void testEncryption() throws IOException { IOUtils.write( PLAINTEXT, wrapped, - StandardCharsets.UTF_8 - ); + StandardCharsets.UTF_8); } Assertions.assertArrayEquals( BASE64_DECODER.decode(CIPHERTEXT), - stream.toByteArray() - ); + stream.toByteArray()); } @Test @@ -72,16 +75,13 @@ public void testMetadataInsertion() { metadata, Map.of( AesCbcEnvelopeEncryptionBlobDecorator.ENCRYPTED_CONTENT_ENCRYPTING_KEY, "the_cek", - AesCbcEnvelopeEncryptionBlobDecorator.INITIALIZATION_VECTOR, "the_iv" - ) - ); + AesCbcEnvelopeEncryptionBlobDecorator.INITIALIZATION_VECTOR, "the_iv")); Assertions.assertEquals( Map.of( "the_cek", ENCRYPTED_CEK, - "the_iv", INITIALIZATION_VECTOR - ), - metadata - ); + "the_iv", INITIALIZATION_VECTOR), + metadata); } + } diff --git a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/BlobDecoratorTest.java b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/BlobDecoratorTest.java index fa702025c212f..cf20c18351ab4 100644 --- a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/BlobDecoratorTest.java +++ b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/BlobDecoratorTest.java @@ -1,3 +1,7 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + package io.airbyte.integrations.destination.s3; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -16,8 +20,7 @@ public void testOverwriteMetadata() { BlobDecorator.insertMetadata( metadata, Map.of("foo", "amz-foo"), - "foo", "newValue" - ); + "foo", "newValue"); assertEquals(Map.of("amz-foo", "newValue"), metadata); } @@ -30,16 +33,13 @@ public void testNewMetadata() { BlobDecorator.insertMetadata( metadata, Map.of("bar", "amz-bar"), - "bar", "newValue" - ); + "bar", "newValue"); assertEquals( Map.of( "amz-foo", "oldValue", - "amz-bar", "newValue" - ), - metadata - ); + "amz-bar", "newValue"), + metadata); } @Test @@ -50,9 +50,9 @@ public void testSkipMetadata() { BlobDecorator.insertMetadata( metadata, Map.of("foo", "amz-foo"), - "bar", "newValue" - ); + "bar", "newValue"); assertEquals(Map.of("amz-foo", "oldValue"), metadata); } + } diff --git a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java index a9a62929669ad..138566f8843ec 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java @@ -8,12 +8,11 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.destination.scylla.ScyllaContainerInitializr.ScyllaContainer; import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; +import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; +import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; - -import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; -import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airbyte-integrations/connectors/source-bigquery/src/main/java/io/airbyte/integrations/source/bigquery/BigQuerySource.java b/airbyte-integrations/connectors/source-bigquery/src/main/java/io/airbyte/integrations/source/bigquery/BigQuerySource.java index 0f394f4e10855..51d849295bdf0 100644 --- a/airbyte-integrations/connectors/source-bigquery/src/main/java/io/airbyte/integrations/source/bigquery/BigQuerySource.java +++ b/airbyte-integrations/connectors/source-bigquery/src/main/java/io/airbyte/integrations/source/bigquery/BigQuerySource.java @@ -177,4 +177,5 @@ public static void main(final String[] args) throws Exception { @Override public void close() throws Exception {} + } diff --git a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseStrictEncryptJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseStrictEncryptJdbcSourceAcceptanceTest.java index 3e17118b54653..66fad2735dbe6 100644 --- a/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseStrictEncryptJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-clickhouse-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseStrictEncryptJdbcSourceAcceptanceTest.java @@ -87,9 +87,7 @@ public void setup() throws Exception { ClickHouseSource.DRIVER_CLASS, String.format("jdbc:clickhouse://%s:%s?ssl=true&sslmode=none", configWithoutDbName.get("host").asText(), - configWithoutDbName.get("port").asText()) - ) - ); + configWithoutDbName.get("port").asText()))); dbName = Strings.addRandomSuffix("db", "_", 10).toLowerCase(); diff --git a/airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java index a85729e73b273..371ec2d33499d 100644 --- a/airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java @@ -26,8 +26,6 @@ import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; -import java.io.Closeable; -import java.io.IOException; import java.util.HashMap; import javax.sql.DataSource; import org.testcontainers.containers.ClickHouseContainer; @@ -112,8 +110,7 @@ private static void populateDatabaseTestData() throws Exception { String.format(DatabaseDriver.CLICKHOUSE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ); + config.get("database").asText())); try { final JdbcDatabase database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java index 8e2cc86268017..c916da52c641d 100644 --- a/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java @@ -11,7 +11,6 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.ssh.SshHelpers; import io.airbyte.integrations.standardtest.source.SourceAcceptanceTest; @@ -25,7 +24,6 @@ import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; import java.util.HashMap; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; @@ -57,7 +55,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)){ + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java b/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java index 5fc305c9cee76..cec260cbd011f 100644 --- a/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java +++ b/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java @@ -124,8 +124,7 @@ protected DataSource createDataSource(final JsonNode config) { jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, driverClass, jdbcConfig.get("jdbc_url").asText(), - JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties") - ); + JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties")); dataSources.add(dataSource); return dataSource; } diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java index 9f230810d166f..068b5cab71b8f 100644 --- a/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java @@ -11,7 +11,6 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.standardtest.source.SourceAcceptanceTest; import io.airbyte.integrations.standardtest.source.TestDestinationEnv; @@ -24,7 +23,6 @@ import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; import java.util.HashMap; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.testcontainers.containers.CockroachContainer; @@ -59,7 +57,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)) { + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceDatatypeTest.java b/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceDatatypeTest.java index f7cf9c0650900..9035639065cf9 100644 --- a/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceDatatypeTest.java @@ -9,14 +9,12 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.standardtest.source.AbstractSourceDatabaseTypeTest; import io.airbyte.integrations.standardtest.source.TestDataHolder; import io.airbyte.integrations.standardtest.source.TestDestinationEnv; import io.airbyte.protocol.models.JsonSchemaType; import java.sql.SQLException; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.slf4j.Logger; @@ -54,7 +52,8 @@ protected Database setupDatabase() throws SQLException { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); final Database database = new Database(dslContext); database.query(ctx -> ctx.fetch("CREATE SCHEMA TEST;")); diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbJdbcSourceAcceptanceTest.java index a787f284aca69..b907646a1f164 100644 --- a/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbJdbcSourceAcceptanceTest.java @@ -88,9 +88,7 @@ public void setup() throws Exception { jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, getDriverClass(), jdbcConfig.get("jdbc_url").asText(), - JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties") - ) - ); + JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties"))); database.execute(connection -> connection.createStatement().execute("CREATE DATABASE " + config.get("database") + ";")); super.setup(); } diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceTest.java b/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceTest.java index e6290696e03b3..c4e0d0aaa501f 100644 --- a/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceTest.java +++ b/airbyte-integrations/connectors/source-cockroachdb/src/test/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceTest.java @@ -16,7 +16,6 @@ import io.airbyte.commons.util.MoreIterators; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.protocol.models.AirbyteCatalog; import io.airbyte.protocol.models.AirbyteMessage; @@ -35,7 +34,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.junit.jupiter.api.AfterAll; @@ -142,7 +140,8 @@ private static DSLContext getDslContext(final JsonNode config) { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); } private JsonNode getConfig(final CockroachContainer psqlDb, final String dbName) { diff --git a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2StrictEncryptSource.java b/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2StrictEncryptSource.java index c50258a6f38d2..677c2229878f7 100644 --- a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2StrictEncryptSource.java +++ b/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2StrictEncryptSource.java @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import io.airbyte.commons.json.Jsons; -import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.IntegrationRunner; import io.airbyte.integrations.base.Source; import io.airbyte.integrations.base.spec_modification.SpecModifyingSource; diff --git a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java b/airbyte-integrations/connectors/source-db2-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java index 840bedf3dfcc6..627194c578d72 100644 --- a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-db2-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java @@ -23,7 +23,6 @@ import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; -import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -126,8 +125,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc config.get("username").asText(), config.get("password").asText(), Db2Source.DRIVER_CLASS, - jdbcUrl - ); + jdbcUrl); try { final JdbcDatabase database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java index 9a2124e3a9fe6..9e72e7e00d671 100644 --- a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java @@ -121,8 +121,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.DB2.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("db").asText()) - ); + config.get("db").asText())); try { final JdbcDatabase database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java index fc01c4d742e83..666f0865ac75e 100644 --- a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java @@ -125,8 +125,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc config.get("username").asText(), config.get("password").asText(), Db2Source.DRIVER_CLASS, - jdbcUrl - ); + jdbcUrl); try { final JdbcDatabase database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java index a32a9b70fbe38..2bfa9c4ee9ecd 100644 --- a/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java @@ -9,14 +9,12 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.source.db2.Db2Source; import io.airbyte.integrations.standardtest.source.AbstractSourceDatabaseTypeTest; import io.airbyte.integrations.standardtest.source.TestDataHolder; import io.airbyte.integrations.standardtest.source.TestDestinationEnv; import io.airbyte.protocol.models.JsonSchemaType; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.testcontainers.containers.Db2Container; @@ -69,7 +67,8 @@ protected Database setupDatabase() throws Exception { String.format(DatabaseDriver.DB2.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("db").asText()), SQLDialect.DEFAULT); + config.get("db").asText()), + SQLDialect.DEFAULT); final Database database = new Database(dslContext); database.query(ctx -> ctx.fetch("CREATE SCHEMA TEST")); diff --git a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java index d5d3dc0de4322..3a0d19631b956 100644 --- a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java +++ b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java @@ -297,8 +297,7 @@ protected DataSource createDataSource(final JsonNode config) { jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, driverClass, jdbcConfig.get("jdbc_url").asText(), - JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties", getJdbcParameterDelimiter()) - ); + JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties", getJdbcParameterDelimiter())); // Record the data source so that it can be closed. dataSources.add(dataSource); return dataSource; @@ -310,8 +309,7 @@ public JdbcDatabase createDatabase(final JsonNode config) throws SQLException { final JdbcDatabase database = new StreamingJdbcDatabase( dataSource, sourceOperations, - streamingQueryConfigProvider - ); + streamingQueryConfigProvider); quoteString = (quoteString == null ? database.getMetaData().getIdentifierQuoteString() : quoteString); @@ -324,7 +322,7 @@ protected String getJdbcParameterDelimiter() { @Override public void close() { - dataSources.forEach( d -> { + dataSources.forEach(d -> { try { DataSourceFactory.close(d); } catch (final Exception e) { diff --git a/airbyte-integrations/connectors/source-jdbc/src/test-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-jdbc/src/test-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java index d55e5a8bfe09e..d5a0d5681e803 100644 --- a/airbyte-integrations/connectors/source-jdbc/src/test-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-jdbc/src/test-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java @@ -55,8 +55,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws SQL config.get("password").asText(), DatabaseDriver.POSTGRESQL.getDriverClassName(), config.get("jdbc_url").asText(), - SQLDialect.POSTGRES - )) { + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcSourceAcceptanceTest.java index 958728f535581..c8d3a294dd703 100644 --- a/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcSourceAcceptanceTest.java @@ -74,9 +74,8 @@ // between each test. // 4. Then implement the abstract methods documented below. @SuppressFBWarnings( - value = {"MS_SHOULD_BE_FINAL"}, - justification = "The static variables are updated in sub classes for convenience, and cannot be final." -) + value = {"MS_SHOULD_BE_FINAL"}, + justification = "The static variables are updated in sub classes for convenience, and cannot be final.") public abstract class JdbcSourceAcceptanceTest { // schema name must be randomized for each test run, @@ -210,13 +209,11 @@ public void setup() throws Exception { jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, getDriverClass(), jdbcConfig.get("jdbc_url").asText(), - JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties", getJdbcParameterDelimiter()) - ); + JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties", getJdbcParameterDelimiter())); database = new StreamingJdbcDatabase(dataSource, JdbcUtils.getDefaultSourceOperations(), - AdaptiveStreamingQueryConfig::new - ); + AdaptiveStreamingQueryConfig::new); if (supportsSchemas()) { createSchemas(); diff --git a/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcStressTest.java b/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcStressTest.java index 6ca768e5b1aff..4b7323881fe86 100644 --- a/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcStressTest.java +++ b/airbyte-integrations/connectors/source-jdbc/src/testFixtures/java/io/airbyte/integrations/source/jdbc/test/JdbcStressTest.java @@ -47,9 +47,8 @@ // to rewrite so much data. it is enough for now to sanity check that our JdbcSources can actually // handle more data than fits in memory. @SuppressFBWarnings( - value = {"MS_SHOULD_BE_FINAL"}, - justification = "The static variables are updated in sub classes for convenience, and cannot be final." -) + value = {"MS_SHOULD_BE_FINAL"}, + justification = "The static variables are updated in sub classes for convenience, and cannot be final.") public abstract class JdbcStressTest { private static final Logger LOGGER = LoggerFactory.getLogger(JdbcStressTest.class); @@ -120,9 +119,7 @@ public void setup() throws Exception { jdbcConfig.get("username").asText(), jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null, getDriverClass(), - jdbcConfig.get("jdbc_url").asText() - ) - ); + jdbcConfig.get("jdbc_url").asText())); database.execute(connection -> connection.createStatement().execute( createTableQuery("id_and_name", String.format("id %s, name VARCHAR(200)", COL_ID_TYPE)))); diff --git a/airbyte-integrations/connectors/source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java b/airbyte-integrations/connectors/source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java index 5b9ff184c6d4b..161d93a713a9a 100644 --- a/airbyte-integrations/connectors/source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java +++ b/airbyte-integrations/connectors/source-mongodb-v2/src/main/java/io.airbyte.integrations.source.mongodb/MongoDbSource.java @@ -238,4 +238,5 @@ private String buildConnectionString(final JsonNode config, final String credent @Override public void close() throws Exception {} + } diff --git a/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceAtlasAcceptanceTest.java b/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceAtlasAcceptanceTest.java index 4022a8e316159..ae14ca62ed354 100644 --- a/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceAtlasAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceAtlasAcceptanceTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.mongodb.client.MongoCollection; import io.airbyte.commons.json.Jsons; diff --git a/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceStandaloneAcceptanceTest.java b/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceStandaloneAcceptanceTest.java index 8a0cf9265f7a7..cee2fe15bd341 100644 --- a/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceStandaloneAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceStandaloneAcceptanceTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.mongodb.client.MongoCollection; import io.airbyte.commons.json.Jsons; diff --git a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java index 9ae0bce797d76..3a327a42b7f52 100644 --- a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java @@ -11,7 +11,6 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.ssh.SshHelpers; import io.airbyte.integrations.standardtest.source.SourceAcceptanceTest; @@ -23,7 +22,6 @@ import io.airbyte.protocol.models.JsonSchemaType; import java.sql.SQLException; import java.util.HashMap; -import javax.sql.DataSource; import org.apache.commons.lang3.RandomStringUtils; import org.jooq.DSLContext; import org.testcontainers.containers.MSSQLServerContainer; @@ -58,7 +56,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws SQL DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%s;encrypt=true;trustServerCertificate=true;", configWithoutDbName.get("host").asText(), - configWithoutDbName.get("port").asInt()), null)) { + configWithoutDbName.get("port").asInt()), + null)) { final Database database = getDatabase(dslContext); database.query(ctx -> { ctx.fetch(String.format("CREATE DATABASE %s;", dbName)); diff --git a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptJdbcSourceAcceptanceTest.java index b8f6f1724e1ee..0962f9183db56 100644 --- a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptJdbcSourceAcceptanceTest.java @@ -15,7 +15,6 @@ import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.db.jdbc.DefaultJdbcDatabase; -import io.airbyte.db.jdbc.JdbcDatabase; import io.airbyte.integrations.base.Source; import io.airbyte.integrations.base.ssh.SshHelpers; import io.airbyte.integrations.source.jdbc.AbstractJdbcSource; @@ -51,14 +50,13 @@ public void setup() throws Exception { .put("password", dbContainer.getPassword()) .build()); - dataSource = DataSourceFactory.create( + dataSource = DataSourceFactory.create( configWithoutDbName.get("username").asText(), configWithoutDbName.get("password").asText(), DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d", configWithoutDbName.get("host").asText(), - configWithoutDbName.get("port").asInt()) - ); + configWithoutDbName.get("port").asInt())); try { database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java index b827e1e1f48fd..7919e0c672226 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java @@ -10,7 +10,6 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.ssh.SshBastionContainer; import io.airbyte.integrations.base.ssh.SshHelpers; @@ -28,7 +27,6 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; -import javax.sql.DataSource; import org.apache.commons.lang3.RandomStringUtils; import org.jooq.DSLContext; import org.testcontainers.containers.JdbcDatabaseContainer; @@ -73,7 +71,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d;", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); return new Database(dslContext); } diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java index 04c4876863b54..bdd16c7531c71 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java @@ -109,7 +109,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Int container.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d;", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); database = new Database(dslContext); executeQuery("CREATE DATABASE " + DB_NAME + ";"); diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceDatatypeTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceDatatypeTest.java index cc9affe3284f4..19a7034a779f7 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceDatatypeTest.java @@ -66,7 +66,8 @@ protected Database setupDatabase() throws Exception { container.getDriverClassName(), String.format("jdbc:sqlserver://%s:%s;", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); final Database database = new Database(dslContext); executeQuery("CREATE DATABASE " + DB_NAME + ";"); @@ -84,12 +85,13 @@ protected String getNameSpace() { private void executeQuery(final String query) { try (final DSLContext dslContext = DSLContextFactory.create( DataSourceFactory.create( - container.getUsername(), - container.getPassword(), - container.getDriverClassName(), - String.format("jdbc:sqlserver://%s:%d;", - config.get("host").asText(), - config.get("port").asInt())), null)) { + container.getUsername(), + container.getPassword(), + container.getDriverClassName(), + String.format("jdbc:sqlserver://%s:%d;", + config.get("host").asText(), + config.get("port").asInt())), + null)) { final Database database = new Database(dslContext); database.query( ctx -> ctx diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlRdsSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlRdsSourceAcceptanceTest.java index 772de2883ec1b..8236ac141b02a 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlRdsSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlRdsSourceAcceptanceTest.java @@ -10,18 +10,17 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.standardtest.source.TestDestinationEnv; import java.nio.file.Path; import java.sql.SQLException; -import javax.sql.DataSource; import org.apache.commons.lang3.RandomStringUtils; import org.jooq.DSLContext; public class MssqlRdsSourceAcceptanceTest extends MssqlSourceAcceptanceTest { private JsonNode baseConfig; + @Override protected void setupEnvironment(final TestDestinationEnv environment) throws SQLException { baseConfig = getStaticConfig(); @@ -61,7 +60,8 @@ private DSLContext getDslContext(final JsonNode baseConfig) { String.format("jdbc:sqlserver://%s:%d;%s", baseConfig.get("host").asText(), baseConfig.get("port").asInt(), - additionalParameter), null); + additionalParameter), + null); } private Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java index fe8c22c8b4067..c8dc014f7cbb4 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java @@ -11,7 +11,6 @@ import io.airbyte.commons.string.Strings; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.ssh.SshHelpers; import io.airbyte.integrations.standardtest.source.SourceAcceptanceTest; @@ -23,7 +22,6 @@ import io.airbyte.protocol.models.JsonSchemaType; import java.sql.SQLException; import java.util.HashMap; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.testcontainers.containers.MSSQLServerContainer; @@ -108,7 +106,8 @@ private static DSLContext getDslContext(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d;", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceDatatypeTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceDatatypeTest.java index 56ff625fc83aa..d690646137591 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceDatatypeTest.java @@ -11,13 +11,11 @@ import io.airbyte.commons.string.Strings; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.standardtest.source.AbstractSourceDatabaseTypeTest; import io.airbyte.integrations.standardtest.source.TestDataHolder; import io.airbyte.integrations.standardtest.source.TestDestinationEnv; import io.airbyte.protocol.models.JsonSchemaType; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.testcontainers.containers.MSSQLServerContainer; @@ -62,7 +60,8 @@ private static DSLContext getDslContext(final JsonNode config) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d;", config.get("host").asText(), - config.get("port").asInt()), null); + config.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/SslEnabledMssqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/SslEnabledMssqlSourceAcceptanceTest.java index 1b41c05ea7a83..0c198321d74ff 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/SslEnabledMssqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/SslEnabledMssqlSourceAcceptanceTest.java @@ -62,7 +62,8 @@ private static DSLContext getDslContext(final JsonNode baseConfig) { DatabaseDriver.MSSQLSERVER.getDriverClassName(), String.format("jdbc:sqlserver://%s:%d;encrypt=true;trustServerCertificate=true;", baseConfig.get("host").asText(), - baseConfig.get("port").asInt()), null); + baseConfig.get("port").asInt()), + null); } private static Database getDatabase(final DSLContext dslContext) { diff --git a/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java b/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java index 19745f4d874e4..68aeb607e02df 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java @@ -325,15 +325,14 @@ protected CdcTargetPosition cdcLatestTargetPosition() { } final JdbcDatabase jdbcDatabase = new StreamingJdbcDatabase( DataSourceFactory.create(config.get("username").asText(), - config.get("password").asText(), - DRIVER_CLASS, - String.format("jdbc:sqlserver://%s:%s;databaseName=%s;", - config.get("host").asText(), - config.get("port").asInt(), - dbName)), + config.get("password").asText(), + DRIVER_CLASS, + String.format("jdbc:sqlserver://%s:%s;databaseName=%s;", + config.get("host").asText(), + config.get("port").asInt(), + dbName)), new MssqlSourceOperations(), - AdaptiveStreamingQueryConfig::new - ); + AdaptiveStreamingQueryConfig::new); return MssqlCdcTargetPosition.getTargetPosition(jdbcDatabase, dbName); } diff --git a/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java index 80f3e8adec3a2..4b3b0aa3166c2 100644 --- a/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java @@ -13,7 +13,6 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.integrations.base.ssh.SshHelpers; import io.airbyte.integrations.source.mysql.MySqlSource; @@ -28,7 +27,6 @@ import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; import java.util.HashMap; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.testcontainers.containers.MySQLContainer; @@ -63,7 +61,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc config.get("host").asText(), config.get("port").asText(), config.get("database").asText(), - String.join("&", SSL_PARAMETERS)), SQLDialect.MYSQL)) { + String.join("&", SSL_PARAMETERS)), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptJdbcSourceAcceptanceTest.java index 48235e1395e5f..25e313213b607 100644 --- a/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptJdbcSourceAcceptanceTest.java @@ -70,7 +70,8 @@ public void setup() throws Exception { String.format("jdbc:mysql://%s:%s?%s", config.get("host").asText(), config.get("port").asText(), - String.join("&", SSL_PARAMETERS)), SQLDialect.MYSQL); + String.join("&", SSL_PARAMETERS)), + SQLDialect.MYSQL); database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java index 4092ca473f8b4..f563269f89ffb 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java @@ -7,7 +7,6 @@ import static io.airbyte.protocol.models.SyncMode.INCREMENTAL; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; @@ -140,7 +139,8 @@ private void executeQuery(final String query) { String.format(DatabaseDriver.MYSQL.getUrlFormatString(), container.getHost(), container.getFirstMappedPort(), - container.getDatabaseName()), SQLDialect.MYSQL)) { + container.getDatabaseName()), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query( ctx -> ctx diff --git a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceDatatypeTest.java b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceDatatypeTest.java index 3c85b3ac0dbc0..31adfbb76aafc 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceDatatypeTest.java @@ -70,7 +70,8 @@ protected Database setupDatabase() throws Exception { String.format(DatabaseDriver.MYSQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.MYSQL); + config.get("database").asText()), + SQLDialect.MYSQL); final Database database = new Database(dslContext); // It disable strict mode in the DB and allows to insert specific values. @@ -106,7 +107,8 @@ private void executeQuery(final String query) { String.format(DatabaseDriver.MYSQL.getUrlFormatString(), container.getHost(), container.getFirstMappedPort(), - container.getDatabaseName()), SQLDialect.MYSQL)) { + container.getDatabaseName()), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query( ctx -> ctx diff --git a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceAcceptanceTest.java index 6c6b7708aa795..90c476495012f 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceAcceptanceTest.java @@ -57,7 +57,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.MYSQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.MYSQL)) { + config.get("database").asText()), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceDatatypeTest.java b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceDatatypeTest.java index 8867e857e83fb..c60db4632f2a1 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceDatatypeTest.java @@ -77,8 +77,7 @@ protected Database setupDatabase() throws Exception { config.get("port").asInt(), config.get("database").asText()), SQLDialect.MYSQL, - Map.of("zeroDateTimeBehavior", "convertToNull")) - ); + Map.of("zeroDateTimeBehavior", "convertToNull"))); // It disable strict mode in the DB and allows to insert specific values. // For example, it's possible to insert date with zero values "2021-00-00" diff --git a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSslSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSslSourceAcceptanceTest.java index 48e693bda7036..ea248aba67ed2 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSslSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSslSourceAcceptanceTest.java @@ -42,7 +42,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc config.get("host").asText(), config.get("port").asText(), config.get("database").asText(), - String.join("&", SSL_PARAMETERS)), SQLDialect.MYSQL)) { + String.join("&", SSL_PARAMETERS)), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/FillMySqlTestDbScriptTest.java b/airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/FillMySqlTestDbScriptTest.java index b7d1d8a94c5e5..4ac4baa7a9cf0 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/FillMySqlTestDbScriptTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/FillMySqlTestDbScriptTest.java @@ -56,8 +56,7 @@ protected Database setupDatabase(final String dbName) throws Exception { config.get("port").asInt(), config.get("database").asText()), SQLDialect.MYSQL, - Map.of("zeroDateTimeBehavior", "convertToNull")) - ); + Map.of("zeroDateTimeBehavior", "convertToNull"))); // It disable strict mode in the DB and allows to insert specific values. // For example, it's possible to insert date with zero values "2021-00-00" diff --git a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlSslJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlSslJdbcSourceAcceptanceTest.java index 87cb8ac3642c2..c4a79106cc5b9 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlSslJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlSslJdbcSourceAcceptanceTest.java @@ -12,7 +12,6 @@ import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; import io.airbyte.db.factory.DatabaseDriver; -import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.junit.jupiter.api.BeforeEach; @@ -36,7 +35,8 @@ public void setup() throws Exception { String.format("jdbc:mysql://%s:%s?%s", config.get("host").asText(), config.get("port").asText(), - String.join("&", SSL_PARAMETERS)), SQLDialect.MYSQL); + String.join("&", SSL_PARAMETERS)), + SQLDialect.MYSQL); database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlStressTest.java b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlStressTest.java index 645c0f57ada56..401f89a7291b4 100644 --- a/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlStressTest.java +++ b/airbyte-integrations/connectors/source-mysql/src/test/java/io/airbyte/integrations/source/mysql/MySqlStressTest.java @@ -66,7 +66,8 @@ public void setup() throws Exception { DatabaseDriver.MYSQL.getDriverClassName(), String.format("jdbc:mysql://%s:%s", config.get("host").asText(), - config.get("port").asText()), SQLDialect.MYSQL); + config.get("port").asText()), + SQLDialect.MYSQL); database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java b/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java index 895068e01efe5..e5fc9b4f241f0 100644 --- a/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java @@ -44,9 +44,7 @@ public void testEncryption() throws SQLException { clone.get("sid").asText()), JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" + "oracle.net.encryption_types_client=( " - + algorithm + " )") - ) - ); + + algorithm + " )"))); final String networkServiceBanner = "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)"; @@ -77,9 +75,7 @@ public void testCheckProtocol() throws SQLException { clone.get("port").asInt(), clone.get("sid").asText()), JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED;" + - "oracle.net.encryption_types_client=( " + algorithm + " )", ";") - ) - ); + "oracle.net.encryption_types_client=( " + algorithm + " )", ";"))); final String networkServiceBanner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual"; final List collect = database.queryJsons(networkServiceBanner); diff --git a/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java index b19c0e6ef635d..6afef39e4d6eb 100644 --- a/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java @@ -24,7 +24,6 @@ import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; -import java.io.Closeable; import java.util.HashMap; import java.util.List; import javax.sql.DataSource; @@ -67,8 +66,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc config.get("port").asInt(), config.get("sid").asText()), JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED;" + - "oracle.net.encryption_types_client=( 3DES168 )", ";") - ); + "oracle.net.encryption_types_client=( 3DES168 )", ";")); try { final JdbcDatabase database = new DefaultJdbcDatabase(dataSource); diff --git a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AbstractSshOracleSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AbstractSshOracleSourceAcceptanceTest.java index a964ec74b7bfa..6311e46ac3b89 100644 --- a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AbstractSshOracleSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AbstractSshOracleSourceAcceptanceTest.java @@ -74,7 +74,7 @@ private void populateDatabaseTestData() throws Exception { connection.createStatement().execute("INSERT INTO jdbc_space.starships (id, name) VALUES (3, 'yamato')"); }); } finally { - DataSourceFactory.close(dataSource); + DataSourceFactory.close(dataSource); } } diff --git a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java index 88f42c5febf0b..2ecb6ea85487e 100644 --- a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java @@ -56,7 +56,8 @@ protected Database setupDatabase() throws Exception { String.format(DatabaseDriver.ORACLE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("sid").asText()), null); + config.get("sid").asText()), + null); final Database database = new Database(dslContext); LOGGER.warn("config: " + config); diff --git a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java index cc0e0842f5ad5..a9e66c7c3574f 100644 --- a/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java @@ -44,9 +44,7 @@ public void testEncrytion() throws SQLException { clone.get("sid").asText()), JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" + "oracle.net.encryption_types_client=( " - + algorithm + " )") - ) - ); + + algorithm + " )"))); final String networkServiceBanner = "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)"; @@ -66,9 +64,7 @@ public void testNoneEncrytion() throws SQLException { String.format(DatabaseDriver.ORACLE.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("sid").asText()) - ) - ); + config.get("sid").asText()))); final String networkServiceBanner = "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)"; @@ -99,8 +95,7 @@ public void testCheckProtocol() throws SQLException { config.get("sid").asText()), JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" + "oracle.net.encryption_types_client=( " - + algorithm + " )") - )); + + algorithm + " )"))); final String networkServiceBanner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual"; final List collect = database.queryJsons(networkServiceBanner); diff --git a/airbyte-integrations/connectors/source-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceStrictEncryptAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceStrictEncryptAcceptanceTest.java index 47ae986902887..c1c2d1b491c73 100644 --- a/airbyte-integrations/connectors/source-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceStrictEncryptAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceStrictEncryptAcceptanceTest.java @@ -61,7 +61,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)) { + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java index 583b9e9354c40..007e34700f3e7 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java @@ -67,7 +67,8 @@ private static void populateDatabaseTestData() throws Exception { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)) { + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java index 071327e2f41b6..514ec93d7d994 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java @@ -82,7 +82,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)) { + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); /** diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceDatatypeTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceDatatypeTest.java index 530b7d455f089..a068e85ac6ac1 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceDatatypeTest.java @@ -17,7 +17,6 @@ import java.util.List; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.DSL; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.utility.MountableFile; @@ -67,7 +66,8 @@ protected Database setupDatabase() throws Exception { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java index 268d8198ded8f..0a068e54ff2d6 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java @@ -62,7 +62,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES)) { + config.get("database").asText()), + SQLDialect.POSTGRES)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java index 464be21e70223..8824454e740b2 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java @@ -18,7 +18,6 @@ import java.util.Set; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.DSL; import org.testcontainers.containers.PostgreSQLContainer; public class PostgresSourceDatatypeTest extends AbstractSourceDatabaseTypeTest { @@ -52,7 +51,8 @@ protected Database setupDatabase() throws SQLException { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/airbyte-integrations/connectors/source-postgres/src/test-performance/java/io/airbyte/integrations/source/postgres/FillPostgresTestDbScriptTest.java b/airbyte-integrations/connectors/source-postgres/src/test-performance/java/io/airbyte/integrations/source/postgres/FillPostgresTestDbScriptTest.java index 3d8a7a51e6cd3..06c62daed1eb9 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-performance/java/io/airbyte/integrations/source/postgres/FillPostgresTestDbScriptTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-performance/java/io/airbyte/integrations/source/postgres/FillPostgresTestDbScriptTest.java @@ -59,7 +59,8 @@ protected Database setupDatabase(final String dbName) throws Exception { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); final Database database = new Database(dslContext); return database; diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java index 1d5079a54fa83..f7de0ef95dceb 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java @@ -124,7 +124,8 @@ private static DSLContext getDslContext(final JsonNode config) { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); } @Test @@ -178,9 +179,7 @@ protected CdcTargetPosition cdcLatestTargetPosition() { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); return PostgresCdcTargetPosition.targetPosition(database); } diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java index d93ab1369792b..a784da04d9d1e 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java @@ -22,7 +22,6 @@ import io.airbyte.commons.util.MoreIterators; import io.airbyte.db.Database; import io.airbyte.db.factory.DSLContextFactory; -import io.airbyte.db.factory.DataSourceFactory; import io.airbyte.db.factory.DatabaseDriver; import io.airbyte.protocol.models.AirbyteCatalog; import io.airbyte.protocol.models.AirbyteMessage; @@ -38,7 +37,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.sql.DataSource; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.junit.jupiter.api.AfterAll; @@ -103,25 +101,25 @@ void setup() throws Exception { PostgreSQLContainerHelper.runSqlScript(MountableFile.forHostPath(tmpFilePath), PSQL_DB); final JsonNode config = getConfig(PSQL_DB, dbName); - try (final DSLContext dslContext = getDslContext(config)) { - final Database database = getDatabase(dslContext); - database.query(ctx -> { - ctx.fetch("CREATE TABLE id_and_name(id NUMERIC(20, 10), name VARCHAR(200), power double precision, PRIMARY KEY (id));"); - ctx.fetch("CREATE INDEX i1 ON id_and_name (id);"); - ctx.fetch( - "INSERT INTO id_and_name (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');"); - - ctx.fetch("CREATE TABLE id_and_name2(id NUMERIC(20, 10), name VARCHAR(200), power double precision);"); - ctx.fetch( - "INSERT INTO id_and_name2 (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');"); - - ctx.fetch( - "CREATE TABLE names(first_name VARCHAR(200), last_name VARCHAR(200), power double precision, PRIMARY KEY (first_name, last_name));"); - ctx.fetch( - "INSERT INTO names (first_name, last_name, power) VALUES ('san', 'goku', 'Infinity'), ('prince', 'vegeta', 9000.1), ('piccolo', 'junior', '-Infinity');"); - return null; - }); - } + try (final DSLContext dslContext = getDslContext(config)) { + final Database database = getDatabase(dslContext); + database.query(ctx -> { + ctx.fetch("CREATE TABLE id_and_name(id NUMERIC(20, 10), name VARCHAR(200), power double precision, PRIMARY KEY (id));"); + ctx.fetch("CREATE INDEX i1 ON id_and_name (id);"); + ctx.fetch( + "INSERT INTO id_and_name (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');"); + + ctx.fetch("CREATE TABLE id_and_name2(id NUMERIC(20, 10), name VARCHAR(200), power double precision);"); + ctx.fetch( + "INSERT INTO id_and_name2 (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');"); + + ctx.fetch( + "CREATE TABLE names(first_name VARCHAR(200), last_name VARCHAR(200), power double precision, PRIMARY KEY (first_name, last_name));"); + ctx.fetch( + "INSERT INTO names (first_name, last_name, power) VALUES ('san', 'goku', 'Infinity'), ('prince', 'vegeta', 9000.1), ('piccolo', 'junior', '-Infinity');"); + return null; + }); + } } private static Database getDatabase(final DSLContext dslContext) { @@ -136,7 +134,8 @@ private static DSLContext getDslContext(final JsonNode config) { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); } private JsonNode getConfig(final PostgreSQLContainer psqlDb, final String dbName) { diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java index c8cd44c8adbad..5915da337a921 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java @@ -38,10 +38,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.xml.crypto.Data; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.DSL; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -160,7 +158,8 @@ private static DSLContext getDslContextWithSpecifiedUser(final JsonNode config, String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); } private static Database getDatabase(final DSLContext dslContext) { @@ -175,7 +174,8 @@ private static DSLContext getDslContext(final JsonNode config) { String.format(DatabaseDriver.POSTGRESQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.POSTGRES); + config.get("database").asText()), + SQLDialect.POSTGRES); } private JsonNode getConfig(final PostgreSQLContainer psqlDb, final String dbName) { diff --git a/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java index 69111c7b9e2c5..6703c050960ed 100644 --- a/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSourceAcceptanceTest.java @@ -89,9 +89,7 @@ protected JdbcDatabase createDatabase(final JsonNode config) { String.format(DatabaseDriver.REDSHIFT.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()) - ) - ); + config.get("database").asText()))); } protected void createTestUser(final JdbcDatabase database, final JsonNode config, final String testUserName, final String testUserPassword) diff --git a/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java index dca9f744716d5..8b1dc8453f83a 100644 --- a/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-redshift/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java @@ -25,9 +25,7 @@ protected JdbcDatabase createDatabase(final JsonNode config) { config.get("port").asInt(), config.get("database").asText()), JdbcUtils.parseJdbcParameters("ssl=true&" + - "sslfactory=com.amazon.redshift.ssl.NonValidatingFactory") - ) - ); + "sslfactory=com.amazon.redshift.ssl.NonValidatingFactory"))); } } diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java index 3213c2741b7e8..c991f0e700a11 100644 --- a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java @@ -142,8 +142,7 @@ protected DataSource createDataSource() { String.format(DatabaseDriver.SNOWFLAKE.getUrlFormatString(), config.get("host").asText()), Map.of("role", config.get("role").asText(), "warehouse", config.get("warehouse").asText(), - "database", config.get("database").asText()) - ); + "database", config.get("database").asText())); } @Test diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java index 94ad58f63d87a..bd9b2e211e92d 100644 --- a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java @@ -20,7 +20,6 @@ import org.apache.commons.lang3.RandomStringUtils; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.junit.jupiter.api.BeforeEach; public class SnowflakeSourceDatatypeTest extends AbstractSourceDatabaseTypeTest { diff --git a/airbyte-integrations/connectors/source-tidb/src/test-integration/java/io/airbyte/integrations/source/tidb/TiDBSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-tidb/src/test-integration/java/io/airbyte/integrations/source/tidb/TiDBSourceAcceptanceTest.java index 834e55177efe8..dc87734c5f382 100755 --- a/airbyte-integrations/connectors/source-tidb/src/test-integration/java/io/airbyte/integrations/source/tidb/TiDBSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-tidb/src/test-integration/java/io/airbyte/integrations/source/tidb/TiDBSourceAcceptanceTest.java @@ -56,7 +56,8 @@ protected void setupEnvironment(final TestDestinationEnv testEnv) throws Excepti String.format(DatabaseDriver.MYSQL.getUrlFormatString(), config.get("host").asText(), config.get("port").asInt(), - config.get("database").asText()), SQLDialect.MYSQL)) { + config.get("database").asText()), + SQLDialect.MYSQL)) { final Database database = new Database(dslContext); database.query(ctx -> { diff --git a/build.gradle b/build.gradle index 7a23930258d97..c4441a9af8a2a 100644 --- a/build.gradle +++ b/build.gradle @@ -103,6 +103,7 @@ def createSpotlessTarget = { pattern -> 'secrets', 'charts', // Helm charts often have injected template strings that will fail general linting. Helm linting is done separately. 'resources/seed/*_specs.yaml', // Do not remove - this is necessary to prevent diffs in our github workflows, as the file diff check runs between the Format step and the Build step, the latter of which generates the file. + 'airbyte-integrations/connectors/source-amplitude/unit_tests/api_data/zipped.json', // Zipped file presents as non-UTF-8 making spotless sad ] if (System.getenv().containsKey("SUB_BUILD")) {