chore: remove deprecated Java OpenAPI clients (#12620)

airbytehq · May 29, 2024 · 5490c24 · 5490c24
1 parent 6462bad
commit 5490c24
Show file tree

Hide file tree

Showing 168 changed files with 996 additions and 1,456 deletions.
diff --git a/airbyte-analytics/src/main/kotlin/io/airbyte/analytics/TrackingClient.kt b/airbyte-analytics/src/main/kotlin/io/airbyte/analytics/TrackingClient.kt
@@ -11,8 +11,8 @@ import com.segment.analytics.messages.AliasMessage
 import com.segment.analytics.messages.IdentifyMessage
 import com.segment.analytics.messages.Message
 import com.segment.analytics.messages.TrackMessage
-import io.airbyte.api.client2.model.generated.DeploymentMetadataRead
-import io.airbyte.api.client2.model.generated.WorkspaceRead
+import io.airbyte.api.client.model.generated.DeploymentMetadataRead
+import io.airbyte.api.client.model.generated.WorkspaceRead
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.micronaut.cache.annotation.CacheConfig
 import io.micronaut.cache.annotation.Cacheable

diff --git a/...yte-analytics/src/main/kotlin/io/airbyte/analytics/config/AnalyticsTrackingBeanFactory.kt b/...yte-analytics/src/main/kotlin/io/airbyte/analytics/config/AnalyticsTrackingBeanFactory.kt
@@ -1,7 +1,7 @@
 package io.airbyte.analytics.config
 
-import io.airbyte.api.client2.model.generated.DeploymentMetadataRead
-import io.airbyte.api.client2.model.generated.WorkspaceRead
+import io.airbyte.api.client.model.generated.DeploymentMetadataRead
+import io.airbyte.api.client.model.generated.WorkspaceRead
 import io.airbyte.commons.version.AirbyteVersion
 import io.airbyte.config.Configs
 import io.micronaut.context.annotation.Factory

diff --git a/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/DeploymentFetcherTest.kt b/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/DeploymentFetcherTest.kt
@@ -4,7 +4,7 @@
 
 package io.airbyte.analytics
 
-import io.airbyte.api.client2.model.generated.DeploymentMetadataRead
+import io.airbyte.api.client.model.generated.DeploymentMetadataRead
 import io.airbyte.commons.version.AirbyteVersion
 import io.airbyte.config.Configs
 import org.junit.jupiter.api.Assertions.assertEquals

diff --git a/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/SegmentTrackingClientTest.kt b/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/SegmentTrackingClientTest.kt
@@ -7,7 +7,7 @@ package io.airbyte.analytics
 import com.segment.analytics.Analytics
 import com.segment.analytics.messages.IdentifyMessage
 import com.segment.analytics.messages.TrackMessage
-import io.airbyte.api.client2.model.generated.DeploymentMetadataRead
+import io.airbyte.api.client.model.generated.DeploymentMetadataRead
 import io.airbyte.commons.version.AirbyteVersion
 import io.airbyte.config.Configs
 import io.airbyte.config.Configs.WorkerEnvironment

diff --git a/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/TrackingIdentityFetcherTest.kt b/airbyte-analytics/src/test/kotlin/io/airbyte/analytics/TrackingIdentityFetcherTest.kt
@@ -4,10 +4,10 @@
 
 package io.airbyte.analytics
 
-import io.airbyte.api.client2.generated.WorkspaceApi
-import io.airbyte.api.client2.model.generated.Geography
-import io.airbyte.api.client2.model.generated.WorkspaceIdRequestBody
-import io.airbyte.api.client2.model.generated.WorkspaceRead
+import io.airbyte.api.client.generated.WorkspaceApi
+import io.airbyte.api.client.model.generated.Geography
+import io.airbyte.api.client.model.generated.WorkspaceIdRequestBody
+import io.airbyte.api.client.model.generated.WorkspaceRead
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.jupiter.api.Assertions

diff --git a/...yte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/ConnectionsController.kt b/...yte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/ConnectionsController.kt
@@ -8,10 +8,10 @@ import io.airbyte.airbyte_api.model.generated.ConnectionCreateRequest
 import io.airbyte.airbyte_api.model.generated.ConnectionPatchRequest
 import io.airbyte.airbyte_api.model.generated.ConnectionResponse
 import io.airbyte.airbyte_api.model.generated.DestinationResponse
-import io.airbyte.api.client2.model.generated.AirbyteCatalog
-import io.airbyte.api.client2.model.generated.AirbyteStreamAndConfiguration
-import io.airbyte.api.client2.model.generated.DestinationSyncMode
-import io.airbyte.api.client2.model.generated.SourceDiscoverSchemaRead
+import io.airbyte.api.client.model.generated.AirbyteCatalog
+import io.airbyte.api.client.model.generated.AirbyteStreamAndConfiguration
+import io.airbyte.api.client.model.generated.DestinationSyncMode
+import io.airbyte.api.client.model.generated.SourceDiscoverSchemaRead
 import io.airbyte.api.server.apiTracking.TrackingHelper
 import io.airbyte.api.server.constants.CONNECTIONS_PATH
 import io.airbyte.api.server.constants.CONNECTIONS_WITH_ID_PATH

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/JobsController.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/JobsController.kt
@@ -8,8 +8,8 @@ import io.airbyte.airbyte_api.model.generated.ConnectionResponse
 import io.airbyte.airbyte_api.model.generated.JobCreateRequest
 import io.airbyte.airbyte_api.model.generated.JobStatusEnum
 import io.airbyte.airbyte_api.model.generated.JobTypeEnum
-import io.airbyte.api.client2.model.generated.JobListForWorkspacesRequestBody.OrderByField
-import io.airbyte.api.client2.model.generated.JobListForWorkspacesRequestBody.OrderByMethod
+import io.airbyte.api.client.model.generated.JobListForWorkspacesRequestBody.OrderByField
+import io.airbyte.api.client.model.generated.JobListForWorkspacesRequestBody.OrderByMethod
 import io.airbyte.api.server.apiTracking.TrackingHelper
 import io.airbyte.api.server.constants.AUTH_HEADER
 import io.airbyte.api.server.constants.DELETE

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/StreamsController.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/StreamsController.kt
@@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import io.airbyte.airbyte_api.model.generated.ConnectionSyncModeEnum
 import io.airbyte.airbyte_api.model.generated.StreamProperties
-import io.airbyte.api.client2.model.generated.AirbyteStreamAndConfiguration
-import io.airbyte.api.client2.model.generated.DestinationSyncMode
-import io.airbyte.api.client2.model.generated.SyncMode
+import io.airbyte.api.client.model.generated.AirbyteStreamAndConfiguration
+import io.airbyte.api.client.model.generated.DestinationSyncMode
+import io.airbyte.api.client.model.generated.SyncMode
 import io.airbyte.api.server.apiTracking.TrackingHelper
 import io.airbyte.api.server.constants.GET
 import io.airbyte.api.server.constants.STREAMS_PATH

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/filters/JobsFilter.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/filters/JobsFilter.kt
@@ -6,7 +6,7 @@ package io.airbyte.api.server.filters
 
 import io.airbyte.airbyte_api.model.generated.JobStatusEnum
 import io.airbyte.airbyte_api.model.generated.JobTypeEnum
-import io.airbyte.api.client2.model.generated.JobStatus
+import io.airbyte.api.client.model.generated.JobStatus
 import io.micronaut.core.annotation.Nullable
 import java.time.OffsetDateTime
 

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/forwardingClient/ConfigApiClient.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/forwardingClient/ConfigApiClient.kt
@@ -4,46 +4,46 @@
 
 package io.airbyte.api.server.forwardingClient
 
-import io.airbyte.api.client2.model.generated.CompleteOAuthResponse
-import io.airbyte.api.client2.model.generated.CompleteSourceOauthRequest
-import io.airbyte.api.client2.model.generated.ConnectionCreate
-import io.airbyte.api.client2.model.generated.ConnectionIdRequestBody
-import io.airbyte.api.client2.model.generated.ConnectionRead
-import io.airbyte.api.client2.model.generated.ConnectionReadList
-import io.airbyte.api.client2.model.generated.ConnectionUpdate
-import io.airbyte.api.client2.model.generated.DestinationCreate
-import io.airbyte.api.client2.model.generated.DestinationDefinitionIdWithWorkspaceId
-import io.airbyte.api.client2.model.generated.DestinationDefinitionSpecificationRead
-import io.airbyte.api.client2.model.generated.DestinationIdRequestBody
-import io.airbyte.api.client2.model.generated.DestinationRead
-import io.airbyte.api.client2.model.generated.DestinationReadList
-import io.airbyte.api.client2.model.generated.DestinationUpdate
-import io.airbyte.api.client2.model.generated.JobIdRequestBody
-import io.airbyte.api.client2.model.generated.JobInfoRead
-import io.airbyte.api.client2.model.generated.JobListForWorkspacesRequestBody
-import io.airbyte.api.client2.model.generated.JobListRequestBody
-import io.airbyte.api.client2.model.generated.JobReadList
-import io.airbyte.api.client2.model.generated.ListConnectionsForWorkspacesRequestBody
-import io.airbyte.api.client2.model.generated.ListResourcesForWorkspacesRequestBody
-import io.airbyte.api.client2.model.generated.OAuthConsentRead
-import io.airbyte.api.client2.model.generated.PartialDestinationUpdate
-import io.airbyte.api.client2.model.generated.PartialSourceUpdate
-import io.airbyte.api.client2.model.generated.SourceCreate
-import io.airbyte.api.client2.model.generated.SourceDefinitionIdWithWorkspaceId
-import io.airbyte.api.client2.model.generated.SourceDefinitionSpecificationRead
-import io.airbyte.api.client2.model.generated.SourceDiscoverSchemaRead
-import io.airbyte.api.client2.model.generated.SourceDiscoverSchemaRequestBody
-import io.airbyte.api.client2.model.generated.SourceIdRequestBody
-import io.airbyte.api.client2.model.generated.SourceOauthConsentRequest
-import io.airbyte.api.client2.model.generated.SourceRead
-import io.airbyte.api.client2.model.generated.SourceReadList
-import io.airbyte.api.client2.model.generated.SourceUpdate
-import io.airbyte.api.client2.model.generated.WorkspaceCreate
-import io.airbyte.api.client2.model.generated.WorkspaceIdRequestBody
-import io.airbyte.api.client2.model.generated.WorkspaceOverrideOauthParamsRequestBody
-import io.airbyte.api.client2.model.generated.WorkspaceRead
-import io.airbyte.api.client2.model.generated.WorkspaceReadList
-import io.airbyte.api.client2.model.generated.WorkspaceUpdate
+import io.airbyte.api.client.model.generated.CompleteOAuthResponse
+import io.airbyte.api.client.model.generated.CompleteSourceOauthRequest
+import io.airbyte.api.client.model.generated.ConnectionCreate
+import io.airbyte.api.client.model.generated.ConnectionIdRequestBody
+import io.airbyte.api.client.model.generated.ConnectionRead
+import io.airbyte.api.client.model.generated.ConnectionReadList
+import io.airbyte.api.client.model.generated.ConnectionUpdate
+import io.airbyte.api.client.model.generated.DestinationCreate
+import io.airbyte.api.client.model.generated.DestinationDefinitionIdWithWorkspaceId
+import io.airbyte.api.client.model.generated.DestinationDefinitionSpecificationRead
+import io.airbyte.api.client.model.generated.DestinationIdRequestBody
+import io.airbyte.api.client.model.generated.DestinationRead
+import io.airbyte.api.client.model.generated.DestinationReadList
+import io.airbyte.api.client.model.generated.DestinationUpdate
+import io.airbyte.api.client.model.generated.JobIdRequestBody
+import io.airbyte.api.client.model.generated.JobInfoRead
+import io.airbyte.api.client.model.generated.JobListForWorkspacesRequestBody
+import io.airbyte.api.client.model.generated.JobListRequestBody
+import io.airbyte.api.client.model.generated.JobReadList
+import io.airbyte.api.client.model.generated.ListConnectionsForWorkspacesRequestBody
+import io.airbyte.api.client.model.generated.ListResourcesForWorkspacesRequestBody
+import io.airbyte.api.client.model.generated.OAuthConsentRead
+import io.airbyte.api.client.model.generated.PartialDestinationUpdate
+import io.airbyte.api.client.model.generated.PartialSourceUpdate
+import io.airbyte.api.client.model.generated.SourceCreate
+import io.airbyte.api.client.model.generated.SourceDefinitionIdWithWorkspaceId
+import io.airbyte.api.client.model.generated.SourceDefinitionSpecificationRead
+import io.airbyte.api.client.model.generated.SourceDiscoverSchemaRead
+import io.airbyte.api.client.model.generated.SourceDiscoverSchemaRequestBody
+import io.airbyte.api.client.model.generated.SourceIdRequestBody
+import io.airbyte.api.client.model.generated.SourceOauthConsentRequest
+import io.airbyte.api.client.model.generated.SourceRead
+import io.airbyte.api.client.model.generated.SourceReadList
+import io.airbyte.api.client.model.generated.SourceUpdate
+import io.airbyte.api.client.model.generated.WorkspaceCreate
+import io.airbyte.api.client.model.generated.WorkspaceIdRequestBody
+import io.airbyte.api.client.model.generated.WorkspaceOverrideOauthParamsRequestBody
+import io.airbyte.api.client.model.generated.WorkspaceRead
+import io.airbyte.api.client.model.generated.WorkspaceReadList
+import io.airbyte.api.client.model.generated.WorkspaceUpdate
 import io.airbyte.api.server.constants.ANALYTICS_HEADER
 import io.airbyte.api.server.constants.ANALYTICS_HEADER_VALUE
 import io.airbyte.api.server.constants.AUTH_HEADER

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/helpers/AirbyteCatalogHelper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/helpers/AirbyteCatalogHelper.kt
@@ -17,12 +17,12 @@ import io.airbyte.airbyte_api.model.generated.ConnectionSyncModeEnum
 import io.airbyte.airbyte_api.model.generated.ScheduleTypeEnum
 import io.airbyte.airbyte_api.model.generated.StreamConfiguration
 import io.airbyte.airbyte_api.model.generated.StreamConfigurations
-import io.airbyte.api.client2.model.generated.AirbyteCatalog
-import io.airbyte.api.client2.model.generated.AirbyteStream
-import io.airbyte.api.client2.model.generated.AirbyteStreamAndConfiguration
-import io.airbyte.api.client2.model.generated.AirbyteStreamConfiguration
-import io.airbyte.api.client2.model.generated.DestinationSyncMode
-import io.airbyte.api.client2.model.generated.SyncMode
+import io.airbyte.api.client.model.generated.AirbyteCatalog
+import io.airbyte.api.client.model.generated.AirbyteStream
+import io.airbyte.api.client.model.generated.AirbyteStreamAndConfiguration
+import io.airbyte.api.client.model.generated.AirbyteStreamConfiguration
+import io.airbyte.api.client.model.generated.DestinationSyncMode
+import io.airbyte.api.client.model.generated.SyncMode
 import io.airbyte.api.server.mappers.ConnectionReadMapper
 import io.airbyte.api.server.problems.ConnectionConfigurationProblem
 import io.airbyte.api.server.problems.ConnectionConfigurationProblem.Companion.duplicateStream

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/helpers/ConnectionHelper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/helpers/ConnectionHelper.kt
@@ -8,8 +8,8 @@ import io.airbyte.airbyte_api.model.generated.NamespaceDefinitionEnum
 import io.airbyte.airbyte_api.model.generated.NamespaceDefinitionEnumNoDefault
 import io.airbyte.airbyte_api.model.generated.NonBreakingSchemaUpdatesBehaviorEnum
 import io.airbyte.airbyte_api.model.generated.NonBreakingSchemaUpdatesBehaviorEnumNoDefault
-import io.airbyte.api.client2.model.generated.NamespaceDefinitionType
-import io.airbyte.api.client2.model.generated.NonBreakingChangesPreference
+import io.airbyte.api.client.model.generated.NamespaceDefinitionType
+import io.airbyte.api.client.model.generated.NonBreakingChangesPreference
 
 /**
  * Connection helpers.

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionCreateMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionCreateMapper.kt
@@ -5,13 +5,13 @@
 package io.airbyte.api.server.mappers
 
 import io.airbyte.airbyte_api.model.generated.ConnectionCreateRequest
-import io.airbyte.api.client2.model.generated.AirbyteCatalog
-import io.airbyte.api.client2.model.generated.ConnectionCreate
-import io.airbyte.api.client2.model.generated.ConnectionScheduleData
-import io.airbyte.api.client2.model.generated.ConnectionScheduleDataCron
-import io.airbyte.api.client2.model.generated.ConnectionScheduleType
-import io.airbyte.api.client2.model.generated.ConnectionStatus
-import io.airbyte.api.client2.model.generated.Geography
+import io.airbyte.api.client.model.generated.AirbyteCatalog
+import io.airbyte.api.client.model.generated.ConnectionCreate
+import io.airbyte.api.client.model.generated.ConnectionScheduleData
+import io.airbyte.api.client.model.generated.ConnectionScheduleDataCron
+import io.airbyte.api.client.model.generated.ConnectionScheduleType
+import io.airbyte.api.client.model.generated.ConnectionStatus
+import io.airbyte.api.client.model.generated.Geography
 import io.airbyte.api.server.helpers.ConnectionHelper
 import java.util.UUID
 

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionReadMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionReadMapper.kt
@@ -14,12 +14,12 @@ import io.airbyte.airbyte_api.model.generated.NonBreakingSchemaUpdatesBehaviorEn
 import io.airbyte.airbyte_api.model.generated.ScheduleTypeWithBasicEnum
 import io.airbyte.airbyte_api.model.generated.StreamConfiguration
 import io.airbyte.airbyte_api.model.generated.StreamConfigurations
-import io.airbyte.api.client2.model.generated.ConnectionRead
-import io.airbyte.api.client2.model.generated.ConnectionScheduleType
-import io.airbyte.api.client2.model.generated.DestinationSyncMode
-import io.airbyte.api.client2.model.generated.NamespaceDefinitionType
-import io.airbyte.api.client2.model.generated.NonBreakingChangesPreference
-import io.airbyte.api.client2.model.generated.SyncMode
+import io.airbyte.api.client.model.generated.ConnectionRead
+import io.airbyte.api.client.model.generated.ConnectionScheduleType
+import io.airbyte.api.client.model.generated.DestinationSyncMode
+import io.airbyte.api.client.model.generated.NamespaceDefinitionType
+import io.airbyte.api.client.model.generated.NonBreakingChangesPreference
+import io.airbyte.api.client.model.generated.SyncMode
 import java.util.UUID
 
 /**

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionUpdateMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionUpdateMapper.kt
@@ -6,13 +6,13 @@ package io.airbyte.api.server.mappers
 
 import io.airbyte.airbyte_api.model.generated.ConnectionPatchRequest
 import io.airbyte.airbyte_api.model.generated.ScheduleTypeEnum
-import io.airbyte.api.client2.model.generated.AirbyteCatalog
-import io.airbyte.api.client2.model.generated.ConnectionScheduleData
-import io.airbyte.api.client2.model.generated.ConnectionScheduleDataCron
-import io.airbyte.api.client2.model.generated.ConnectionScheduleType
-import io.airbyte.api.client2.model.generated.ConnectionStatus
-import io.airbyte.api.client2.model.generated.ConnectionUpdate
-import io.airbyte.api.client2.model.generated.Geography
+import io.airbyte.api.client.model.generated.AirbyteCatalog
+import io.airbyte.api.client.model.generated.ConnectionScheduleData
+import io.airbyte.api.client.model.generated.ConnectionScheduleDataCron
+import io.airbyte.api.client.model.generated.ConnectionScheduleType
+import io.airbyte.api.client.model.generated.ConnectionStatus
+import io.airbyte.api.client.model.generated.ConnectionUpdate
+import io.airbyte.api.client.model.generated.Geography
 import io.airbyte.api.server.helpers.ConnectionHelper
 import jakarta.validation.constraints.NotBlank
 import java.util.UUID

diff --git a/...yte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionsResponseMapper.kt b/...yte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/ConnectionsResponseMapper.kt
@@ -5,8 +5,8 @@
 package io.airbyte.api.server.mappers
 
 import io.airbyte.airbyte_api.model.generated.ConnectionsResponse
-import io.airbyte.api.client2.model.generated.ConnectionRead
-import io.airbyte.api.client2.model.generated.ConnectionReadList
+import io.airbyte.api.client.model.generated.ConnectionRead
+import io.airbyte.api.client.model.generated.ConnectionReadList
 import io.airbyte.api.server.constants.CONNECTIONS_PATH
 import io.airbyte.api.server.constants.INCLUDE_DELETED
 import io.airbyte.api.server.constants.WORKSPACE_IDS

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/DestinationReadMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/DestinationReadMapper.kt
@@ -5,7 +5,7 @@
 package io.airbyte.api.server.mappers
 
 import io.airbyte.airbyte_api.model.generated.DestinationResponse
-import io.airbyte.api.client2.model.generated.DestinationRead
+import io.airbyte.api.client.model.generated.DestinationRead
 
 /**
  * Mappers that help convert models from the config api to models from the public api.

diff --git a/...te-api-server/src/main/kotlin/io/airbyte/api/server/mappers/DestinationsResponseMapper.kt b/...te-api-server/src/main/kotlin/io/airbyte/api/server/mappers/DestinationsResponseMapper.kt
@@ -5,8 +5,8 @@
 package io.airbyte.api.server.mappers
 
 import io.airbyte.airbyte_api.model.generated.DestinationsResponse
-import io.airbyte.api.client2.model.generated.DestinationRead
-import io.airbyte.api.client2.model.generated.DestinationReadList
+import io.airbyte.api.client.model.generated.DestinationRead
+import io.airbyte.api.client.model.generated.DestinationReadList
 import io.airbyte.api.server.constants.DESTINATIONS_PATH
 import io.airbyte.api.server.constants.INCLUDE_DELETED
 import io.airbyte.api.server.constants.WORKSPACE_IDS

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/JobResponseMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/JobResponseMapper.kt
@@ -7,11 +7,11 @@ package io.airbyte.api.server.mappers
 import io.airbyte.airbyte_api.model.generated.JobResponse
 import io.airbyte.airbyte_api.model.generated.JobStatusEnum
 import io.airbyte.airbyte_api.model.generated.JobTypeEnum
-import io.airbyte.api.client2.model.generated.JobConfigType
-import io.airbyte.api.client2.model.generated.JobInfoRead
-import io.airbyte.api.client2.model.generated.JobRead
-import io.airbyte.api.client2.model.generated.JobStatus
-import io.airbyte.api.client2.model.generated.JobWithAttemptsRead
+import io.airbyte.api.client.model.generated.JobConfigType
+import io.airbyte.api.client.model.generated.JobInfoRead
+import io.airbyte.api.client.model.generated.JobRead
+import io.airbyte.api.client.model.generated.JobStatus
+import io.airbyte.api.client.model.generated.JobWithAttemptsRead
 import io.airbyte.api.server.mappers.JobsResponseMapper.ALLOWED_CONFIG_TYPES
 import java.time.Duration
 import java.time.Instant

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/JobsResponseMapper.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/mappers/JobsResponseMapper.kt
@@ -7,9 +7,9 @@ package io.airbyte.api.server.mappers
 import io.airbyte.airbyte_api.model.generated.JobResponse
 import io.airbyte.airbyte_api.model.generated.JobTypeEnum
 import io.airbyte.airbyte_api.model.generated.JobsResponse
-import io.airbyte.api.client2.model.generated.JobConfigType
-import io.airbyte.api.client2.model.generated.JobReadList
-import io.airbyte.api.client2.model.generated.JobWithAttemptsRead
+import io.airbyte.api.client.model.generated.JobConfigType
+import io.airbyte.api.client.model.generated.JobReadList
+import io.airbyte.api.client.model.generated.JobWithAttemptsRead
 import io.airbyte.api.server.constants.JOBS_PATH
 import java.util.UUID
 import java.util.function.Function

diff --git a/.../src/main/kotlin/io/airbyte/api/server/mappers/SourceDefinitionSpecificationReadMapper.kt b/.../src/main/kotlin/io/airbyte/api/server/mappers/SourceDefinitionSpecificationReadMapper.kt
@@ -4,8 +4,8 @@
 
 package io.airbyte.api.server.mappers
 
-import io.airbyte.api.client2.model.generated.SourceDefinitionSpecificationRead
-import io.airbyte.api.client2.model.generated.SynchronousJobRead
+import io.airbyte.api.client.model.generated.SourceDefinitionSpecificationRead
+import io.airbyte.api.client.model.generated.SynchronousJobRead
 
 /**
  * Mappers that help convert models from the config api to models from the public api.