Skip to content

Commit 1535cad

Browse files
author
Marius Posta
authored
bulk-cdk: reorganize source structure (#43937)
1 parent 8ab89d3 commit 1535cad

File tree

82 files changed

+241
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+241
-318
lines changed

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/AirbyteConnectorRunnable.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
package io.airbyte.cdk
33

44
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
5-
import io.airbyte.cdk.consumers.OutputConsumer
6-
import io.airbyte.cdk.operation.Operation
5+
import io.airbyte.cdk.output.OutputConsumer
76
import io.airbyte.cdk.util.ApmTraceUtils
87
import io.github.oshai.kotlinlogging.KotlinLogging
98
import io.micronaut.context.annotation.Value

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/exceptions/ConfigErrorException.kt ‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/ConfigErrorException.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.exceptions
2+
package io.airbyte.cdk
33

44
/**
55
* An exception that indicates that there is something wrong with the user's connector setup. This

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/operation/Operation.kt ‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/Operation.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.operation
2+
package io.airbyte.cdk
33

44
/** Interface that defines a CLI operation. */
55
fun interface Operation {

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/ConfigurationJsonObjectSupplier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package io.airbyte.cdk.command
33

44
import com.fasterxml.jackson.databind.JsonNode
5-
import io.airbyte.cdk.exceptions.ConfigErrorException
5+
import io.airbyte.cdk.ConfigErrorException
66
import io.airbyte.cdk.util.Jsons
77
import io.micronaut.context.annotation.Value
88
import jakarta.inject.Singleton

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/ConfiguredCatalogFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.command
33

4-
import io.airbyte.cdk.exceptions.ConfigErrorException
4+
import io.airbyte.cdk.ConfigErrorException
55
import io.airbyte.cdk.util.ResourceUtils
66
import io.airbyte.protocol.models.v0.AirbyteStream
77
import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/ConnectorCommandLinePropertySource.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.command
33

4-
import io.airbyte.cdk.operation.Operation
4+
import io.airbyte.cdk.Operation
55
import io.github.oshai.kotlinlogging.KotlinLogging
66
import io.micronaut.context.env.MapPropertySource
77
import io.micronaut.core.cli.CommandLine

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/InputStateFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package io.airbyte.cdk.command
33

44
import com.fasterxml.jackson.databind.JsonNode
5-
import io.airbyte.cdk.exceptions.ConfigErrorException
5+
import io.airbyte.cdk.ConfigErrorException
66
import io.airbyte.cdk.util.Jsons
77
import io.airbyte.cdk.util.ResourceUtils
88
import io.airbyte.protocol.models.v0.AirbyteGlobalState

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/command/ValidatedJsonUtils.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.networknt.schema.JsonSchema
1212
import com.networknt.schema.JsonSchemaFactory
1313
import com.networknt.schema.SchemaValidatorsConfig
1414
import com.networknt.schema.SpecVersion
15-
import io.airbyte.cdk.exceptions.ConfigErrorException
15+
import io.airbyte.cdk.ConfigErrorException
1616
import io.airbyte.cdk.util.Jsons
1717

1818
object ValidatedJsonUtils {

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/exceptions/OperationExecutionException.kt

-8
This file was deleted.

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/consumers/OutputConsumer.kt ‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/output/OutputConsumer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.consumers
2+
package io.airbyte.cdk.output
33

4-
import io.airbyte.cdk.exceptions.ConfigErrorException
4+
import io.airbyte.cdk.ConfigErrorException
55
import io.airbyte.cdk.util.Jsons
66
import io.airbyte.protocol.models.v0.AirbyteAnalyticsTraceMessage
77
import io.airbyte.protocol.models.v0.AirbyteCatalog

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/operation/SpecOperation.kt ‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/spec/SpecOperation.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.operation
2+
package io.airbyte.cdk.spec
33

4+
import io.airbyte.cdk.Operation
45
import io.airbyte.cdk.command.ConfigurationJsonObjectSupplier
5-
import io.airbyte.cdk.consumers.OutputConsumer
6+
import io.airbyte.cdk.output.OutputConsumer
67
import io.airbyte.protocol.models.v0.ConnectorSpecification
78
import io.micronaut.context.annotation.Requires
89
import io.micronaut.context.annotation.Value

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/ssh/SshTunnelMethodConfiguration.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDefault
1010
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDescription
1111
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject
1212
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
13+
import io.airbyte.cdk.ConfigErrorException
1314
import io.airbyte.cdk.command.CONNECTOR_CONFIG_PREFIX
14-
import io.airbyte.cdk.exceptions.ConfigErrorException
1515
import io.micronaut.context.annotation.ConfigurationProperties
1616

1717
/** Union type for SSH tunnel method configuration in connector configurations. */

‎airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/ssh/TunnelSession.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.ssh
33

4-
import io.airbyte.cdk.exceptions.ConfigErrorException
4+
import io.airbyte.cdk.ConfigErrorException
55
import io.github.oshai.kotlinlogging.KotlinLogging
66
import java.io.StringReader
77
import java.net.InetSocketAddress

‎airbyte-cdk/bulk/core/base/src/test/kotlin/io/airbyte/cdk/jdbc/H2TestFixtureTest.kt ‎airbyte-cdk/bulk/core/base/src/test/kotlin/io/airbyte/cdk/h2/H2TestFixtureTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.jdbc
2+
package io.airbyte.cdk.h2
33

44
import java.sql.DriverManager
55
import org.junit.jupiter.api.Assertions

‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/command/CliRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.airbyte.cdk.AirbyteConnectorRunner
66
import io.airbyte.cdk.AirbyteDestinationRunner
77
import io.airbyte.cdk.AirbyteSourceRunner
88
import io.airbyte.cdk.TestClockFactory
9-
import io.airbyte.cdk.consumers.BufferingOutputConsumer
9+
import io.airbyte.cdk.output.BufferingOutputConsumer
1010
import io.airbyte.cdk.util.Jsons
1111
import io.airbyte.protocol.models.v0.AirbyteMessage
1212
import io.airbyte.protocol.models.v0.AirbyteStateMessage

‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/jdbc/H2TestFixture.kt ‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/h2/H2TestFixture.kt

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.jdbc
1+
/*
2+
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
3+
*/
4+
5+
package io.airbyte.cdk.h2
36

47
import io.github.oshai.kotlinlogging.KotlinLogging
58
import io.micronaut.context.annotation.Value
@@ -10,13 +13,13 @@ import java.sql.ResultSet
1013
import org.apache.commons.lang3.RandomStringUtils
1114
import org.h2.tools.Server
1215

13-
private val log = KotlinLogging.logger {}
14-
1516
/** Wraps an H2 in-memory database and exposes a TCP server for it. */
1617
@Singleton
1718
class H2TestFixture(
1819
@Value("\${h2.database.name}") database: String? = null,
1920
) : AutoCloseable {
21+
private val log = KotlinLogging.logger {}
22+
2023
private val server: Server
2124
private val internalConnection: Connection
2225

‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/consumers/BufferingOutputConsumer.kt ‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/output/BufferingOutputConsumer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.consumers
2+
package io.airbyte.cdk.output
33

44
import io.airbyte.protocol.models.v0.AirbyteCatalog
55
import io.airbyte.protocol.models.v0.AirbyteConnectionStatus

‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/consumers/FileOutputConsumer.kt ‎airbyte-cdk/bulk/core/base/src/testFixtures/kotlin/io/airbyte/cdk/output/FileOutputConsumer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.consumers
2+
package io.airbyte.cdk.output
33

44
import io.airbyte.cdk.util.Jsons
55
import io.airbyte.protocol.models.v0.AirbyteMessage

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/operation/CheckOperation.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/check/CheckOperation.kt

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.operation
2+
package io.airbyte.cdk.check
33

4-
import io.airbyte.cdk.command.ConfigurationJsonObjectBase
5-
import io.airbyte.cdk.command.ConfigurationJsonObjectSupplier
6-
import io.airbyte.cdk.command.SourceConfiguration
7-
import io.airbyte.cdk.command.SourceConfigurationFactory
8-
import io.airbyte.cdk.consumers.OutputConsumer
9-
import io.airbyte.cdk.source.MetadataQuerier
4+
import io.airbyte.cdk.Operation
5+
import io.airbyte.cdk.command.*
6+
import io.airbyte.cdk.discover.MetadataQuerier
7+
import io.airbyte.cdk.output.OutputConsumer
108
import io.airbyte.cdk.util.ApmTraceUtils
119
import io.airbyte.protocol.models.v0.AirbyteConnectionStatus
1210
import io.airbyte.protocol.models.v0.AirbyteErrorTraceMessage
@@ -16,8 +14,6 @@ import jakarta.inject.Singleton
1614
import java.sql.SQLException
1715
import org.apache.commons.lang3.exception.ExceptionUtils
1816

19-
private val log = KotlinLogging.logger {}
20-
2117
@Singleton
2218
@Requires(property = Operation.PROPERTY, value = "check")
2319
@Requires(env = ["source"])
@@ -27,6 +23,8 @@ class CheckOperation<T : ConfigurationJsonObjectBase>(
2723
val metadataQuerierFactory: MetadataQuerier.Factory<SourceConfiguration>,
2824
val outputConsumer: OutputConsumer,
2925
) : Operation {
26+
private val log = KotlinLogging.logger {}
27+
3028
/** Wraps all checks in exception handling because CHECK must always exit cleanly. */
3129
override fun execute() {
3230
try {

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/command/SourceConfigurationFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.command
33

4-
import io.airbyte.cdk.exceptions.ConfigErrorException
4+
import io.airbyte.cdk.ConfigErrorException
55

66
/**
77
* Each connector contains an implementation of this interface in a stateless class which maps the

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/source/AirbyteStreamDecorator.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/AirbyteStreamDecorator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.source
2+
package io.airbyte.cdk.discover
33

44
import io.airbyte.protocol.models.v0.AirbyteStream
55

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/operation/DiscoverOperation.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/DiscoverOperation.kt

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.operation
2+
package io.airbyte.cdk.discover
33

4+
import io.airbyte.cdk.Operation
45
import io.airbyte.cdk.command.SourceConfiguration
5-
import io.airbyte.cdk.consumers.OutputConsumer
6-
import io.airbyte.cdk.source.AirbyteStreamDecorator
7-
import io.airbyte.cdk.source.Field
8-
import io.airbyte.cdk.source.MetadataQuerier
6+
import io.airbyte.cdk.output.OutputConsumer
97
import io.airbyte.protocol.models.Field as AirbyteField
108
import io.airbyte.protocol.models.v0.AirbyteCatalog
119
import io.airbyte.protocol.models.v0.AirbyteStream
@@ -14,8 +12,6 @@ import io.github.oshai.kotlinlogging.KotlinLogging
1412
import io.micronaut.context.annotation.Requires
1513
import jakarta.inject.Singleton
1614

17-
private val log = KotlinLogging.logger {}
18-
1915
@Singleton
2016
@Requires(property = Operation.PROPERTY, value = "discover")
2117
@Requires(env = ["source"])
@@ -25,6 +21,8 @@ class DiscoverOperation(
2521
val airbyteStreamDecorator: AirbyteStreamDecorator,
2622
val outputConsumer: OutputConsumer,
2723
) : Operation {
24+
private val log = KotlinLogging.logger {}
25+
2826
override fun execute() {
2927
val airbyteStreams = mutableListOf<AirbyteStream>()
3028
metadataQuerierFactory.session(config).use { metadataQuerier: MetadataQuerier ->

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/source/Field.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/Field.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.source
2+
package io.airbyte.cdk.discover
33

44
import io.airbyte.cdk.data.AirbyteType
55
import io.airbyte.cdk.data.JsonDecoder

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/source/MetadataQuerier.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/MetadataQuerier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.source
2+
package io.airbyte.cdk.discover
33

44
import io.airbyte.cdk.command.SourceConfiguration
55

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/consumers/CatalogValidationFailureHandler.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/output/CatalogValidationFailureHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.consumers
2+
package io.airbyte.cdk.output
33

44
import io.airbyte.cdk.data.AirbyteType
55
import io.github.oshai.kotlinlogging.KotlinLogging

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/Feed.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.read
33

4-
import io.airbyte.cdk.source.Field
5-
import io.airbyte.cdk.source.FieldOrMetaField
4+
import io.airbyte.cdk.discover.Field
5+
import io.airbyte.cdk.discover.FieldOrMetaField
66
import io.airbyte.protocol.models.v0.AirbyteStreamNameNamespacePair
77
import io.airbyte.protocol.models.v0.StreamDescriptor
88
import io.airbyte.protocol.models.v0.SyncMode

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/FeedReader.kt

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
package io.airbyte.cdk.read
33

44
import io.airbyte.cdk.command.OpaqueStateValue
5-
import io.airbyte.cdk.source.PartitionReadCheckpoint
6-
import io.airbyte.cdk.source.PartitionReader
7-
import io.airbyte.cdk.source.PartitionsCreator
85
import io.airbyte.cdk.util.ThreadRenamingCoroutineName
96
import io.airbyte.protocol.models.v0.AirbyteStateMessage
107
import io.airbyte.protocol.models.v0.AirbyteStreamStatusTraceMessage

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/source/Partitions.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/Partitions.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.source
2+
package io.airbyte.cdk.read
33

44
import io.airbyte.cdk.command.OpaqueStateValue
5-
import io.airbyte.cdk.read.Feed
6-
import io.airbyte.cdk.read.StateQuerier
7-
import io.airbyte.cdk.source.PartitionsCreator.TryAcquireResourcesStatus
5+
import io.airbyte.cdk.read.PartitionsCreator.TryAcquireResourcesStatus
86

97
/**
108
* [PartitionsCreatorFactory] must be implemented by each source connector and serves as the

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/operation/ReadOperation.kt ‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/ReadOperation.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
2-
package io.airbyte.cdk.operation
2+
package io.airbyte.cdk.read
33

44
import hu.webarticum.treeprinter.SimpleTreeNode
55
import hu.webarticum.treeprinter.TreeNode
66
import hu.webarticum.treeprinter.printer.TreePrinter
77
import hu.webarticum.treeprinter.printer.listing.ListingTreePrinter
8+
import io.airbyte.cdk.Operation
89
import io.airbyte.cdk.command.InputState
910
import io.airbyte.cdk.command.SourceConfiguration
10-
import io.airbyte.cdk.consumers.OutputConsumer
11-
import io.airbyte.cdk.read.Feed
12-
import io.airbyte.cdk.read.RootReader
13-
import io.airbyte.cdk.read.StateManager
14-
import io.airbyte.cdk.read.StateManagerFactory
15-
import io.airbyte.cdk.source.PartitionsCreatorFactory
11+
import io.airbyte.cdk.output.OutputConsumer
1612
import io.airbyte.cdk.util.ThreadRenamingCoroutineName
1713
import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog
1814
import io.github.oshai.kotlinlogging.KotlinLogging

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/RootReader.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.read
33

4-
import io.airbyte.cdk.consumers.OutputConsumer
5-
import io.airbyte.cdk.source.PartitionsCreatorFactory
4+
import io.airbyte.cdk.output.OutputConsumer
65
import io.airbyte.cdk.util.ThreadRenamingCoroutineName
76
import io.github.oshai.kotlinlogging.KotlinLogging
87
import java.time.Duration

‎airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/StateManagerFactory.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22
package io.airbyte.cdk.read
33

44
import com.fasterxml.jackson.databind.JsonNode
5+
import io.airbyte.cdk.ConfigErrorException
56
import io.airbyte.cdk.command.EmptyInputState
67
import io.airbyte.cdk.command.GlobalInputState
78
import io.airbyte.cdk.command.InputState
89
import io.airbyte.cdk.command.SourceConfiguration
910
import io.airbyte.cdk.command.StreamInputState
10-
import io.airbyte.cdk.consumers.CatalogValidationFailureHandler
11-
import io.airbyte.cdk.consumers.FieldNotFound
12-
import io.airbyte.cdk.consumers.FieldTypeMismatch
13-
import io.airbyte.cdk.consumers.InvalidIncrementalSyncMode
14-
import io.airbyte.cdk.consumers.InvalidPrimaryKey
15-
import io.airbyte.cdk.consumers.MultipleStreamsFound
16-
import io.airbyte.cdk.consumers.StreamHasNoFields
17-
import io.airbyte.cdk.consumers.StreamNotFound
1811
import io.airbyte.cdk.data.AirbyteType
1912
import io.airbyte.cdk.data.ArrayAirbyteType
2013
import io.airbyte.cdk.data.LeafAirbyteType
21-
import io.airbyte.cdk.exceptions.ConfigErrorException
22-
import io.airbyte.cdk.source.CommonMetaField
23-
import io.airbyte.cdk.source.Field
24-
import io.airbyte.cdk.source.FieldOrMetaField
25-
import io.airbyte.cdk.source.MetaField
26-
import io.airbyte.cdk.source.MetadataQuerier
14+
import io.airbyte.cdk.discover.CommonMetaField
15+
import io.airbyte.cdk.discover.Field
16+
import io.airbyte.cdk.discover.FieldOrMetaField
17+
import io.airbyte.cdk.discover.MetaField
18+
import io.airbyte.cdk.discover.MetadataQuerier
19+
import io.airbyte.cdk.output.CatalogValidationFailureHandler
20+
import io.airbyte.cdk.output.FieldNotFound
21+
import io.airbyte.cdk.output.FieldTypeMismatch
22+
import io.airbyte.cdk.output.InvalidIncrementalSyncMode
23+
import io.airbyte.cdk.output.InvalidPrimaryKey
24+
import io.airbyte.cdk.output.MultipleStreamsFound
25+
import io.airbyte.cdk.output.StreamHasNoFields
26+
import io.airbyte.cdk.output.StreamNotFound
2727
import io.airbyte.protocol.models.v0.AirbyteStream
2828
import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog
2929
import io.airbyte.protocol.models.v0.ConfiguredAirbyteStream

0 commit comments

Comments
 (0)