diff --git a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DbtJobOrchestrator.java b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DbtJobOrchestrator.java index a7b043f75a1ea..2ae8d508bd58b 100644 --- a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DbtJobOrchestrator.java +++ b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DbtJobOrchestrator.java @@ -8,10 +8,10 @@ import io.airbyte.config.OperatorDbtInput; import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; -import io.airbyte.workers.DbtTransformationRunner; -import io.airbyte.workers.DbtTransformationWorker; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.general.DbtTransformationRunner; +import io.airbyte.workers.general.DbtTransformationWorker; import io.airbyte.workers.normalization.NormalizationRunnerFactory; import io.airbyte.workers.process.KubePodProcess; import io.airbyte.workers.process.ProcessFactory; diff --git a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DefaultAsyncStateManager.java b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DefaultAsyncStateManager.java index 212d9adef5786..ed234f224444e 100644 --- a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DefaultAsyncStateManager.java +++ b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DefaultAsyncStateManager.java @@ -4,9 +4,9 @@ package io.airbyte.container_orchestrator; +import io.airbyte.workers.general.DocumentStoreClient; import io.airbyte.workers.process.AsyncKubePodStatus; import io.airbyte.workers.process.KubePodInfo; -import io.airbyte.workers.storage.DocumentStoreClient; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/NormalizationJobOrchestrator.java b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/NormalizationJobOrchestrator.java index 0353b0bb5e905..6a38c423987eb 100644 --- a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/NormalizationJobOrchestrator.java +++ b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/NormalizationJobOrchestrator.java @@ -10,11 +10,11 @@ import io.airbyte.config.NormalizationSummary; import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; -import io.airbyte.workers.DefaultNormalizationWorker; -import io.airbyte.workers.NormalizationWorker; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.general.DefaultNormalizationWorker; import io.airbyte.workers.normalization.NormalizationRunnerFactory; +import io.airbyte.workers.normalization.NormalizationWorker; import io.airbyte.workers.process.KubePodProcess; import io.airbyte.workers.process.ProcessFactory; import io.airbyte.workers.temporal.sync.ReplicationLauncherWorker; diff --git a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ReplicationJobOrchestrator.java b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ReplicationJobOrchestrator.java index c154996dff307..55d65a7e9726b 100644 --- a/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ReplicationJobOrchestrator.java +++ b/airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ReplicationJobOrchestrator.java @@ -10,22 +10,22 @@ import io.airbyte.config.StandardSyncInput; import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; -import io.airbyte.workers.DefaultReplicationWorker; import io.airbyte.workers.RecordSchemaValidator; -import io.airbyte.workers.ReplicationWorker; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.general.DefaultReplicationWorker; +import io.airbyte.workers.general.ReplicationWorker; +import io.airbyte.workers.internal.AirbyteMessageTracker; +import io.airbyte.workers.internal.AirbyteSource; +import io.airbyte.workers.internal.DefaultAirbyteDestination; +import io.airbyte.workers.internal.DefaultAirbyteSource; +import io.airbyte.workers.internal.EmptyAirbyteSource; +import io.airbyte.workers.internal.NamespacingMapper; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.IntegrationLauncher; import io.airbyte.workers.process.KubePodProcess; import io.airbyte.workers.process.ProcessFactory; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageTracker; -import io.airbyte.workers.protocols.airbyte.AirbyteSource; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteDestination; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteSource; -import io.airbyte.workers.protocols.airbyte.EmptyAirbyteSource; -import io.airbyte.workers.protocols.airbyte.NamespacingMapper; import io.airbyte.workers.temporal.sync.ReplicationLauncherWorker; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-container-orchestrator/src/test/java/io/airbyte/container_orchestrator/DefaultAsyncStateManagerTest.java b/airbyte-container-orchestrator/src/test/java/io/airbyte/container_orchestrator/DefaultAsyncStateManagerTest.java index c543d3d6a8238..07840b95a971e 100644 --- a/airbyte-container-orchestrator/src/test/java/io/airbyte/container_orchestrator/DefaultAsyncStateManagerTest.java +++ b/airbyte-container-orchestrator/src/test/java/io/airbyte/container_orchestrator/DefaultAsyncStateManagerTest.java @@ -9,9 +9,9 @@ import static org.mockito.Mockito.*; import static org.mockito.Mockito.when; +import io.airbyte.workers.general.DocumentStoreClient; import io.airbyte.workers.process.AsyncKubePodStatus; import io.airbyte.workers.process.KubePodInfo; -import io.airbyte.workers.storage.DocumentStoreClient; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java index f14c64455f0cf..b3b167f3e165b 100644 --- a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java +++ b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/DestinationAcceptanceTest.java @@ -43,19 +43,19 @@ import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.protocol.models.SyncMode; -import io.airbyte.workers.DbtTransformationRunner; -import io.airbyte.workers.DefaultCheckConnectionWorker; -import io.airbyte.workers.DefaultGetSpecWorker; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.general.DbtTransformationRunner; +import io.airbyte.workers.general.DefaultCheckConnectionWorker; +import io.airbyte.workers.general.DefaultGetSpecWorker; +import io.airbyte.workers.helper.EntrypointEnvChecker; +import io.airbyte.workers.internal.AirbyteDestination; +import io.airbyte.workers.internal.DefaultAirbyteDestination; import io.airbyte.workers.normalization.NormalizationRunner; import io.airbyte.workers.normalization.NormalizationRunnerFactory; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.DockerProcessFactory; import io.airbyte.workers.process.ProcessFactory; -import io.airbyte.workers.protocols.airbyte.AirbyteDestination; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteDestination; -import io.airbyte.workers.test_helpers.EntrypointEnvChecker; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/LocalAirbyteDestination.java b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/LocalAirbyteDestination.java index 8b3e2e8a315b0..c1ca42d5641fe 100644 --- a/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/LocalAirbyteDestination.java +++ b/airbyte-integrations/bases/standard-destination-test/src/main/java/io/airbyte/integrations/standardtest/destination/LocalAirbyteDestination.java @@ -8,7 +8,7 @@ import io.airbyte.integrations.base.AirbyteMessageConsumer; import io.airbyte.integrations.base.Destination; import io.airbyte.protocol.models.AirbyteMessage; -import io.airbyte.workers.protocols.airbyte.AirbyteDestination; +import io.airbyte.workers.internal.AirbyteDestination; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java b/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java index 9bc01f2f7208a..3f99b6b8a3840 100644 --- a/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java +++ b/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java @@ -22,17 +22,17 @@ import io.airbyte.protocol.models.AirbyteRecordMessage; import io.airbyte.protocol.models.ConfiguredAirbyteCatalog; import io.airbyte.protocol.models.ConnectorSpecification; -import io.airbyte.workers.DefaultCheckConnectionWorker; -import io.airbyte.workers.DefaultDiscoverCatalogWorker; -import io.airbyte.workers.DefaultGetSpecWorker; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.general.DefaultCheckConnectionWorker; +import io.airbyte.workers.general.DefaultDiscoverCatalogWorker; +import io.airbyte.workers.general.DefaultGetSpecWorker; +import io.airbyte.workers.helper.EntrypointEnvChecker; +import io.airbyte.workers.internal.AirbyteSource; +import io.airbyte.workers.internal.DefaultAirbyteSource; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.DockerProcessFactory; import io.airbyte.workers.process.ProcessFactory; -import io.airbyte.workers.protocols.airbyte.AirbyteSource; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteSource; -import io.airbyte.workers.test_helpers.EntrypointEnvChecker; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; diff --git a/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/JobSubmitter.java b/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/JobSubmitter.java index 996818cc6d92d..8225c567930df 100644 --- a/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/JobSubmitter.java +++ b/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/JobSubmitter.java @@ -19,8 +19,8 @@ import io.airbyte.scheduler.persistence.JobPersistence; import io.airbyte.scheduler.persistence.job_tracker.JobTracker; import io.airbyte.scheduler.persistence.job_tracker.JobTracker.JobState; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; -import io.airbyte.workers.worker_run.WorkerRun; +import io.airbyte.workers.run.TemporalWorkerRunFactory; +import io.airbyte.workers.run.WorkerRun; import java.nio.file.Path; import java.util.Optional; import java.util.Set; diff --git a/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/SchedulerApp.java b/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/SchedulerApp.java index 81d55e9e19ddf..0e23afdefda0e 100644 --- a/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/SchedulerApp.java +++ b/airbyte-scheduler/app/src/main/java/io/airbyte/scheduler/app/SchedulerApp.java @@ -42,8 +42,8 @@ import io.airbyte.scheduler.persistence.WorkspaceHelper; import io.airbyte.scheduler.persistence.job_tracker.JobTracker; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.run.TemporalWorkerRunFactory; import io.airbyte.workers.temporal.TemporalClient; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; import java.io.IOException; import java.nio.file.Path; import java.time.Duration; diff --git a/airbyte-scheduler/app/src/test/java/io/airbyte/scheduler/app/JobSubmitterTest.java b/airbyte-scheduler/app/src/test/java/io/airbyte/scheduler/app/JobSubmitterTest.java index 3f04243c18bdf..6ad7be1d4def1 100644 --- a/airbyte-scheduler/app/src/test/java/io/airbyte/scheduler/app/JobSubmitterTest.java +++ b/airbyte-scheduler/app/src/test/java/io/airbyte/scheduler/app/JobSubmitterTest.java @@ -40,8 +40,8 @@ import io.airbyte.scheduler.persistence.job_tracker.JobTracker.JobState; import io.airbyte.workers.JobStatus; import io.airbyte.workers.OutputAndStatus; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; -import io.airbyte.workers.worker_run.WorkerRun; +import io.airbyte.workers.run.TemporalWorkerRunFactory; +import io.airbyte.workers.run.WorkerRun; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidator.java b/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidator.java index 5e8e08263bdc7..60888c5919557 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidator.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidator.java @@ -9,6 +9,7 @@ import io.airbyte.protocol.models.AirbyteRecordMessage; import io.airbyte.validation.json.JsonSchemaValidator; import io.airbyte.validation.json.JsonValidationException; +import io.airbyte.workers.exception.RecordSchemaValidationException; import java.util.Map; import java.util.Objects; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java index ffa64ac353998..8e4179dac1e78 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java @@ -4,6 +4,8 @@ package io.airbyte.workers; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.general.DefaultReplicationWorker; import java.nio.file.Path; public interface Worker { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/WorkerApp.java b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerApp.java index 97a1d17b9e229..2a50c37f8d1db 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/WorkerApp.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerApp.java @@ -41,13 +41,14 @@ import io.airbyte.scheduler.persistence.job_factory.OAuthConfigSupplier; import io.airbyte.scheduler.persistence.job_factory.SyncJobFactory; import io.airbyte.scheduler.persistence.job_tracker.JobTracker; +import io.airbyte.workers.general.DocumentStoreClient; import io.airbyte.workers.helper.ConnectionHelper; import io.airbyte.workers.process.DockerProcessFactory; import io.airbyte.workers.process.KubePortManagerSingleton; import io.airbyte.workers.process.KubeProcessFactory; import io.airbyte.workers.process.ProcessFactory; import io.airbyte.workers.process.WorkerHeartbeatServer; -import io.airbyte.workers.storage.DocumentStoreClient; +import io.airbyte.workers.run.TemporalWorkerRunFactory; import io.airbyte.workers.storage.StateClients; import io.airbyte.workers.temporal.TemporalClient; import io.airbyte.workers.temporal.TemporalJobType; @@ -69,7 +70,6 @@ import io.airbyte.workers.temporal.sync.PersistStateActivityImpl; import io.airbyte.workers.temporal.sync.ReplicationActivityImpl; import io.airbyte.workers.temporal.sync.SyncWorkflowImpl; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; import io.temporal.client.WorkflowClient; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidationException.java b/airbyte-workers/src/main/java/io/airbyte/workers/exception/RecordSchemaValidationException.java similarity index 94% rename from airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidationException.java rename to airbyte-workers/src/main/java/io/airbyte/workers/exception/RecordSchemaValidationException.java index 5b31777125723..18f6a5ac523c3 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/RecordSchemaValidationException.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/exception/RecordSchemaValidationException.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.exception; /** * Exception thrown by the RecordSchemaValidator during a sync when AirbyteRecordMessage data does diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java b/airbyte-workers/src/main/java/io/airbyte/workers/exception/WorkerException.java similarity index 88% rename from airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java rename to airbyte-workers/src/main/java/io/airbyte/workers/exception/WorkerException.java index 44286393d1f9c..421ffd573ac2d 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/exception/WorkerException.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.exception; public class WorkerException extends Exception { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/CheckConnectionWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/CheckConnectionWorker.java similarity index 80% rename from airbyte-workers/src/main/java/io/airbyte/workers/CheckConnectionWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/CheckConnectionWorker.java index ed0e04bafa84b..a044e37a2c7c9 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/CheckConnectionWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/CheckConnectionWorker.java @@ -2,9 +2,10 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.StandardCheckConnectionInput; import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.workers.Worker; public interface CheckConnectionWorker extends Worker {} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationRunner.java similarity index 97% rename from airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationRunner.java index 1a1723df0b265..87510b0f44a35 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationRunner.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Strings; @@ -14,6 +14,9 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.config.OperatorDbt; import io.airbyte.config.ResourceRequirements; +import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.normalization.NormalizationRunner; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationWorker.java similarity index 95% rename from airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationWorker.java index 1e8f4b697ede5..69c810fd59e84 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DbtTransformationWorker.java @@ -2,10 +2,12 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.OperatorDbtInput; import io.airbyte.config.ResourceRequirements; +import io.airbyte.workers.Worker; +import io.airbyte.workers.exception.WorkerException; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultCheckConnectionWorker.java similarity index 93% rename from airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultCheckConnectionWorker.java index d6a5204a1ff25..e4230c33374dc 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultCheckConnectionWorker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.commons.enums.Enums; import io.airbyte.commons.io.IOs; @@ -14,9 +14,11 @@ import io.airbyte.protocol.models.AirbyteConnectionStatus; import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteMessage.Type; +import io.airbyte.workers.*; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.internal.AirbyteStreamFactory; +import io.airbyte.workers.internal.DefaultAirbyteStreamFactory; import io.airbyte.workers.process.IntegrationLauncher; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteStreamFactory; import java.io.InputStream; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorker.java similarity index 92% rename from airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorker.java index 53f657c713291..53b6d970224da 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.commons.io.IOs; import io.airbyte.commons.io.LineGobbler; @@ -11,9 +11,11 @@ import io.airbyte.protocol.models.AirbyteCatalog; import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteMessage.Type; +import io.airbyte.workers.*; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.internal.AirbyteStreamFactory; +import io.airbyte.workers.internal.DefaultAirbyteStreamFactory; import io.airbyte.workers.process.IntegrationLauncher; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteStreamFactory; import java.io.InputStream; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultGetSpecWorker.java similarity index 91% rename from airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultGetSpecWorker.java index e2ff7dee670bf..90355c7be081e 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultGetSpecWorker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.commons.io.IOs; import io.airbyte.commons.io.LineGobbler; @@ -10,9 +10,12 @@ import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteMessage.Type; import io.airbyte.protocol.models.ConnectorSpecification; +import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.internal.AirbyteStreamFactory; +import io.airbyte.workers.internal.DefaultAirbyteStreamFactory; import io.airbyte.workers.process.IntegrationLauncher; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteStreamFactory; import java.io.InputStream; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultNormalizationWorker.java similarity index 95% rename from airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultNormalizationWorker.java index 95944b693df93..a5198bcdc581f 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultNormalizationWorker.java @@ -2,12 +2,14 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.Configs.WorkerEnvironment; import io.airbyte.config.NormalizationInput; import io.airbyte.config.NormalizationSummary; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.normalization.NormalizationRunner; +import io.airbyte.workers.normalization.NormalizationWorker; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultReplicationWorker.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultReplicationWorker.java index e06a8b3da6002..d262fe2ec3107 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultReplicationWorker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.FailureReason; import io.airbyte.config.ReplicationAttemptSummary; @@ -15,11 +15,14 @@ import io.airbyte.config.WorkerDestinationConfig; import io.airbyte.config.WorkerSourceConfig; import io.airbyte.protocol.models.AirbyteMessage; +import io.airbyte.workers.*; +import io.airbyte.workers.exception.RecordSchemaValidationException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.helper.FailureHelper; -import io.airbyte.workers.protocols.airbyte.AirbyteDestination; -import io.airbyte.workers.protocols.airbyte.AirbyteMapper; -import io.airbyte.workers.protocols.airbyte.AirbyteSource; -import io.airbyte.workers.protocols.airbyte.MessageTracker; +import io.airbyte.workers.internal.AirbyteDestination; +import io.airbyte.workers.internal.AirbyteMapper; +import io.airbyte.workers.internal.AirbyteSource; +import io.airbyte.workers.internal.MessageTracker; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DiscoverCatalogWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DiscoverCatalogWorker.java similarity index 79% rename from airbyte-workers/src/main/java/io/airbyte/workers/DiscoverCatalogWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DiscoverCatalogWorker.java index 0ed3eb480fff0..404fdd69bdd0e 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DiscoverCatalogWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DiscoverCatalogWorker.java @@ -2,9 +2,10 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.StandardDiscoverCatalogInput; import io.airbyte.protocol.models.AirbyteCatalog; +import io.airbyte.workers.Worker; public interface DiscoverCatalogWorker extends Worker {} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/storage/DocumentStoreClient.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/DocumentStoreClient.java similarity index 95% rename from airbyte-workers/src/main/java/io/airbyte/workers/storage/DocumentStoreClient.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/DocumentStoreClient.java index cce44178f80d5..9b107b75a4a17 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/storage/DocumentStoreClient.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/DocumentStoreClient.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.storage; +package io.airbyte.workers.general; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/EchoWorker.java similarity index 88% rename from airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/EchoWorker.java index e968e70ff095d..80c9e5f1b9baa 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/EchoWorker.java @@ -2,8 +2,9 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; +import io.airbyte.workers.Worker; import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/GetSpecWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/GetSpecWorker.java similarity index 78% rename from airbyte-workers/src/main/java/io/airbyte/workers/GetSpecWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/GetSpecWorker.java index baa21f7b2c091..1962a4fb942c4 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/GetSpecWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/GetSpecWorker.java @@ -2,9 +2,10 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.JobGetSpecConfig; import io.airbyte.protocol.models.ConnectorSpecification; +import io.airbyte.workers.Worker; public interface GetSpecWorker extends Worker {} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/ReplicationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/general/ReplicationWorker.java similarity index 77% rename from airbyte-workers/src/main/java/io/airbyte/workers/ReplicationWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/general/ReplicationWorker.java index 0ea7b8179c149..b925299819df4 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/ReplicationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/general/ReplicationWorker.java @@ -2,9 +2,10 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import io.airbyte.config.ReplicationOutput; import io.airbyte.config.StandardSyncInput; +import io.airbyte.workers.Worker; public interface ReplicationWorker extends Worker {} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/test_helpers/EntrypointEnvChecker.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/EntrypointEnvChecker.java similarity index 96% rename from airbyte-workers/src/main/java/io/airbyte/workers/test_helpers/EntrypointEnvChecker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/helper/EntrypointEnvChecker.java index 851ba26cb6976..95f22e9a13f0b 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/test_helpers/EntrypointEnvChecker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/helper/EntrypointEnvChecker.java @@ -2,9 +2,9 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.test_helpers; +package io.airbyte.workers.helper; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.ProcessFactory; import java.io.BufferedReader; import java.io.IOException; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteDestination.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteDestination.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteDestination.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteDestination.java index 50877c5cdb1d8..9855f67161f95 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteDestination.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteDestination.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.commons.functional.CheckedConsumer; import io.airbyte.config.WorkerDestinationConfig; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMapper.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMapper.java similarity index 91% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMapper.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMapper.java index e710418e0922a..9d4a86a0e36af 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMapper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMapper.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.ConfiguredAirbyteCatalog; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMessageTracker.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMessageTracker.java index 277541412fdfa..3823328e40c54 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteMessageTracker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Charsets; @@ -18,7 +18,6 @@ import io.airbyte.protocol.models.AirbyteStateMessage; import io.airbyte.protocol.models.AirbyteTraceMessage; import io.airbyte.workers.helper.FailureHelper; -import io.airbyte.workers.protocols.airbyte.StateDeltaTracker.StateDeltaTrackerException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -132,7 +131,7 @@ private void handleSourceEmittedState(final AirbyteStateMessage stateMessage) { if (!unreliableCommittedCounts) { stateDeltaTracker.addState(stateHash, streamToRunningCount); } - } catch (final StateDeltaTrackerException e) { + } catch (final StateDeltaTracker.StateDeltaTrackerException e) { log.warn("The message tracker encountered an issue that prevents committed record counts from being reliably computed."); log.warn("This only impacts metadata and does not indicate a problem with actual sync data."); log.warn(e.getMessage(), e); @@ -151,7 +150,7 @@ private void handleDestinationEmittedState(final AirbyteStateMessage stateMessag if (!unreliableCommittedCounts) { stateDeltaTracker.commitStateHash(getStateHashCode(stateMessage)); } - } catch (final StateDeltaTrackerException e) { + } catch (final StateDeltaTracker.StateDeltaTrackerException e) { log.warn("The message tracker encountered an issue that prevents committed record counts from being reliably computed."); log.warn("This only impacts metadata and does not indicate a problem with actual sync data."); log.warn(e.getMessage(), e); diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteProtocolPredicate.java similarity index 95% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteProtocolPredicate.java index ca1b4eacf8408..4f438e58cf021 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteProtocolPredicate.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.fasterxml.jackson.databind.JsonNode; import io.airbyte.protocol.models.AirbyteProtocolSchema; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteSource.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteSource.java similarity index 97% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteSource.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteSource.java index 3409560fa8313..9f7d2ddf6ba80 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteSource.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteSource.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.config.WorkerSourceConfig; import io.airbyte.protocol.models.AirbyteMessage; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteStreamFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteStreamFactory.java similarity index 86% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteStreamFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteStreamFactory.java index 757f7e4e25190..9479874be4bb3 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteStreamFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/AirbyteStreamFactory.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.protocol.models.AirbyteMessage; import java.io.BufferedReader; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestination.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteDestination.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestination.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteDestination.java index a5f0fd1292fca..f6b6b21dd0b53 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestination.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteDestination.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; @@ -17,8 +17,8 @@ import io.airbyte.protocol.models.AirbyteMessage.Type; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.IntegrationLauncher; import java.io.BufferedWriter; import java.io.IOException; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSource.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteSource.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSource.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteSource.java index f0199e0abd55c..1c9c36a7dab8d 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSource.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteSource.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; @@ -17,8 +17,8 @@ import io.airbyte.protocol.models.AirbyteMessage.Type; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.IntegrationLauncher; import java.nio.file.Path; import java.time.Duration; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactory.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactory.java index 4fb66377b9516..0d50f54801237 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactory.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.fasterxml.jackson.databind.JsonNode; import io.airbyte.commons.json.Jsons; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/EmptyAirbyteSource.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/EmptyAirbyteSource.java similarity index 97% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/EmptyAirbyteSource.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/EmptyAirbyteSource.java index a1427d9f51022..b55a6269cbf70 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/EmptyAirbyteSource.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/EmptyAirbyteSource.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.commons.json.Jsons; import io.airbyte.config.WorkerSourceConfig; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitor.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/HeartbeatMonitor.java similarity index 96% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitor.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/HeartbeatMonitor.java index 708603bf4c0eb..5467e78754602 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitor.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/HeartbeatMonitor.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.google.common.annotations.VisibleForTesting; import java.time.Duration; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/MessageTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/MessageTracker.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/MessageTracker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/MessageTracker.java index 9db8826c7b414..9a39108580819 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/MessageTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/MessageTracker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.config.FailureReason; import io.airbyte.config.State; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/NamespacingMapper.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/NamespacingMapper.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/NamespacingMapper.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/NamespacingMapper.java index 3b9fe42e2dcca..09162e151ce80 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/NamespacingMapper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/NamespacingMapper.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import io.airbyte.commons.json.Jsons; import io.airbyte.config.JobSyncConfig.NamespaceDefinitionType; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/StateDeltaTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/internal/StateDeltaTracker.java similarity index 99% rename from airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/StateDeltaTracker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/internal/StateDeltaTracker.java index 93963fd38e01c..d05069ea0518d 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/StateDeltaTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/internal/StateDeltaTracker.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.google.common.annotations.VisibleForTesting; import java.nio.ByteBuffer; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/normalization/DefaultNormalizationRunner.java b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/DefaultNormalizationRunner.java index 5d720f9fc4720..3e8d4d19ca8ca 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/normalization/DefaultNormalizationRunner.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/DefaultNormalizationRunner.java @@ -18,8 +18,8 @@ import io.airbyte.protocol.models.ConfiguredAirbyteCatalog; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; import java.nio.file.Path; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/NormalizationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationWorker.java similarity index 77% rename from airbyte-workers/src/main/java/io/airbyte/workers/NormalizationWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationWorker.java index 643fd1935618e..d216215aea5f2 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/NormalizationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationWorker.java @@ -2,9 +2,10 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.normalization; import io.airbyte.config.NormalizationInput; import io.airbyte.config.NormalizationSummary; +import io.airbyte.workers.Worker; public interface NormalizationWorker extends Worker {} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java index c0441baff7179..07cb6d363b126 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java @@ -9,7 +9,7 @@ import com.google.common.collect.Lists; import io.airbyte.config.ResourceRequirements; import io.airbyte.config.WorkerEnvConstants; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/AsyncOrchestratorPodProcess.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/AsyncOrchestratorPodProcess.java index 504dcb6b985f0..e8f25a12a11fc 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/AsyncOrchestratorPodProcess.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/AsyncOrchestratorPodProcess.java @@ -9,7 +9,7 @@ import io.airbyte.config.ResourceRequirements; import io.airbyte.config.helpers.LogClientSingleton; import io.airbyte.workers.WorkerApp; -import io.airbyte.workers.storage.DocumentStoreClient; +import io.airbyte.workers.general.DocumentStoreClient; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.ContainerPort; import io.fabric8.kubernetes.api.model.DeletionPropagation; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessFactory.java index 67be65009b69f..74bbdd0c35518 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessFactory.java @@ -14,8 +14,8 @@ import io.airbyte.commons.resources.MoreResources; import io.airbyte.config.ResourceRequirements; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/IntegrationLauncher.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/IntegrationLauncher.java index 5e1c8f86f509b..bb1a563a0361f 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/IntegrationLauncher.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/IntegrationLauncher.java @@ -4,7 +4,7 @@ package io.airbyte.workers.process; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import java.nio.file.Path; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/KubeProcessFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/KubeProcessFactory.java index 77a6f59fe4903..5e560f4ac3708 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/KubeProcessFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/KubeProcessFactory.java @@ -9,7 +9,7 @@ import io.airbyte.commons.map.MoreMaps; import io.airbyte.config.ResourceRequirements; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.fabric8.kubernetes.client.KubernetesClient; import java.net.InetAddress; import java.nio.file.Path; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessFactory.java index 190861aea8eb6..5bd873e92c73c 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessFactory.java @@ -5,7 +5,7 @@ package io.airbyte.workers.process; import io.airbyte.config.ResourceRequirements; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import java.nio.file.Path; import java.util.Map; import java.util.regex.Matcher; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/run/TemporalWorkerRunFactory.java similarity index 99% rename from airbyte-workers/src/main/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/run/TemporalWorkerRunFactory.java index 015f2013caad8..5f8448369264d 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/run/TemporalWorkerRunFactory.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.worker_run; +package io.airbyte.workers.run; import io.airbyte.commons.features.FeatureFlags; import io.airbyte.commons.functional.CheckedSupplier; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/worker_run/WorkerRun.java b/airbyte-workers/src/main/java/io/airbyte/workers/run/WorkerRun.java similarity index 98% rename from airbyte-workers/src/main/java/io/airbyte/workers/worker_run/WorkerRun.java rename to airbyte-workers/src/main/java/io/airbyte/workers/run/WorkerRun.java index 0b157e10959e7..61b86a779155e 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/worker_run/WorkerRun.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/run/WorkerRun.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.worker_run; +package io.airbyte.workers.run; import io.airbyte.commons.functional.CheckedSupplier; import io.airbyte.config.JobOutput; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/storage/DockerComposeDocumentStoreClient.java b/airbyte-workers/src/main/java/io/airbyte/workers/storage/DockerComposeDocumentStoreClient.java index d9fcb5c292e58..1c061e829d33b 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/storage/DockerComposeDocumentStoreClient.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/storage/DockerComposeDocumentStoreClient.java @@ -5,6 +5,7 @@ package io.airbyte.workers.storage; import io.airbyte.commons.io.IOs; +import io.airbyte.workers.general.DocumentStoreClient; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/storage/GcsDocumentStoreClient.java b/airbyte-workers/src/main/java/io/airbyte/workers/storage/GcsDocumentStoreClient.java index 71ebc4ef109c1..0db65fb26be14 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/storage/GcsDocumentStoreClient.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/storage/GcsDocumentStoreClient.java @@ -10,6 +10,7 @@ import com.google.cloud.storage.Storage; import io.airbyte.config.storage.CloudStorageConfigs.GcsConfig; import io.airbyte.config.storage.DefaultGcsClientFactory; +import io.airbyte.workers.general.DocumentStoreClient; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/storage/S3DocumentStoreClient.java b/airbyte-workers/src/main/java/io/airbyte/workers/storage/S3DocumentStoreClient.java index 2b20b49d9b0d5..827fe0e313660 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/storage/S3DocumentStoreClient.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/storage/S3DocumentStoreClient.java @@ -8,6 +8,7 @@ import io.airbyte.config.storage.CloudStorageConfigs.S3Config; import io.airbyte.config.storage.DefaultS3ClientFactory; import io.airbyte.config.storage.MinioS3ClientFactory; +import io.airbyte.workers.general.DocumentStoreClient; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Optional; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/storage/StateClients.java b/airbyte-workers/src/main/java/io/airbyte/workers/storage/StateClients.java index ce4be0d5e36ab..842605dc98ed4 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/storage/StateClients.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/storage/StateClients.java @@ -5,6 +5,7 @@ package io.airbyte.workers.storage; import io.airbyte.config.storage.CloudStorageConfigs; +import io.airbyte.workers.general.DocumentStoreClient; import java.nio.file.Path; public class StateClients { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java index d130bcb6be304..41be4adb6a9a2 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java @@ -13,9 +13,9 @@ import io.airbyte.config.persistence.split_secrets.SecretsHydrator; import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DefaultCheckConnectionWorker; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.general.DefaultCheckConnectionWorker; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.IntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java index 36aa90051d278..bf5a467f26f20 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java @@ -14,14 +14,14 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DefaultDiscoverCatalogWorker; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.general.DefaultDiscoverCatalogWorker; +import io.airbyte.workers.internal.AirbyteStreamFactory; +import io.airbyte.workers.internal.DefaultAirbyteStreamFactory; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.IntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteStreamFactory; import io.airbyte.workers.temporal.CancellationHandler; import io.airbyte.workers.temporal.TemporalAttemptExecution; import io.temporal.activity.Activity; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java index 2c824680a489a..05e1298338b4b 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionManagerWorkflowImpl.java @@ -17,7 +17,6 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.workers.helper.FailureHelper; -import io.airbyte.workers.helper.SyncCheckConnectionFailure; import io.airbyte.workers.temporal.TemporalJobType; import io.airbyte.workers.temporal.check.connection.CheckConnectionActivity; import io.airbyte.workers.temporal.check.connection.CheckConnectionActivity.CheckConnectionInput; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/SyncCheckConnectionFailure.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/SyncCheckConnectionFailure.java similarity index 96% rename from airbyte-workers/src/main/java/io/airbyte/workers/helper/SyncCheckConnectionFailure.java rename to airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/SyncCheckConnectionFailure.java index 94eb45df73143..d390d1d81c937 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/SyncCheckConnectionFailure.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/SyncCheckConnectionFailure.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.helper; +package io.airbyte.workers.temporal.scheduling; import io.airbyte.config.FailureReason; import io.airbyte.config.StandardCheckConnectionOutput; @@ -10,6 +10,7 @@ import io.airbyte.config.StandardSyncSummary; import io.airbyte.config.SyncStats; import io.airbyte.scheduler.models.JobRunConfig; +import io.airbyte.workers.helper.FailureHelper; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java index 2f7cf4dec7951..d9acac99b7396 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java @@ -34,9 +34,9 @@ import io.airbyte.validation.json.JsonValidationException; import io.airbyte.workers.JobStatus; import io.airbyte.workers.helper.FailureHelper; +import io.airbyte.workers.run.TemporalWorkerRunFactory; +import io.airbyte.workers.run.WorkerRun; import io.airbyte.workers.temporal.exception.RetryableException; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; -import io.airbyte.workers.worker_run.WorkerRun; import java.io.IOException; import java.nio.file.Path; import java.util.List; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/shared/ActivityConfiguration.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/shared/ActivityConfiguration.java index 34a38e5d6678b..173f9b2347f52 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/shared/ActivityConfiguration.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/shared/ActivityConfiguration.java @@ -6,7 +6,7 @@ import io.airbyte.config.Configs; import io.airbyte.config.EnvConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.temporal.TemporalUtils; import io.temporal.activity.ActivityCancellationType; import io.temporal.activity.ActivityOptions; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java index 728d707afa7a0..90b56c92f42f7 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java @@ -12,9 +12,9 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DefaultGetSpecWorker; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.general.DefaultGetSpecWorker; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.IntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java index 3d1b89de3d101..8d1cea75f2277 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java @@ -16,11 +16,11 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DbtTransformationRunner; -import io.airbyte.workers.DbtTransformationWorker; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerApp; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.general.DbtTransformationRunner; +import io.airbyte.workers.general.DbtTransformationWorker; import io.airbyte.workers.normalization.NormalizationRunnerFactory; import io.airbyte.workers.process.ProcessFactory; import io.airbyte.workers.temporal.CancellationHandler; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/LauncherWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/LauncherWorker.java index fbeb3eed5fa65..d57ba5d84b9ff 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/LauncherWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/LauncherWorker.java @@ -11,7 +11,7 @@ import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerApp; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.AsyncKubePodStatus; import io.airbyte.workers.process.AsyncOrchestratorPodProcess; import io.airbyte.workers.process.KubePodInfo; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java index 9446a805aa805..b367b321bb584 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java @@ -16,10 +16,10 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DefaultNormalizationWorker; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerApp; import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.general.DefaultNormalizationWorker; import io.airbyte.workers.normalization.NormalizationRunnerFactory; import io.airbyte.workers.process.ProcessFactory; import io.airbyte.workers.temporal.CancellationHandler; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java index 5180c620c7ec8..9ace28abd6469 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java @@ -20,7 +20,6 @@ import io.airbyte.scheduler.models.IntegrationLauncherConfig; import io.airbyte.scheduler.models.JobRunConfig; import io.airbyte.scheduler.persistence.JobPersistence; -import io.airbyte.workers.DefaultReplicationWorker; import io.airbyte.workers.RecordSchemaValidator; import io.airbyte.workers.Worker; import io.airbyte.workers.WorkerApp; @@ -28,15 +27,16 @@ import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.general.DefaultReplicationWorker; +import io.airbyte.workers.internal.AirbyteMessageTracker; +import io.airbyte.workers.internal.AirbyteSource; +import io.airbyte.workers.internal.DefaultAirbyteDestination; +import io.airbyte.workers.internal.DefaultAirbyteSource; +import io.airbyte.workers.internal.EmptyAirbyteSource; +import io.airbyte.workers.internal.NamespacingMapper; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.IntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageTracker; -import io.airbyte.workers.protocols.airbyte.AirbyteSource; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteDestination; -import io.airbyte.workers.protocols.airbyte.DefaultAirbyteSource; -import io.airbyte.workers.protocols.airbyte.EmptyAirbyteSource; -import io.airbyte.workers.protocols.airbyte.NamespacingMapper; import io.airbyte.workers.temporal.CancellationHandler; import io.airbyte.workers.temporal.TemporalAttemptExecution; import io.airbyte.workers.temporal.TemporalUtils; diff --git a/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/AsyncOrchestratorPodProcessIntegrationTest.java b/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/AsyncOrchestratorPodProcessIntegrationTest.java index 0daea5fe7052c..290c6d01cfe54 100644 --- a/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/AsyncOrchestratorPodProcessIntegrationTest.java +++ b/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/AsyncOrchestratorPodProcessIntegrationTest.java @@ -12,7 +12,7 @@ import io.airbyte.config.storage.MinioS3ClientFactory; import io.airbyte.workers.WorkerApp; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.storage.DocumentStoreClient; +import io.airbyte.workers.general.DocumentStoreClient; import io.airbyte.workers.storage.S3DocumentStoreClient; import io.airbyte.workers.temporal.sync.OrchestratorConstants; import io.fabric8.kubernetes.api.model.ContainerBuilder; diff --git a/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/KubePodProcessIntegrationTest.java b/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/KubePodProcessIntegrationTest.java index 5962b0b72b9ac..3af11d2193eb3 100644 --- a/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/KubePodProcessIntegrationTest.java +++ b/airbyte-workers/src/test-integration/java/io/airbyte/workers/process/KubePodProcessIntegrationTest.java @@ -17,7 +17,7 @@ import io.airbyte.config.EnvConfigs; import io.airbyte.config.ResourceRequirements; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/RecordSchemaValidatorTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/RecordSchemaValidatorTest.java index 7b8566e17695a..fe1538077aa2a 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/RecordSchemaValidatorTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/RecordSchemaValidatorTest.java @@ -9,7 +9,8 @@ import io.airbyte.config.StandardSync; import io.airbyte.config.StandardSyncInput; import io.airbyte.protocol.models.AirbyteMessage; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageUtils; +import io.airbyte.workers.exception.RecordSchemaValidationException; +import io.airbyte.workers.internal.AirbyteMessageUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/WorkerUtilsTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/WorkerUtilsTest.java index 9beab9225aaa9..b041c04d60423 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/WorkerUtilsTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/WorkerUtilsTest.java @@ -16,7 +16,7 @@ import io.airbyte.config.EnvConfigs; import io.airbyte.config.StandardSync; import io.airbyte.config.StandardSyncInput; -import io.airbyte.workers.protocols.airbyte.HeartbeatMonitor; +import io.airbyte.workers.internal.HeartbeatMonitor; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Map; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultCheckConnectionWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultCheckConnectionWorkerTest.java similarity index 95% rename from airbyte-workers/src/test/java/io/airbyte/workers/DefaultCheckConnectionWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultCheckConnectionWorkerTest.java index 88bff36d577d9..2bfac11af8ca0 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultCheckConnectionWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultCheckConnectionWorkerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -25,8 +25,11 @@ import io.airbyte.protocol.models.AirbyteConnectionStatus; import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteMessage.Type; +import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.internal.AirbyteStreamFactory; import io.airbyte.workers.process.IntegrationLauncher; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultDiscoverCatalogWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorkerTest.java similarity index 95% rename from airbyte-workers/src/test/java/io/airbyte/workers/DefaultDiscoverCatalogWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorkerTest.java index 6cd2b37c1ed92..5c8961c1ab0f6 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultDiscoverCatalogWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultDiscoverCatalogWorkerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,8 +25,11 @@ import io.airbyte.protocol.models.CatalogHelpers; import io.airbyte.protocol.models.Field; import io.airbyte.protocol.models.JsonSchemaType; +import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.exception.WorkerException; +import io.airbyte.workers.internal.AirbyteStreamFactory; import io.airbyte.workers.process.IntegrationLauncher; -import io.airbyte.workers.protocols.airbyte.AirbyteStreamFactory; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.file.Files; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultGetSpecWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultGetSpecWorkerTest.java similarity index 97% rename from airbyte-workers/src/test/java/io/airbyte/workers/DefaultGetSpecWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultGetSpecWorkerTest.java index 600a17dce5870..03faab4db9a12 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultGetSpecWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultGetSpecWorkerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -20,6 +20,8 @@ import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteMessage.Type; import io.airbyte.protocol.models.ConnectorSpecification; +import io.airbyte.workers.WorkerConfigs; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.IntegrationLauncher; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultNormalizationWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultNormalizationWorkerTest.java similarity index 95% rename from airbyte-workers/src/test/java/io/airbyte/workers/DefaultNormalizationWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultNormalizationWorkerTest.java index 8c46bbef029a6..d42059a3f898b 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultNormalizationWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultNormalizationWorkerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; @@ -15,6 +15,8 @@ import io.airbyte.config.NormalizationSummary; import io.airbyte.config.StandardSync; import io.airbyte.config.StandardSyncInput; +import io.airbyte.workers.TestConfigHelpers; +import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.normalization.NormalizationRunner; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultReplicationWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultReplicationWorkerTest.java similarity index 98% rename from airbyte-workers/src/test/java/io/airbyte/workers/DefaultReplicationWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultReplicationWorkerTest.java index 7bb0076a0e60b..23f754d786101 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/DefaultReplicationWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/general/DefaultReplicationWorkerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers; +package io.airbyte.workers.general; import static java.lang.Thread.sleep; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,12 +41,14 @@ import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.protocol.models.AirbyteTraceMessage; import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.workers.*; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.helper.FailureHelper; -import io.airbyte.workers.protocols.airbyte.AirbyteDestination; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageTracker; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageUtils; -import io.airbyte.workers.protocols.airbyte.AirbyteSource; -import io.airbyte.workers.protocols.airbyte.NamespacingMapper; +import io.airbyte.workers.internal.AirbyteDestination; +import io.airbyte.workers.internal.AirbyteMessageTracker; +import io.airbyte.workers.internal.AirbyteMessageUtils; +import io.airbyte.workers.internal.AirbyteSource; +import io.airbyte.workers.internal.NamespacingMapper; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/helper/FailureHelperTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/helper/FailureHelperTest.java index 06cf6df4811f9..d8227ae52057b 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/helper/FailureHelperTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/helper/FailureHelperTest.java @@ -11,7 +11,7 @@ import io.airbyte.config.Metadata; import io.airbyte.protocol.models.AirbyteErrorTraceMessage; import io.airbyte.protocol.models.AirbyteTraceMessage; -import io.airbyte.workers.protocols.airbyte.AirbyteMessageUtils; +import io.airbyte.workers.internal.AirbyteMessageUtils; import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTrackerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageTrackerTest.java similarity index 99% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTrackerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageTrackerTest.java index 2932825a80df6..0ce025b409e23 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTrackerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageTrackerTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -13,7 +13,7 @@ import io.airbyte.config.State; import io.airbyte.protocol.models.AirbyteMessage; import io.airbyte.workers.helper.FailureHelper; -import io.airbyte.workers.protocols.airbyte.StateDeltaTracker.StateDeltaTrackerException; +import io.airbyte.workers.internal.StateDeltaTracker.StateDeltaTrackerException; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.BeforeEach; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageUtils.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageUtils.java similarity index 98% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageUtils.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageUtils.java index 42c9550576539..ed5be9e6c00b2 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageUtils.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteMessageUtils.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicateTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteProtocolPredicateTest.java similarity index 97% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicateTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteProtocolPredicateTest.java index b4f00216c3254..c342a3280515c 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicateTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/AirbyteProtocolPredicateTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static org.junit.Assert.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestinationTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteDestinationTest.java similarity index 98% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestinationTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteDestinationTest.java index ae312d9793b85..72eb9f1017eab 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteDestinationTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteDestinationTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static io.airbyte.commons.logging.LoggingHelper.RESET; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,8 +29,8 @@ import io.airbyte.workers.TestConfigHelpers; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.IntegrationLauncher; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSourceTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteSourceTest.java similarity index 98% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSourceTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteSourceTest.java index 687eda27375c8..69d4b0fc9f05a 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteSourceTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteSourceTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static io.airbyte.commons.logging.LoggingHelper.RESET; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -33,7 +33,7 @@ import io.airbyte.protocol.models.JsonSchemaType; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.process.IntegrationLauncher; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactoryTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactoryTest.java similarity index 99% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactoryTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactoryTest.java index aae30ab4a1fce..74496c56ca5e9 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/DefaultAirbyteStreamFactoryTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/DefaultAirbyteStreamFactoryTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitorTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/HeartbeatMonitorTest.java similarity index 97% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitorTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/HeartbeatMonitorTest.java index a0664a136806f..d5638ce07d1c6 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/HeartbeatMonitorTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/HeartbeatMonitorTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/NamespacingMapperTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/NamespacingMapperTest.java similarity index 99% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/NamespacingMapperTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/NamespacingMapperTest.java index d8fc642e841aa..672160acf4bda 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/NamespacingMapperTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/NamespacingMapperTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/StateDeltaTrackerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/internal/StateDeltaTrackerTest.java similarity index 97% rename from airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/StateDeltaTrackerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/internal/StateDeltaTrackerTest.java index f7a50d038bc02..50c84111d4824 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/protocols/airbyte/StateDeltaTrackerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/internal/StateDeltaTrackerTest.java @@ -2,9 +2,9 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.protocols.airbyte; +package io.airbyte.workers.internal; -import io.airbyte.workers.protocols.airbyte.StateDeltaTracker.StateDeltaTrackerException; +import io.airbyte.workers.internal.StateDeltaTracker.StateDeltaTrackerException; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/normalization/DefaultNormalizationRunnerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/normalization/DefaultNormalizationRunnerTest.java index 1cae905cd2d09..2b4263018a640 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/normalization/DefaultNormalizationRunnerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/normalization/DefaultNormalizationRunnerTest.java @@ -24,7 +24,7 @@ import io.airbyte.protocol.models.ConfiguredAirbyteCatalog; import io.airbyte.workers.WorkerConfigs; import io.airbyte.workers.WorkerConstants; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.airbyte.workers.normalization.DefaultNormalizationRunner.DestinationType; import io.airbyte.workers.process.AirbyteIntegrationLauncher; import io.airbyte.workers.process.ProcessFactory; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java index 04a1c7d4e3d21..a476524bb4c40 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java @@ -11,7 +11,7 @@ import io.airbyte.config.EnvConfigs; import io.airbyte.config.WorkerEnvConstants; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import java.nio.file.Path; import java.util.Collections; import java.util.Map; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java index af613a92b409e..6f2e22593da76 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/process/DockerProcessFactoryTest.java @@ -17,8 +17,8 @@ import io.airbyte.commons.json.Jsons; import io.airbyte.config.EnvConfigs; import io.airbyte.workers.WorkerConfigs; -import io.airbyte.workers.WorkerException; import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.exception.WorkerException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactoryTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/run/TemporalWorkerRunFactoryTest.java similarity index 99% rename from airbyte-workers/src/test/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactoryTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/run/TemporalWorkerRunFactoryTest.java index 65ee30477f811..6355e12e5e50c 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/worker_run/TemporalWorkerRunFactoryTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/run/TemporalWorkerRunFactoryTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.worker_run; +package io.airbyte.workers.run; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/worker_run/WorkerRunTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/run/WorkerRunTest.java similarity index 96% rename from airbyte-workers/src/test/java/io/airbyte/workers/worker_run/WorkerRunTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/run/WorkerRunTest.java index 0a895f8bb186b..4908aa54abcec 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/worker_run/WorkerRunTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/run/WorkerRunTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 Airbyte, Inc., all rights reserved. */ -package io.airbyte.workers.worker_run; +package io.airbyte.workers.run; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/TemporalUtilsTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/TemporalUtilsTest.java index d1797f9a88599..c99cc16a0a1bb 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/TemporalUtilsTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/TemporalUtilsTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; import io.airbyte.commons.concurrency.VoidCallable; -import io.airbyte.workers.WorkerException; +import io.airbyte.workers.exception.WorkerException; import io.temporal.activity.Activity; import io.temporal.activity.ActivityCancellationType; import io.temporal.activity.ActivityExecutionContext; diff --git a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityTest.java index c1379d618a4cf..f836ff7159f36 100644 --- a/airbyte-workers/src/test/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityTest.java @@ -33,6 +33,8 @@ import io.airbyte.scheduler.persistence.job_tracker.JobTracker; import io.airbyte.scheduler.persistence.job_tracker.JobTracker.JobState; import io.airbyte.validation.json.JsonValidationException; +import io.airbyte.workers.run.TemporalWorkerRunFactory; +import io.airbyte.workers.run.WorkerRun; import io.airbyte.workers.temporal.exception.RetryableException; import io.airbyte.workers.temporal.scheduling.activities.JobCreationAndStatusUpdateActivity.AttemptCreationInput; import io.airbyte.workers.temporal.scheduling.activities.JobCreationAndStatusUpdateActivity.AttemptCreationOutput; @@ -44,8 +46,6 @@ import io.airbyte.workers.temporal.scheduling.activities.JobCreationAndStatusUpdateActivity.JobCreationOutput; import io.airbyte.workers.temporal.scheduling.activities.JobCreationAndStatusUpdateActivity.JobFailureInput; import io.airbyte.workers.temporal.scheduling.activities.JobCreationAndStatusUpdateActivity.JobSuccessInput; -import io.airbyte.workers.worker_run.TemporalWorkerRunFactory; -import io.airbyte.workers.worker_run.WorkerRun; import java.io.IOException; import java.nio.file.Path; import java.util.Collections;