From e2911996d733d939af85cb8e4f906f459ad7348f Mon Sep 17 00:00:00 2001 From: stephane-airbyte Date: Mon, 27 Nov 2023 20:44:55 +0000 Subject: [PATCH] Automated Commit - Formatting Changes --- ...bstractCdcPostgresSourceSslAcceptanceTest.java | 4 ++-- ...ostgresSourceSSLCertificateAcceptanceTest.java | 4 ++-- .../AbstractSshPostgresSourceAcceptanceTest.java | 4 ++-- ...eCaCertificateSslAcceptanceLegacyCtidTest.java | 6 +++--- ...tgresSourceCaCertificateSslAcceptanceTest.java | 6 +++--- ...resSourceFullCertificateSslAcceptanceTest.java | 6 +++--- ...InitialSnapshotPostgresSourceDatatypeTest.java | 4 ++-- ...CdcPostgresSourceAcceptanceLegacyCtidTest.java | 6 +++--- .../sources/CdcPostgresSourceAcceptanceTest.java | 6 +++--- .../CdcWalLogsPostgresSourceDatatypeTest.java | 4 ++-- ...oudDeploymentPostgresSourceAcceptanceTest.java | 4 ++-- .../PostgresSourceAcceptanceLegacyCtidTest.java | 6 +++--- .../sources/PostgresSourceAcceptanceTest.java | 6 +++--- .../sources/PostgresSourceDatatypeTest.java | 4 ++-- .../sources/XminPostgresSourceAcceptanceTest.java | 4 ++-- .../source/postgres/CdcPostgresSourceTest.java | 6 +++--- .../CloudDeploymentPostgresSourceTest.java | 8 ++++---- .../PostgresCdcGetPublicizedTablesTest.java | 4 ++-- .../PostgresJdbcSourceAcceptanceTest.java | 4 ++-- .../postgres/PostgresSourceOperationsTest.java | 4 ++-- .../source/postgres/PostgresSourceSSLTest.java | 4 ++-- .../source/postgres/PostgresSourceTest.java | 6 +++--- .../source/postgres/PostgresStressTest.java | 1 - .../source/postgres/XminPostgresSourceTest.java | 6 +++--- .../XminPostgresWithOldServerSourceTest.java | 6 +++--- .../source/postgres/PostgresTestDatabase.java | 15 +++++++++------ 26 files changed, 70 insertions(+), 68 deletions(-) diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java index 57d5209991001..ec062873dbca6 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode; import io.airbyte.cdk.integrations.standardtest.source.TestDestinationEnv; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import java.util.Map; public abstract class AbstractCdcPostgresSourceSslAcceptanceTest extends CdcPostgresSourceAcceptanceTest { @@ -34,7 +34,7 @@ protected JsonNode getConfig() { .build(); } - protected abstract PostgresBaseImage getServerImage(); + protected abstract BaseImage getServerImage(); public abstract Map getCertificateConfiguration(); diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java index 6bf256d1886b7..50f2a5f51c807 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java @@ -11,7 +11,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.CatalogHelpers; @@ -40,7 +40,7 @@ protected FeatureFlags featureFlags() { @Override protected void setupEnvironment(final TestDestinationEnv environment) throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withCert") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withCert") .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));") .with("INSERT INTO id_and_name (id, name) VALUES (1,'picard'), (2, 'crusher'), (3, 'vash');") .with("CREATE TABLE starships(id INTEGER, name VARCHAR(200));") 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 17b97e95a8b2a..403fbf213ca9a 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 @@ -18,7 +18,7 @@ import io.airbyte.commons.functional.CheckedFunction; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.CatalogHelpers; @@ -85,7 +85,7 @@ protected FeatureFlags featureFlags() { // requiring data to already be in place. @Override protected void setupEnvironment(final TestDestinationEnv environment) throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withNetwork"); + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withNetwork"); bastion.initAndStartBastion(testdb.getContainer().getNetwork()); populateDatabaseTestData(); } diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java index fad3ac81f9420..4ea26c27a6bcf 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java @@ -4,13 +4,13 @@ package io.airbyte.integrations.io.airbyte.integration_tests.sources; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; public class CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest extends CDCPostgresSourceCaCertificateSslAcceptanceTest { @Override - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_12_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_12_BULLSEYE; } } diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java index 5fa9f403839b0..9adb4c5771f75 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java @@ -5,7 +5,7 @@ package io.airbyte.integrations.io.airbyte.integration_tests.sources; import com.google.common.collect.ImmutableMap; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import java.util.Map; public class CDCPostgresSourceCaCertificateSslAcceptanceTest extends AbstractCdcPostgresSourceSslAcceptanceTest { @@ -19,8 +19,8 @@ public Map getCertificateConfiguration() { } @Override - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_16_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_16_BULLSEYE; } } diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java index 7081fcbd6e8a8..1fb6ee0f24a1c 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java @@ -5,7 +5,7 @@ package io.airbyte.integrations.io.airbyte.integration_tests.sources; import com.google.common.collect.ImmutableMap; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import java.util.Map; public class CDCPostgresSourceFullCertificateSslAcceptanceTest extends AbstractCdcPostgresSourceSslAcceptanceTest { @@ -23,8 +23,8 @@ public Map getCertificateConfiguration() { } @Override - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_16_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_16_BULLSEYE; } } diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java index 95447d4a74e22..ad2c1b75537d2 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java @@ -10,7 +10,7 @@ import io.airbyte.commons.features.FeatureFlags; import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.JsonSchemaType; public class CdcInitialSnapshotPostgresSourceDatatypeTest extends AbstractPostgresSourceDatatypeTest { @@ -24,7 +24,7 @@ protected FeatureFlags featureFlags() { @Override protected Database setupDatabase() throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf") .with("CREATE EXTENSION hstore;") .with("CREATE SCHEMA TEST;") .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');") diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java index 3f9260b43a670..6bde82a7001ce 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java @@ -4,13 +4,13 @@ package io.airbyte.integrations.io.airbyte.integration_tests.sources; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; public class CdcPostgresSourceAcceptanceLegacyCtidTest extends CdcPostgresSourceAcceptanceTest { @Override - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_12_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_12_BULLSEYE; } } 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 d45dec1a278ef..ff96b73926de4 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 @@ -14,7 +14,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteMessage; @@ -169,8 +169,8 @@ private void verifyFieldNotExist(final List records, final .isEmpty(), "Records contain unselected columns [%s:%s]".formatted(stream, field)); } - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_16_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_16_BULLSEYE; } } diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java index f065d257d5171..1ee4961504434 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java @@ -11,7 +11,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteMessage; import io.airbyte.protocol.models.v0.AirbyteStateMessage; @@ -72,7 +72,7 @@ protected FeatureFlags featureFlags() { @Override protected Database setupDatabase() { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf") .with("CREATE EXTENSION hstore;") .with("CREATE SCHEMA TEST;") .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');") diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java index d08e9dcad45d9..c8ebb1595727b 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java @@ -16,7 +16,7 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.commons.resources.MoreResources; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.CatalogHelpers; @@ -50,7 +50,7 @@ protected FeatureFlags featureFlags() { @Override protected void setupEnvironment(final TestDestinationEnv environment) throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withCert"); + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withCert"); testdb.query(ctx -> { ctx.fetch("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));"); ctx.fetch("INSERT INTO id_and_name (id, name) VALUES (1,'picard'), (2, 'crusher'), (3, 'vash');"); diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java index 72a5af0e7c41a..2e5565173c798 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java @@ -4,13 +4,13 @@ package io.airbyte.integrations.io.airbyte.integration_tests.sources; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; public class PostgresSourceAcceptanceLegacyCtidTest extends PostgresSourceAcceptanceTest { @Override - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_12_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_12_BULLSEYE; } } 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 99bde33e98ec4..bc04140e5d1e2 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 @@ -16,7 +16,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteCatalog; @@ -201,8 +201,8 @@ private ConfiguredAirbyteCatalog getLimitPermissionConfiguredCatalog() { .withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))))); } - protected PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_16_BULLSEYE; + protected BaseImage getServerImage() { + return BaseImage.POSTGRES_16_BULLSEYE; } } 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 1c96505c0090d..9991f8dca3e29 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 @@ -9,7 +9,7 @@ import io.airbyte.commons.features.FeatureFlags; import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import java.sql.SQLException; public class PostgresSourceDatatypeTest extends AbstractPostgresSourceDatatypeTest { @@ -21,7 +21,7 @@ protected FeatureFlags featureFlags() { @Override protected Database setupDatabase() throws SQLException { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf") .with("CREATE SCHEMA %S;", SCHEMA_NAME) .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');") .with("CREATE TYPE inventory_item AS (name text, supplier_id integer, price numeric);") diff --git a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java index c60cd287cb02a..521670f0bb3c0 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java @@ -11,7 +11,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.integrations.source.postgres.PostgresTestDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.CatalogHelpers; @@ -47,7 +47,7 @@ protected FeatureFlags featureFlags() { @Override protected void setupEnvironment(final TestDestinationEnv environment) throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_12_BULLSEYE) + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_12_BULLSEYE) .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));") .with("INSERT INTO id_and_name (id, name) VALUES (1,'picard'), (2, 'crusher'), (3, 'vash');") .with("CREATE TABLE starships(id INTEGER, name VARCHAR(200));") 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 b605970f2439a..1491ae58b623b 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 @@ -40,7 +40,7 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.commons.util.AutoCloseableIterator; import io.airbyte.commons.util.AutoCloseableIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteCatalog; @@ -889,8 +889,8 @@ protected void compareTargetPositionFromTheRecordsWithTargetPostionGeneratedBefo assertTrue(extractPosition(record.getData()).targetLsn.compareTo(((PostgresCdcTargetPosition) targetPosition).targetLsn) >= 0); } - protected static PostgresBaseImage getServerImage() { - return PostgresBaseImage.POSTGRES_16_BULLSEYE; + protected static BaseImage getServerImage() { + return BaseImage.POSTGRES_16_BULLSEYE; } } diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java index b5a76e4fc13cc..0f4f661df778b 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java @@ -19,7 +19,7 @@ import io.airbyte.commons.features.EnvVariableFeatureFlags; import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.v0.AirbyteConnectionStatus; import java.util.List; import java.util.Map; @@ -37,14 +37,14 @@ public class CloudDeploymentPostgresSourceTest { @BeforeAll static void setupContainers() { - DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withNetwork"); + DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withNetwork"); NETWORK_NO_SSL = DB_NO_SSL_WITH_NETWORK.getContainer().getNetwork(); BASTION_NO_SSL = new SshBastionContainer(); BASTION_NO_SSL.initAndStartBastion(NETWORK_NO_SSL); - DB_WITH_SSL = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL"); + DB_WITH_SSL = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL"); - DB_WITH_SSL_WITH_NETWORK = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL", "withNetwork"); + DB_WITH_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL", "withNetwork"); NETWORK_WITH_SSL = DB_WITH_SSL_WITH_NETWORK.getContainer().getNetwork(); BASTION_WITH_SSL = new SshBastionContainer(); BASTION_WITH_SSL.initAndStartBastion(NETWORK_WITH_SSL); diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java index 36ac7bdb46ab0..a7be441607d5a 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JsonNode; import io.airbyte.cdk.db.jdbc.DefaultJdbcDatabase; import io.airbyte.cdk.db.jdbc.JdbcDatabase; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.v0.AirbyteStreamNameNamespacePair; import java.sql.SQLException; import java.util.Set; @@ -27,7 +27,7 @@ class PostgresCdcGetPublicizedTablesTest { @BeforeEach void setup() { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf") .with("create table table_1 (id serial primary key, text_column text);") .with("create table table_2 (id serial primary key, text_column text);") .with("create table table_irrelevant (id serial primary key, text_column text);") diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java index edb4803f58b20..93d8a6f79ad20 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java @@ -25,7 +25,7 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.commons.resources.MoreResources; import io.airbyte.commons.util.MoreIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.integrations.source.postgres.internal.models.CursorBasedStatus; import io.airbyte.integrations.source.postgres.internal.models.InternalModels.StateType; import io.airbyte.protocol.models.Field; @@ -90,7 +90,7 @@ protected PostgresSource source() { @Override protected PostgresTestDatabase createTestDatabase() { - return PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE); + return PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE); } @Override diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java index 70b491aba21be..d732828e0b72a 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import io.airbyte.cdk.db.jdbc.DateTimeConverter; import io.airbyte.commons.json.Jsons; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -34,7 +34,7 @@ class PostgresSourceOperationsTest { @BeforeEach public void init() { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf"); + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf"); } @AfterEach 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 84cabe3efb41b..57a9155da5370 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 @@ -19,7 +19,7 @@ import io.airbyte.cdk.db.jdbc.JdbcUtils; import io.airbyte.commons.json.Jsons; import io.airbyte.commons.util.MoreIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteCatalog; @@ -77,7 +77,7 @@ class PostgresSourceSSLTest { @BeforeEach void setup() throws Exception { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL") + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL") .with("CREATE TABLE id_and_name(id NUMERIC(20, 10) NOT NULL, name VARCHAR(200) NOT NULL, power double precision NOT NULL, PRIMARY KEY (id));") .with("CREATE INDEX i1 ON id_and_name (id);") .with("INSERT INTO id_and_name (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');") 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 dfc1331f3b499..f78a7af06150a 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 @@ -31,7 +31,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.commons.util.MoreIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaPrimitiveUtil.JsonSchemaPrimitive; import io.airbyte.protocol.models.JsonSchemaType; @@ -136,7 +136,7 @@ class PostgresSourceTest { @BeforeEach void setup() { - testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE) + testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE) .with("CREATE TABLE id_and_name(id NUMERIC(20, 10) NOT NULL, name VARCHAR(200) NOT NULL, power double precision NOT NULL, PRIMARY KEY (id));") .with("CREATE INDEX i1 ON id_and_name (id);") .with("INSERT INTO id_and_name (id, name, power) VALUES (1,'goku', 'Infinity'), (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');") @@ -224,7 +224,7 @@ public void testCanReadTablesAndColumnsWithDoubleQuotes() throws Exception { public void testCanReadUtf8() throws Exception { // force the db server to start with sql_ascii encoding to verify the source can read UTF8 even when // default settings are in another encoding - try (final var asciiTestDB = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_ALPINE, "withASCII") + try (final var asciiTestDB = PostgresTestDatabase.in(BaseImage.POSTGRES_16_ALPINE, "withASCII") .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));") .with("INSERT INTO id_and_name (id, name) VALUES (1,E'\\u2013 someutfstring'), (2, E'\\u2215');")) { final var config = asciiTestDB.testConfigBuilder().withSchemas(SCHEMA_NAME).withoutSsl().build(); diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java index 614786fb605e5..c68be6d1be110 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java @@ -17,7 +17,6 @@ import io.airbyte.commons.io.IOs; import io.airbyte.commons.json.Jsons; import io.airbyte.commons.string.Strings; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; import java.sql.JDBCType; import java.util.Optional; import java.util.Set; diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java index f41c207cc7782..63817b9f16744 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java @@ -22,7 +22,7 @@ import io.airbyte.commons.features.FeatureFlagsWrapper; import io.airbyte.commons.json.Jsons; import io.airbyte.commons.util.MoreIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.v0.AirbyteCatalog; @@ -91,8 +91,8 @@ class XminPostgresSourceTest { protected PostgresTestDatabase testdb; - protected PostgresBaseImage getDatabaseImage() { - return PostgresBaseImage.POSTGRES_12_BULLSEYE; + protected BaseImage getDatabaseImage() { + return BaseImage.POSTGRES_12_BULLSEYE; } @BeforeEach diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java index ea71f3b490a7b..e53f05b94ed83 100644 --- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java +++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java @@ -14,7 +14,7 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.commons.util.MoreIterators; -import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage; +import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage; import io.airbyte.protocol.models.v0.AirbyteMessage; import io.airbyte.protocol.models.v0.AirbyteStateMessage; import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog; @@ -26,8 +26,8 @@ public class XminPostgresWithOldServerSourceTest extends XminPostgresSourceTest { @Override - protected PostgresBaseImage getDatabaseImage() { - return PostgresBaseImage.POSTGRES_9_ALPINE; + protected BaseImage getDatabaseImage() { + return BaseImage.POSTGRES_9_ALPINE; } @Test diff --git a/airbyte-integrations/connectors/source-postgres/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java b/airbyte-integrations/connectors/source-postgres/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java index 33591e8f92512..9702690d94b7b 100644 --- a/airbyte-integrations/connectors/source-postgres/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java +++ b/airbyte-integrations/connectors/source-postgres/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java @@ -19,23 +19,26 @@ public class PostgresTestDatabase extends TestDatabase, PostgresTestDatabase, PostgresTestDatabase.PostgresConfigBuilder> { - public static enum PostgresBaseImage { + public static enum BaseImage { + POSTGRES_16_BULLSEYE("postgres:16-bullseye"), POSTGRES_12_BULLSEYE("postgres:12-bullseye"), POSTGRES_16_ALPINE("postgres:16-alpine"), POSTGRES_9_ALPINE("postgres:9-alpine"), POSTGRES_SSL_DEV("marcosmarxm/postgres-ssl:dev"), + DUMMY(""), ; - private final String imageName; - PostgresBaseImage(String imageName) { - this.imageName = imageName; + private final String reference; + + private BaseImage(String reference) { + this.reference = reference; }; } - static public PostgresTestDatabase in(PostgresBaseImage imageName, String... methods) { - final var container = new PostgresContainerFactory().shared(imageName.name(), methods); + static public PostgresTestDatabase in(BaseImage imageName, String... methods) { + final var container = new PostgresContainerFactory().shared(imageName.reference, methods); return new PostgresTestDatabase(container).initialized(); }