diff --git a/.env b/.env index 9cb39b9d638..6dc325db1e4 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ VERSION=0.1.0 DATABASE_USER=docker DATABASE_PASSWORD=docker -DATABASE_DB=dataline +DATABASE_DB=airbyte CONFIG_ROOT=/data WORKSPACE_ROOT=/tmp/workspace WORKSPACE_DOCKER_MOUNT=workspace -LOCAL_ROOT=/tmp/dataline_local +LOCAL_ROOT=/tmp/airbyte_local LOCAL_DOCKER_MOUNT=local TRACKING_STRATEGY=segment diff --git a/.env.dev b/.env.dev index 29586e3cd0a..0c226e5c0dd 100644 --- a/.env.dev +++ b/.env.dev @@ -3,11 +3,11 @@ VERSION=dev DATABASE_USER=docker DATABASE_PASSWORD=docker -DATABASE_DB=dataline +DATABASE_DB=airbyte DEV_ROOT=/tmp/dev_root CONFIG_ROOT=/tmp/data WORKSPACE_ROOT=/tmp/workspace WORKSPACE_DOCKER_MOUNT=dev-workspace -LOCAL_ROOT=/tmp/dataline_local +LOCAL_ROOT=/tmp/airbyte_local LOCAL_DOCKER_MOUNT=dev-local TRACKING_STRATEGY=logging diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5e496faa043..6f543fcce25 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,4 +1,4 @@ -name: Dataline CI +name: Airbyte CI on: push @@ -8,7 +8,7 @@ jobs: GRADLE_PATH: /tmp/gradle runs-on: ubuntu-latest steps: - - name: Checkout Dataline + - name: Checkout Airbyte uses: actions/checkout@v2 - name: Cache java deps @@ -62,7 +62,7 @@ jobs: - name: Push Core Docker Images if: success() && github.ref == 'refs/heads/master' run: | - docker login -u datalinebot -p ${DOCKER_PASSWORD} + docker login -u airbytebot -p ${DOCKER_PASSWORD} docker-compose -f docker-compose.build.yaml push env: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.gitignore b/.gitignore index ebddc29cee1..ab0b9b93ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ build !tools/build .DS_Store -dataline-db/pg_data/* data diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 551babe92b2..e5f6e31810e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,2 +1,2 @@ # Code of conduct -View in [docs.dataline.io](https://docs.dataline.io/contributing/contributing-to-dataline/code-of-conduct) +View in [docs.airbyte.io](https://docs.airbyte.io/contributing/contributing-to-airbyte/code-of-conduct) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 361203581a7..d392625c667 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,2 @@ # Contributing -View on [docs.dataline.io](https://docs.dataline.io/contributing/contributing-to-dataline) +View on [docs.airbyte.io](https://docs.airbyte.io/contributing/contributing-to-airbyte) diff --git a/LICENSE b/LICENSE index 3ff3a6da0f2..f6af54a4869 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Dataline +Copyright (c) 2020 Airbyte Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index a9aa8c918ba..db9647cc982 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ # Getting Started -![GitHub Workflow Status](https://img.shields.io/github/workflow/status/datalineio/dataline/Dataline%20CI) ![License](https://img.shields.io/github/license/datalineio/dataline) +![GitHub Workflow Status](https://img.shields.io/github/workflow/status/airbytehq/airbyte/Airbyte%20CI) ![License](https://img.shields.io/github/license/airbytehq/airbyte) -[![](docs/.gitbook/assets/dataline_light-background.svg)](https://dataline.io) +[![](docs/.gitbook/assets/airbyte_light-background.svg)](https://airbyte.io) ### Data integration made simple, secure and reliable. The new open-source standard to sync data from applications & databases to warehouses. -[![](docs/.gitbook/assets/deploy-locally.svg)](https://docs.dataline.io/deployment/deploying-dataline/with-docker) [![](docs/.gitbook/assets/deploy-on-aws.svg)](https://docs.dataline.io/deployment/deploying-dataline/on-aws-ec2) [![](docs/.gitbook/assets/deploy-on-gcp.svg)](https://docs.dataline.io/deployment/deploying-dataline/on-gcp-compute-engine) +[![](docs/.gitbook/assets/deploy-locally.svg)](https://docs.airbyte.io/deployment/deploying-airbyte/with-docker) [![](docs/.gitbook/assets/deploy-on-aws.svg)](https://docs.airbyte.io/deployment/deploying-airbyte/on-aws-ec2) [![](docs/.gitbook/assets/deploy-on-gcp.svg)](https://docs.airbyte.io/deployment/deploying-airbyte/on-gcp-compute-engine) ![](docs/.gitbook/assets/sources_list.png) -Dataline is on a mission to make data integration pipelines a commodity. +Airbyte is on a mission to make data integration pipelines a commodity. * **Maintenance-free connectors you can use in minutes**. Just authenticate your sources and warehouse, and get connectors that adapts to schema and API changes for you. -* On a mission to **cover the long tail of integrations**, as Dataline will be very active in maintaining the pipelines’ reliability. +* On a mission to **cover the long tail of integrations**, as Airbyte will be very active in maintaining the pipelines’ reliability. * **Building new integrations made trivial**. We make it very easy to add new integrations that you need, by offering scheduling and orchestration. * **Your data stays in your cloud**. Have full control over your data, and the costs of your data transfers. * **No more security compliance process** to go through as self-hosted. @@ -26,8 +26,8 @@ Dataline is on a mission to make data integration pipelines a commodity. ### Quick start ```bash -git clone git@github.com:datalineio/dataline.git -cd dataline +git clone git@github.com:airbytehq/airbyte.git +cd airbyte docker-compose up ``` @@ -42,25 +42,25 @@ Now visit [http://localhost:8000](http://localhost:8000) * **Manual full refresh**: Sometimes, you need to re-sync all your data to start again. * **Granular system logs**: No opacity whatsoever to let you control and trust. -[See more on our website.](https://dataline.io/features/) +[See more on our website.](https://airbyte.io/features/) ## Contributing -We love contributions to Dataline, big or small. See our [Contributing Guide](https://docs.dataline.io/contributing/contributing-to-dataline) on how to get started. Not sure where to start? We’ve listed some [good first issues](https://github.com/datalineio/dataline/labels/good%20first%20issue) to start with. You can also [book a free, no-pressure pairing session](https://drift.me/micheltricot/meeting) with one of our core contributors. +We love contributions to Airbyte, big or small. See our [Contributing Guide](https://docs.airbyte.io/contributing/contributing-to-airbyte) on how to get started. Not sure where to start? We’ve listed some [good first issues](https://github.com/airbytehq/airbyte/labels/good%20first%20issue) to start with. You can also [book a free, no-pressure pairing session](https://drift.me/micheltricot/meeting) with one of our core contributors. ## Community support -For general help using Dataline, please refer to the official Dataline documentation. For additional help, you can use one of these channels to ask a question: +For general help using Airbyte, please refer to the official Airbyte documentation. For additional help, you can use one of these channels to ask a question: -* [Slack](https://join.slack.com/t/datalinehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ) \(For live discussion with the Community and Dataline team\) -* [GitHub](https://github.com/datalineio/dataline) \(Bug reports, Contributions\) -* [Twitter](https://twitter.com/datalinehq) \(Get the news fast\) +* [Slack](https://join.slack.com/t/airbytehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ) \(For live discussion with the Community and Airbyte team\) +* [GitHub](https://github.com/airbytehq/airbyte) \(Bug reports, Contributions\) +* [Twitter](https://twitter.com/airbytehq) \(Get the news fast\) ## Roadmap -Check out our [roadmap](https://github.com/datalineio/dataline/projects/1) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature. For our high-level roadmap and strategy, you can check [our handbook](https://docs.dataline.io/company-handbook/company-handbook/roadmap). +Check out our [roadmap](https://github.com/airbytehq/airbyte/projects/1) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature. For our high-level roadmap and strategy, you can check [our handbook](https://docs.airbyte.io/company-handbook/company-handbook/roadmap). ## License -Dataline is licensed under the MIT license. See the [LICENSE](https://docs.dataline.io/license) file for licensing information. +Airbyte is licensed under the MIT license. See the [LICENSE](https://docs.airbyte.io/license) file for licensing information. diff --git a/airbyte-analytics/build.gradle b/airbyte-analytics/build.gradle new file mode 100644 index 00000000000..8993aa529cf --- /dev/null +++ b/airbyte-analytics/build.gradle @@ -0,0 +1,7 @@ +dependencies { + implementation 'com.segment.analytics.java:analytics:2.1.1' + + + implementation project(':airbyte-config:models') + implementation project(':airbyte-config:persistence') +} diff --git a/dataline-analytics/src/main/java/io/dataline/analytics/LoggingTrackingClient.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java similarity index 97% rename from dataline-analytics/src/main/java/io/dataline/analytics/LoggingTrackingClient.java rename to airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java index 4bbe276e57f..a47ee5f49e8 100644 --- a/dataline-analytics/src/main/java/io/dataline/analytics/LoggingTrackingClient.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import java.util.Collections; import java.util.Map; diff --git a/dataline-analytics/src/main/java/io/dataline/analytics/SegmentTrackingClient.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java similarity index 98% rename from dataline-analytics/src/main/java/io/dataline/analytics/SegmentTrackingClient.java rename to airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java index 4fb4b732e41..f361c573947 100644 --- a/dataline-analytics/src/main/java/io/dataline/analytics/SegmentTrackingClient.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; diff --git a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingClient.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClient.java similarity index 95% rename from dataline-analytics/src/main/java/io/dataline/analytics/TrackingClient.java rename to airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClient.java index eba916784f3..4fcfebb037a 100644 --- a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingClient.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import java.util.Map; diff --git a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingClientSingleton.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java similarity index 91% rename from dataline-analytics/src/main/java/io/dataline/analytics/TrackingClientSingleton.java rename to airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java index b62721a3535..9f53556c72a 100644 --- a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingClientSingleton.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import com.google.common.annotations.VisibleForTesting; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.Configs; -import io.dataline.config.StandardWorkspace; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.PersistenceConstants; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.Configs; +import io.airbyte.config.StandardWorkspace; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.PersistenceConstants; import java.io.IOException; import java.util.function.Supplier; diff --git a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingIdentity.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java similarity index 97% rename from dataline-analytics/src/main/java/io/dataline/analytics/TrackingIdentity.java rename to airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java index 907330c029e..9f6103674e1 100644 --- a/dataline-analytics/src/main/java/io/dataline/analytics/TrackingIdentity.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import java.util.Objects; import java.util.Optional; diff --git a/dataline-analytics/src/test/java/io/dataline/analytics/SegmentTrackingClientTest.java b/airbyte-analytics/src/test/java/io/airbyte/analytics/SegmentTrackingClientTest.java similarity index 96% rename from dataline-analytics/src/test/java/io/dataline/analytics/SegmentTrackingClientTest.java rename to airbyte-analytics/src/test/java/io/airbyte/analytics/SegmentTrackingClientTest.java index 2f6c53b6a33..871bcbbf3a4 100644 --- a/dataline-analytics/src/test/java/io/dataline/analytics/SegmentTrackingClientTest.java +++ b/airbyte-analytics/src/test/java/io/airbyte/analytics/SegmentTrackingClientTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -40,7 +40,7 @@ import org.mockito.ArgumentCaptor; class SegmentTrackingClientTest { - private static final TrackingIdentity identity = new TrackingIdentity(UUID.randomUUID(), "a@dataline.io", false, false, true); + private static final TrackingIdentity identity = new TrackingIdentity(UUID.randomUUID(), "a@airbyte.io", false, false, true); private Analytics analytics; private SegmentTrackingClient segmentTrackingClient; diff --git a/dataline-analytics/src/test/java/io/dataline/analytics/TrackingClientSingletonTest.java b/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java similarity index 90% rename from dataline-analytics/src/test/java/io/dataline/analytics/TrackingClientSingletonTest.java rename to airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java index 81ad04f75ff..dc3f1be8a2d 100644 --- a/dataline-analytics/src/test/java/io/dataline/analytics/TrackingClientSingletonTest.java +++ b/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.analytics; +package io.airbyte.analytics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.Configs; -import io.dataline.config.StandardWorkspace; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.PersistenceConstants; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.Configs; +import io.airbyte.config.StandardWorkspace; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.PersistenceConstants; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; @@ -91,7 +91,7 @@ class TrackingClientSingletonTest { void testGetTrackingIdentityNonAnonymous() throws JsonValidationException, IOException, ConfigNotFoundException { final StandardWorkspace workspace = new StandardWorkspace() .withCustomerId(UUID.randomUUID()) - .withEmail("a@dataline.io") + .withEmail("a@airbyte.io") .withAnonymousDataCollection(false) .withNews(true) .withSecurityUpdates(true); @@ -108,7 +108,7 @@ class TrackingClientSingletonTest { void testGetTrackingIdentityAnonymous() throws JsonValidationException, IOException, ConfigNotFoundException { final StandardWorkspace workspace = new StandardWorkspace() .withCustomerId(UUID.randomUUID()) - .withEmail("a@dataline.io") + .withEmail("a@airbyte.io") .withAnonymousDataCollection(true) .withNews(true) .withSecurityUpdates(true); diff --git a/dataline-api/build.gradle b/airbyte-api/build.gradle similarity index 90% rename from dataline-api/build.gradle rename to airbyte-api/build.gradle index 30e74ca857b..57063b0dd71 100644 --- a/dataline-api/build.gradle +++ b/airbyte-api/build.gradle @@ -17,9 +17,9 @@ task generateApiServer(type: GenerateTask) { inputSpec = specFile outputDir = serverOutputDir - apiPackage = "io.dataline.api" - invokerPackage = "io.dataline.api.invoker" - modelPackage = "io.dataline.api.model" + apiPackage = "io.airbyte.api" + invokerPackage = "io.airbyte.api.invoker" + modelPackage = "io.airbyte.api.model" importMappings = [ 'SourceSpecification' : 'com.fasterxml.jackson.databind.JsonNode', @@ -48,9 +48,9 @@ task generateApiClient(type: GenerateTask) { inputSpec = specFile outputDir = clientOutputDir - apiPackage = "io.dataline.api.client" - invokerPackage = "io.dataline.api.client.invoker" - modelPackage = "io.dataline.api.client.model" + apiPackage = "io.airbyte.api.client" + invokerPackage = "io.airbyte.api.client.invoker" + modelPackage = "io.airbyte.api.client.model" importMappings = [ 'SourceSpecification' : 'com.fasterxml.jackson.databind.JsonNode', @@ -79,9 +79,9 @@ task generateApiDocs(type: GenerateTask) { inputSpec = specFile outputDir = docsOutputDir - apiPackage = "io.dataline.api.client" - invokerPackage = "io.dataline.api.client.invoker" - modelPackage = "io.dataline.api.client.model" + apiPackage = "io.airbyte.api.client" + invokerPackage = "io.airbyte.api.client.invoker" + modelPackage = "io.airbyte.api.client.model" importMappings = [ 'SourceSpecification' : 'com.fasterxml.jackson.databind.JsonNode', diff --git a/dataline-api/src/main/java/io/dataline/api/client/DatalineApiClient.java b/airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java similarity index 94% rename from dataline-api/src/main/java/io/dataline/api/client/DatalineApiClient.java rename to airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java index 5e9762e0ca3..804c3117801 100644 --- a/dataline-api/src/main/java/io/dataline/api/client/DatalineApiClient.java +++ b/airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.api.client; +package io.airbyte.api.client; -import io.dataline.api.client.invoker.ApiClient; +import io.airbyte.api.client.invoker.ApiClient; /** * This class is meant to consolidate all our API endpoints into a fluent-ish client. Currently, all @@ -38,7 +38,7 @@ import io.dataline.api.client.invoker.ApiClient; * * This is currently manually maintained. We could look into autogenerating it if needed. */ -public class DatalineApiClient { +public class AirbyteApiClient { private final ConnectionApi connectionApi; private final DestinationApi destinationApi; @@ -50,7 +50,7 @@ public class DatalineApiClient { private final SourceSpecificationApi sourceSpecificationApi; private final WorkspaceApi workspaceApi; - public DatalineApiClient(ApiClient apiClient) { + public AirbyteApiClient(ApiClient apiClient) { connectionApi = new ConnectionApi(apiClient); destinationApi = new DestinationApi(apiClient); destinationImplementationApi = new DestinationImplementationApi(apiClient); diff --git a/dataline-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml similarity index 99% rename from dataline-api/src/main/openapi/config.yaml rename to airbyte-api/src/main/openapi/config.yaml index 8993783b1f7..69cff44574d 100644 --- a/dataline-api/src/main/openapi/config.yaml +++ b/airbyte-api/src/main/openapi/config.yaml @@ -1,8 +1,8 @@ openapi: 3.0.0 info: description: | - Dataline Configuration API - [https://dataline.io](https://dataline.io). + Airbyte Configuration API + [https://airbyte.io](https://airbyte.io). This API is a collection HTTP RPC-style methods. While it is not a REST API, those familiar with REST should find the conventions of this API recognizable. @@ -20,15 +20,15 @@ info: * Adding new HTTP endpoints. version: "1.0.0-oas3" - title: Dataline Configuration API + title: Airbyte Configuration API contact: - email: contact@dataline.io + email: contact@airbyte.io license: name: MIT url: "https://opensource.org/licenses/MIT" externalDocs: - description: Find out more about Dataline - url: "https://dataline.io" + description: Find out more about Airbyte + url: "https://airbyte.io" servers: - url: "localhost:8001" tags: @@ -125,7 +125,7 @@ paths: post: tags: - source - summary: List all of the sources that Dataline supports + summary: List all of the sources that Airbyte supports operationId: listSources responses: "200": @@ -341,7 +341,7 @@ paths: post: tags: - destination - summary: List all of the destinations that Dataline supports + summary: List all of the destinations that Airbyte supports operationId: listDestinations responses: "200": diff --git a/dataline-commons/build.gradle b/airbyte-commons/build.gradle similarity index 100% rename from dataline-commons/build.gradle rename to airbyte-commons/build.gradle diff --git a/dataline-commons/src/main/java/io/dataline/commons/concurrency/LifecycledCallable.java b/airbyte-commons/src/main/java/io/airbyte/commons/concurrency/LifecycledCallable.java similarity index 96% rename from dataline-commons/src/main/java/io/dataline/commons/concurrency/LifecycledCallable.java rename to airbyte-commons/src/main/java/io/airbyte/commons/concurrency/LifecycledCallable.java index 02776f3202e..2e7e942b49b 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/concurrency/LifecycledCallable.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/concurrency/LifecycledCallable.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.commons.concurrency; +package io.airbyte.commons.concurrency; -import io.dataline.commons.functional.CheckedConsumer; +import io.airbyte.commons.functional.CheckedConsumer; import java.util.concurrent.Callable; public class LifecycledCallable implements Callable { diff --git a/dataline-commons/src/main/java/io/dataline/commons/concurrency/VoidCallable.java b/airbyte-commons/src/main/java/io/airbyte/commons/concurrency/VoidCallable.java similarity index 94% rename from dataline-commons/src/main/java/io/dataline/commons/concurrency/VoidCallable.java rename to airbyte-commons/src/main/java/io/airbyte/commons/concurrency/VoidCallable.java index b85fe8dd97c..0ef4a319467 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/concurrency/VoidCallable.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/concurrency/VoidCallable.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.concurrency; +package io.airbyte.commons.concurrency; import java.util.concurrent.Callable; diff --git a/dataline-commons/src/main/java/io/dataline/commons/enums/Enums.java b/airbyte-commons/src/main/java/io/airbyte/commons/enums/Enums.java similarity index 96% rename from dataline-commons/src/main/java/io/dataline/commons/enums/Enums.java rename to airbyte-commons/src/main/java/io/airbyte/commons/enums/Enums.java index 01eb893d519..227249de071 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/enums/Enums.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/enums/Enums.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.enums; +package io.airbyte.commons.enums; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; diff --git a/dataline-commons/src/main/java/io/dataline/commons/functional/CheckedConsumer.java b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java similarity index 94% rename from dataline-commons/src/main/java/io/dataline/commons/functional/CheckedConsumer.java rename to airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java index 1fc56dd0047..65fe6261bca 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/functional/CheckedConsumer.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.functional; +package io.airbyte.commons.functional; @FunctionalInterface public interface CheckedConsumer { diff --git a/dataline-commons/src/main/java/io/dataline/commons/functional/CheckedSupplier.java b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java similarity index 94% rename from dataline-commons/src/main/java/io/dataline/commons/functional/CheckedSupplier.java rename to airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java index 685c0a522dd..4c1a3316172 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/functional/CheckedSupplier.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.functional; +package io.airbyte.commons.functional; @FunctionalInterface public interface CheckedSupplier { diff --git a/dataline-commons/src/main/java/io/dataline/commons/functional/CloseableConsumer.java b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CloseableConsumer.java similarity index 94% rename from dataline-commons/src/main/java/io/dataline/commons/functional/CloseableConsumer.java rename to airbyte-commons/src/main/java/io/airbyte/commons/functional/CloseableConsumer.java index 14c9bc8c794..df7933f0c02 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/functional/CloseableConsumer.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/functional/CloseableConsumer.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.functional; +package io.airbyte.commons.functional; import java.util.function.Consumer; diff --git a/dataline-commons/src/main/java/io/dataline/commons/io/IOs.java b/airbyte-commons/src/main/java/io/airbyte/commons/io/IOs.java similarity index 97% rename from dataline-commons/src/main/java/io/dataline/commons/io/IOs.java rename to airbyte-commons/src/main/java/io/airbyte/commons/io/IOs.java index 9b729a46a1f..5c9c0e510bc 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/io/IOs.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/io/IOs.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.io; +package io.airbyte.commons.io; import com.google.common.base.Charsets; import java.io.BufferedReader; diff --git a/dataline-commons/src/main/java/io/dataline/commons/io/LineGobbler.java b/airbyte-commons/src/main/java/io/airbyte/commons/io/LineGobbler.java similarity index 95% rename from dataline-commons/src/main/java/io/dataline/commons/io/LineGobbler.java rename to airbyte-commons/src/main/java/io/airbyte/commons/io/LineGobbler.java index e6280a12be7..089f564bcd2 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/io/LineGobbler.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/io/LineGobbler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.commons.io; +package io.airbyte.commons.io; -import io.dataline.commons.concurrency.VoidCallable; +import io.airbyte.commons.concurrency.VoidCallable; import java.io.BufferedReader; import java.io.InputStream; import java.util.concurrent.ExecutorService; diff --git a/dataline-commons/src/main/java/io/dataline/commons/json/JsonSchemaValidator.java b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java similarity index 96% rename from dataline-commons/src/main/java/io/dataline/commons/json/JsonSchemaValidator.java rename to airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java index cc76c2b769c..c4e88bf7da9 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/json/JsonSchemaValidator.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.json; +package io.airbyte.commons.json; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Preconditions; @@ -30,7 +30,7 @@ import com.networknt.schema.JsonSchemaFactory; import com.networknt.schema.SchemaValidatorsConfig; import com.networknt.schema.SpecVersion; import com.networknt.schema.ValidationMessage; -import io.dataline.commons.string.Strings; +import io.airbyte.commons.string.Strings; import java.io.File; import java.io.IOException; import java.util.Set; diff --git a/dataline-commons/src/main/java/io/dataline/commons/json/JsonValidationException.java b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java similarity index 95% rename from dataline-commons/src/main/java/io/dataline/commons/json/JsonValidationException.java rename to airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java index 8423d3211f0..9c1145cbf3e 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/json/JsonValidationException.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.json; +package io.airbyte.commons.json; public class JsonValidationException extends Exception { diff --git a/dataline-commons/src/main/java/io/dataline/commons/json/Jsons.java b/airbyte-commons/src/main/java/io/airbyte/commons/json/Jsons.java similarity index 98% rename from dataline-commons/src/main/java/io/dataline/commons/json/Jsons.java rename to airbyte-commons/src/main/java/io/airbyte/commons/json/Jsons.java index 9d268a541d1..07c8821a05c 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/json/Jsons.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/json/Jsons.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.json; +package io.airbyte.commons.json; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/dataline-commons/src/main/java/io/dataline/commons/resources/MoreResources.java b/airbyte-commons/src/main/java/io/airbyte/commons/resources/MoreResources.java similarity index 97% rename from dataline-commons/src/main/java/io/dataline/commons/resources/MoreResources.java rename to airbyte-commons/src/main/java/io/airbyte/commons/resources/MoreResources.java index ed8b9a121c9..2cf6af9a008 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/resources/MoreResources.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/resources/MoreResources.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.resources; +package io.airbyte.commons.resources; import com.google.common.base.Preconditions; import com.google.common.io.Resources; diff --git a/dataline-commons/src/main/java/io/dataline/commons/string/Strings.java b/airbyte-commons/src/main/java/io/airbyte/commons/string/Strings.java similarity index 95% rename from dataline-commons/src/main/java/io/dataline/commons/string/Strings.java rename to airbyte-commons/src/main/java/io/airbyte/commons/string/Strings.java index 1a23643d9c1..18db80d069f 100644 --- a/dataline-commons/src/main/java/io/dataline/commons/string/Strings.java +++ b/airbyte-commons/src/main/java/io/airbyte/commons/string/Strings.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.string; +package io.airbyte.commons.string; import com.google.common.collect.Streams; import java.util.stream.Collectors; diff --git a/dataline-commons/src/main/resources/log4j2.xml b/airbyte-commons/src/main/resources/log4j2.xml similarity index 100% rename from dataline-commons/src/main/resources/log4j2.xml rename to airbyte-commons/src/main/resources/log4j2.xml diff --git a/dataline-commons/src/test/java/io/dataline/commons/concurrency/LifecycledCallableTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/concurrency/LifecycledCallableTest.java similarity index 96% rename from dataline-commons/src/test/java/io/dataline/commons/concurrency/LifecycledCallableTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/concurrency/LifecycledCallableTest.java index 27fe3da0eac..834bfd42045 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/concurrency/LifecycledCallableTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/concurrency/LifecycledCallableTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.concurrency; +package io.airbyte.commons.concurrency; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,7 +30,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.commons.functional.CheckedConsumer; +import io.airbyte.commons.functional.CheckedConsumer; import java.util.concurrent.Callable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/dataline-commons/src/test/java/io/dataline/commons/enums/EnumsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/enums/EnumsTest.java similarity index 92% rename from dataline-commons/src/test/java/io/dataline/commons/enums/EnumsTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/enums/EnumsTest.java index 7eb7bf7ad36..0f655a8e168 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/enums/EnumsTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/enums/EnumsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.commons.enums; +package io.airbyte.commons.enums; -import static io.dataline.commons.enums.Enums.convertTo; -import static io.dataline.commons.enums.Enums.isCompatible; +import static io.airbyte.commons.enums.Enums.convertTo; +import static io.airbyte.commons.enums.Enums.isCompatible; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dataline-commons/src/test/java/io/dataline/commons/io/IOsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/io/IOsTest.java similarity index 98% rename from dataline-commons/src/test/java/io/dataline/commons/io/IOsTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/io/IOsTest.java index ed0624deb98..6e67d267b2e 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/io/IOsTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/io/IOsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.io; +package io.airbyte.commons.io; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dataline-commons/src/test/java/io/dataline/commons/io/LineGobblerTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/io/LineGobblerTest.java similarity index 98% rename from dataline-commons/src/test/java/io/dataline/commons/io/LineGobblerTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/io/LineGobblerTest.java index 90e41bf2da7..3516cdb7af1 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/io/LineGobblerTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/io/LineGobblerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.io; +package io.airbyte.commons.io; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.spy; diff --git a/dataline-commons/src/test/java/io/dataline/commons/json/JsonSchemaValidatorTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java similarity index 98% rename from dataline-commons/src/test/java/io/dataline/commons/json/JsonSchemaValidatorTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java index 0b125bc13b2..3b8778e102c 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/json/JsonSchemaValidatorTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.json; +package io.airbyte.commons.json; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/dataline-commons/src/test/java/io/dataline/commons/json/JsonsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java similarity index 99% rename from dataline-commons/src/test/java/io/dataline/commons/json/JsonsTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java index 6d37c9af244..f318040542a 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/json/JsonsTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.json; +package io.airbyte.commons.json; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/dataline-commons/src/test/java/io/dataline/commons/logging/Log4j2ConfigTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/logging/Log4j2ConfigTest.java similarity index 95% rename from dataline-commons/src/test/java/io/dataline/commons/logging/Log4j2ConfigTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/logging/Log4j2ConfigTest.java index 363adf91752..5a57dbe93cb 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/logging/Log4j2ConfigTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/logging/Log4j2ConfigTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.commons.logging; +package io.airbyte.commons.logging; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.dataline.commons.io.IOs; +import io.airbyte.commons.io.IOs; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-commons/src/test/java/io/dataline/commons/resources/MoreResourcesTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/resources/MoreResourcesTest.java similarity index 96% rename from dataline-commons/src/test/java/io/dataline/commons/resources/MoreResourcesTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/resources/MoreResourcesTest.java index 7d9b9fc407b..f1f5577d2d5 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/resources/MoreResourcesTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/resources/MoreResourcesTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.resources; +package io.airbyte.commons.resources; import static org.junit.jupiter.api.Assertions.*; diff --git a/dataline-commons/src/test/java/io/dataline/commons/string/StringsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/string/StringsTest.java similarity index 96% rename from dataline-commons/src/test/java/io/dataline/commons/string/StringsTest.java rename to airbyte-commons/src/test/java/io/airbyte/commons/string/StringsTest.java index a3335267bf8..171c0564bff 100644 --- a/dataline-commons/src/test/java/io/dataline/commons/string/StringsTest.java +++ b/airbyte-commons/src/test/java/io/airbyte/commons/string/StringsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.commons.string; +package io.airbyte.commons.string; import com.google.common.collect.Lists; import org.junit.jupiter.api.Assertions; diff --git a/dataline-commons/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/airbyte-commons/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from dataline-commons/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to airbyte-commons/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/dataline-commons/src/test/resources/resource_test b/airbyte-commons/src/test/resources/resource_test similarity index 100% rename from dataline-commons/src/test/resources/resource_test rename to airbyte-commons/src/test/resources/resource_test diff --git a/dataline-commons/src/test/resources/subdir/resource_test_sub b/airbyte-commons/src/test/resources/subdir/resource_test_sub similarity index 100% rename from dataline-commons/src/test/resources/subdir/resource_test_sub rename to airbyte-commons/src/test/resources/subdir/resource_test_sub diff --git a/dataline-commons/src/test/resources/subdir/resource_test_sub_2 b/airbyte-commons/src/test/resources/subdir/resource_test_sub_2 similarity index 100% rename from dataline-commons/src/test/resources/subdir/resource_test_sub_2 rename to airbyte-commons/src/test/resources/subdir/resource_test_sub_2 diff --git a/dataline-config/init/.dockerignore b/airbyte-config/init/.dockerignore similarity index 100% rename from dataline-config/init/.dockerignore rename to airbyte-config/init/.dockerignore diff --git a/dataline-config/init/Dockerfile b/airbyte-config/init/Dockerfile similarity index 100% rename from dataline-config/init/Dockerfile rename to airbyte-config/init/Dockerfile diff --git a/dataline-config/init/build.gradle b/airbyte-config/init/build.gradle similarity index 100% rename from dataline-config/init/build.gradle rename to airbyte-config/init/build.gradle diff --git a/dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json b/airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json similarity index 86% rename from dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json rename to airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json index 2f62ff39d65..b6466730b35 100644 --- a/dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json +++ b/airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json @@ -19,7 +19,7 @@ "examples": ["\""] }, "destination_path": { - "description": "Path to write the data. This path will be concatenated onto the `LOCAL_ROOT`. e.g. If `LOCAL_ROOT = /tmp/dataline_local` and destination_path is `cars/models`, then the directory `/tmp/dataline_local/cars/models`. By default `LOCAL_ROOT` is `/tmp/dataline_local`.", + "description": "Path to write the data. This path will be concatenated onto the `LOCAL_ROOT`. e.g. If `LOCAL_ROOT = /tmp/airbyte_local` and destination_path is `cars/models`, then the directory `/tmp/airbyte_local/cars/models`. By default `LOCAL_ROOT` is `/tmp/airbyte_local`.", "type": "string" } } diff --git a/dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json b/airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json similarity index 100% rename from dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json rename to airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json diff --git a/dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json b/airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json similarity index 100% rename from dataline-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json rename to airbyte-config/init/src/main/resources/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json diff --git a/dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json b/airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json similarity index 100% rename from dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json rename to airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json diff --git a/dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json b/airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json similarity index 100% rename from dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json rename to airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json diff --git a/dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json b/airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json similarity index 100% rename from dataline-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json rename to airbyte-config/init/src/main/resources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/22f6c74f-5699-40ff-833c-4a879ea40133.json b/airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/22f6c74f-5699-40ff-833c-4a879ea40133.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/22f6c74f-5699-40ff-833c-4a879ea40133.json rename to airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/22f6c74f-5699-40ff-833c-4a879ea40133.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/25c5221d-dce2-4163-ade9-739ef790f503.json b/airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/25c5221d-dce2-4163-ade9-739ef790f503.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/25c5221d-dce2-4163-ade9-739ef790f503.json rename to airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/25c5221d-dce2-4163-ade9-739ef790f503.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/8be1cf83-fde1-477f-a4ad-318d23c9f3c6.json b/airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/8be1cf83-fde1-477f-a4ad-318d23c9f3c6.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_DESTINATION/8be1cf83-fde1-477f-a4ad-318d23c9f3c6.json rename to airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION/8be1cf83-fde1-477f-a4ad-318d23c9f3c6.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_SOURCE/9fed261d-d107-47fd-8c8b-323023db6e20.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/9fed261d-d107-47fd-8c8b-323023db6e20.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_SOURCE/9fed261d-d107-47fd-8c8b-323023db6e20.json rename to airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/9fed261d-d107-47fd-8c8b-323023db6e20.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_SOURCE/decd338e-5647-4c0b-adf4-da0e75f5a750.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/decd338e-5647-4c0b-adf4-da0e75f5a750.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_SOURCE/decd338e-5647-4c0b-adf4-da0e75f5a750.json rename to airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/decd338e-5647-4c0b-adf4-da0e75f5a750.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_SOURCE/e094cb9a-26de-4645-8761-65c0c425d1de.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/e094cb9a-26de-4645-8761-65c0c425d1de.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_SOURCE/e094cb9a-26de-4645-8761-65c0c425d1de.json rename to airbyte-config/init/src/main/resources/config/STANDARD_SOURCE/e094cb9a-26de-4645-8761-65c0c425d1de.json diff --git a/dataline-config/init/src/main/resources/config/STANDARD_WORKSPACE/5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6.json b/airbyte-config/init/src/main/resources/config/STANDARD_WORKSPACE/5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6.json similarity index 100% rename from dataline-config/init/src/main/resources/config/STANDARD_WORKSPACE/5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6.json rename to airbyte-config/init/src/main/resources/config/STANDARD_WORKSPACE/5ae6b09b-fdec-41af-aaf7-7d94cfc33ef6.json diff --git a/dataline-config/models/build.gradle b/airbyte-config/models/build.gradle similarity index 89% rename from dataline-config/models/build.gradle rename to airbyte-config/models/build.gradle index 8d50f39ec10..9deb096a483 100644 --- a/dataline-config/models/build.gradle +++ b/airbyte-config/models/build.gradle @@ -6,7 +6,7 @@ jsonSchema2Pojo { source = files("${sourceSets.main.output.resourcesDir}/json") targetDirectory = new File(project.buildDir, 'generated/src/gen/java/') - targetPackage = 'io.dataline.config' + targetPackage = 'io.airbyte.config' useLongIntegers = true removeOldOutput = true diff --git a/dataline-config/models/src/main/java/io/dataline/config/ConfigSchema.java b/airbyte-config/models/src/main/java/io/airbyte/config/ConfigSchema.java similarity index 95% rename from dataline-config/models/src/main/java/io/dataline/config/ConfigSchema.java rename to airbyte-config/models/src/main/java/io/airbyte/config/ConfigSchema.java index 22bd3b5c316..9e392f022a3 100644 --- a/dataline-config/models/src/main/java/io/dataline/config/ConfigSchema.java +++ b/airbyte-config/models/src/main/java/io/airbyte/config/ConfigSchema.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.config; +package io.airbyte.config; -import io.dataline.commons.io.IOs; -import io.dataline.commons.resources.MoreResources; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.resources.MoreResources; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/dataline-config/models/src/main/java/io/dataline/config/Configs.java b/airbyte-config/models/src/main/java/io/airbyte/config/Configs.java similarity index 96% rename from dataline-config/models/src/main/java/io/dataline/config/Configs.java rename to airbyte-config/models/src/main/java/io/airbyte/config/Configs.java index eeb40fcb9d8..94a2bd540d0 100644 --- a/dataline-config/models/src/main/java/io/dataline/config/Configs.java +++ b/airbyte-config/models/src/main/java/io/airbyte/config/Configs.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config; +package io.airbyte.config; import java.nio.file.Path; diff --git a/dataline-config/models/src/main/java/io/dataline/config/EnvConfigs.java b/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java similarity index 98% rename from dataline-config/models/src/main/java/io/dataline/config/EnvConfigs.java rename to airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java index ebc62538bc6..9fb90aa4f37 100644 --- a/dataline-config/models/src/main/java/io/dataline/config/EnvConfigs.java +++ b/airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config; +package io.airbyte.config; import com.google.common.base.Preconditions; import java.nio.file.Path; diff --git a/dataline-config/models/src/main/java/io/dataline/config/helpers/ScheduleHelpers.java b/airbyte-config/models/src/main/java/io/airbyte/config/helpers/ScheduleHelpers.java similarity index 94% rename from dataline-config/models/src/main/java/io/dataline/config/helpers/ScheduleHelpers.java rename to airbyte-config/models/src/main/java/io/airbyte/config/helpers/ScheduleHelpers.java index 77ad886d92e..3cbadb826f9 100644 --- a/dataline-config/models/src/main/java/io/dataline/config/helpers/ScheduleHelpers.java +++ b/airbyte-config/models/src/main/java/io/airbyte/config/helpers/ScheduleHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.config.helpers; +package io.airbyte.config.helpers; -import io.dataline.config.Schedule; +import io.airbyte.config.Schedule; import java.util.concurrent.TimeUnit; public class ScheduleHelpers { diff --git a/dataline-config/models/src/main/resources/json/DataType.json b/airbyte-config/models/src/main/resources/json/DataType.json similarity index 61% rename from dataline-config/models/src/main/resources/json/DataType.json rename to airbyte-config/models/src/main/resources/json/DataType.json index 505493a7cc2..7485f7a0f3f 100644 --- a/dataline-config/models/src/main/resources/json/DataType.json +++ b/airbyte-config/models/src/main/resources/json/DataType.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/DataType.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/DataType.json", "title": "DataType", "description": "standard data types.", "type": "string", diff --git a/dataline-config/models/src/main/resources/json/DestinationConnectionImplementation.json b/airbyte-config/models/src/main/resources/json/DestinationConnectionImplementation.json similarity index 88% rename from dataline-config/models/src/main/resources/json/DestinationConnectionImplementation.json rename to airbyte-config/models/src/main/resources/json/DestinationConnectionImplementation.json index fa01b1848db..295de9fa393 100644 --- a/dataline-config/models/src/main/resources/json/DestinationConnectionImplementation.json +++ b/airbyte-config/models/src/main/resources/json/DestinationConnectionImplementation.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/DestinationConnectionImplementation.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/DestinationConnectionImplementation.json", "title": "DestinationConnectionImplementation", "description": "information required for connection to a destination.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/DestinationConnectionSpecification.json b/airbyte-config/models/src/main/resources/json/DestinationConnectionSpecification.json similarity index 84% rename from dataline-config/models/src/main/resources/json/DestinationConnectionSpecification.json rename to airbyte-config/models/src/main/resources/json/DestinationConnectionSpecification.json index 35370792d70..de0bd92c07c 100644 --- a/dataline-config/models/src/main/resources/json/DestinationConnectionSpecification.json +++ b/airbyte-config/models/src/main/resources/json/DestinationConnectionSpecification.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/DestinationSpecification.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/DestinationSpecification.json", "title": "DestinationConnectionSpecification", "description": "specification for how to configure a connection to a destination", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/JobCheckConnectionConfig.json b/airbyte-config/models/src/main/resources/json/JobCheckConnectionConfig.json similarity index 80% rename from dataline-config/models/src/main/resources/json/JobCheckConnectionConfig.json rename to airbyte-config/models/src/main/resources/json/JobCheckConnectionConfig.json index 4f14c3844be..db25f2dc73e 100644 --- a/dataline-config/models/src/main/resources/json/JobCheckConnectionConfig.json +++ b/airbyte-config/models/src/main/resources/json/JobCheckConnectionConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobCheckConnectionConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobCheckConnectionConfig.json", "title": "JobCheckConnectionConfig", "description": "job check connection config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/JobConfig.json b/airbyte-config/models/src/main/resources/json/JobConfig.json similarity index 83% rename from dataline-config/models/src/main/resources/json/JobConfig.json rename to airbyte-config/models/src/main/resources/json/JobConfig.json index d358c5d844d..c6622fd74c7 100644 --- a/dataline-config/models/src/main/resources/json/JobConfig.json +++ b/airbyte-config/models/src/main/resources/json/JobConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobConfig.json", "title": "JobConfig", "description": "job config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json b/airbyte-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json similarity index 80% rename from dataline-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json rename to airbyte-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json index 4f14c3844be..db25f2dc73e 100644 --- a/dataline-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json +++ b/airbyte-config/models/src/main/resources/json/JobDiscoverSchemaConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobCheckConnectionConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobCheckConnectionConfig.json", "title": "JobCheckConnectionConfig", "description": "job check connection config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/JobOutput.json b/airbyte-config/models/src/main/resources/json/JobOutput.json similarity index 82% rename from dataline-config/models/src/main/resources/json/JobOutput.json rename to airbyte-config/models/src/main/resources/json/JobOutput.json index d855a7fb887..46f002b1fed 100644 --- a/dataline-config/models/src/main/resources/json/JobOutput.json +++ b/airbyte-config/models/src/main/resources/json/JobOutput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobOutput.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobOutput.json", "title": "JobOutput", "description": "job output", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/JobSyncConfig.json b/airbyte-config/models/src/main/resources/json/JobSyncConfig.json similarity index 88% rename from dataline-config/models/src/main/resources/json/JobSyncConfig.json rename to airbyte-config/models/src/main/resources/json/JobSyncConfig.json index f329f969224..883bc2cec30 100644 --- a/dataline-config/models/src/main/resources/json/JobSyncConfig.json +++ b/airbyte-config/models/src/main/resources/json/JobSyncConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobSyncConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobSyncConfig.json", "title": "JobSyncConfig", "description": "job sync config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/SourceConnectionImplementation.json b/airbyte-config/models/src/main/resources/json/SourceConnectionImplementation.json similarity index 88% rename from dataline-config/models/src/main/resources/json/SourceConnectionImplementation.json rename to airbyte-config/models/src/main/resources/json/SourceConnectionImplementation.json index ec28af8690c..c08c4e802aa 100644 --- a/dataline-config/models/src/main/resources/json/SourceConnectionImplementation.json +++ b/airbyte-config/models/src/main/resources/json/SourceConnectionImplementation.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/SourceConnectionConfiguration.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/SourceConnectionConfiguration.json", "title": "SourceConnectionConfiguration", "description": "information required for connection to a destination.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/SourceConnectionSpecification.json b/airbyte-config/models/src/main/resources/json/SourceConnectionSpecification.json similarity index 84% rename from dataline-config/models/src/main/resources/json/SourceConnectionSpecification.json rename to airbyte-config/models/src/main/resources/json/SourceConnectionSpecification.json index 8c65b3f9b07..d57178aabc1 100644 --- a/dataline-config/models/src/main/resources/json/SourceConnectionSpecification.json +++ b/airbyte-config/models/src/main/resources/json/SourceConnectionSpecification.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/SourceSpecification.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/SourceSpecification.json", "title": "SourceConnectionSpecification", "description": "specification for how to configure a connection to a source", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardCheckConnectionInput.json b/airbyte-config/models/src/main/resources/json/StandardCheckConnectionInput.json similarity index 78% rename from dataline-config/models/src/main/resources/json/StandardCheckConnectionInput.json rename to airbyte-config/models/src/main/resources/json/StandardCheckConnectionInput.json index ca3993bc02f..387f6da08c9 100644 --- a/dataline-config/models/src/main/resources/json/StandardCheckConnectionInput.json +++ b/airbyte-config/models/src/main/resources/json/StandardCheckConnectionInput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/PublicCheckConnection.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/PublicCheckConnection.json", "title": "PublicCheckConnection", "description": "information required for connection.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardCheckConnectionOutput.json b/airbyte-config/models/src/main/resources/json/StandardCheckConnectionOutput.json similarity index 74% rename from dataline-config/models/src/main/resources/json/StandardCheckConnectionOutput.json rename to airbyte-config/models/src/main/resources/json/StandardCheckConnectionOutput.json index fe6f2aa6737..d45a3aff112 100644 --- a/dataline-config/models/src/main/resources/json/StandardCheckConnectionOutput.json +++ b/airbyte-config/models/src/main/resources/json/StandardCheckConnectionOutput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardCheckConnectionOutput.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardCheckConnectionOutput.json", "title": "StandardCheckConnectionOutput", "description": "describes the result of a 'check connection' action.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardDataSchema.json b/airbyte-config/models/src/main/resources/json/StandardDataSchema.json similarity index 91% rename from dataline-config/models/src/main/resources/json/StandardDataSchema.json rename to airbyte-config/models/src/main/resources/json/StandardDataSchema.json index 55d478fa763..b613229eff5 100644 --- a/dataline-config/models/src/main/resources/json/StandardDataSchema.json +++ b/airbyte-config/models/src/main/resources/json/StandardDataSchema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardDataSchema.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardDataSchema.json", "title": "StandardDataSchema", "type": "object", "definitions": { diff --git a/dataline-config/models/src/main/resources/json/StandardDestination.json b/airbyte-config/models/src/main/resources/json/StandardDestination.json similarity index 75% rename from dataline-config/models/src/main/resources/json/StandardDestination.json rename to airbyte-config/models/src/main/resources/json/StandardDestination.json index 81e5cb19a49..e4993c292b6 100644 --- a/dataline-config/models/src/main/resources/json/StandardDestination.json +++ b/airbyte-config/models/src/main/resources/json/StandardDestination.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/Destination.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/Destination.json", "title": "Source", "description": "describes a destination", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json b/airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json similarity index 78% rename from dataline-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json rename to airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json index 559ed17dd2c..cc027a6f7d5 100644 --- a/dataline-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json +++ b/airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaInput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardDiscoverSchemaOutput.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardDiscoverSchemaOutput.json", "title": "StandardDiscoverSchemaOutput", "description": "information required for connection.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json b/airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json similarity index 75% rename from dataline-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json rename to airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json index bfee64ef994..49ac73f4bb7 100644 --- a/dataline-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json +++ b/airbyte-config/models/src/main/resources/json/StandardDiscoverSchemaOutput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardDiscoverSchemaOutput.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardDiscoverSchemaOutput.json", "title": "StandardDiscoverSchemaOutput", "description": "describes the standard output for any discovery run.", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSource.json b/airbyte-config/models/src/main/resources/json/StandardSource.json similarity index 75% rename from dataline-config/models/src/main/resources/json/StandardSource.json rename to airbyte-config/models/src/main/resources/json/StandardSource.json index 07631334ce3..1032039f979 100644 --- a/dataline-config/models/src/main/resources/json/StandardSource.json +++ b/airbyte-config/models/src/main/resources/json/StandardSource.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/Source.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/Source.json", "title": "Source", "description": "describes a source", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSync.json b/airbyte-config/models/src/main/resources/json/StandardSync.json similarity index 88% rename from dataline-config/models/src/main/resources/json/StandardSync.json rename to airbyte-config/models/src/main/resources/json/StandardSync.json index ca73d43e31a..822bcdc011a 100644 --- a/dataline-config/models/src/main/resources/json/StandardSync.json +++ b/airbyte-config/models/src/main/resources/json/StandardSync.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardSync.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardSync.json", "title": "StandardSync", "description": "configuration required for sync for ALL taps", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSyncInput.json b/airbyte-config/models/src/main/resources/json/StandardSyncInput.json similarity index 87% rename from dataline-config/models/src/main/resources/json/StandardSyncInput.json rename to airbyte-config/models/src/main/resources/json/StandardSyncInput.json index b9efe42a7ee..c6e75bb03eb 100644 --- a/dataline-config/models/src/main/resources/json/StandardSyncInput.json +++ b/airbyte-config/models/src/main/resources/json/StandardSyncInput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/JobSyncConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/JobSyncConfig.json", "title": "JobSyncConfig", "description": "job sync config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSyncOutput.json b/airbyte-config/models/src/main/resources/json/StandardSyncOutput.json similarity index 74% rename from dataline-config/models/src/main/resources/json/StandardSyncOutput.json rename to airbyte-config/models/src/main/resources/json/StandardSyncOutput.json index 92e762079f2..e3f04a51d69 100644 --- a/dataline-config/models/src/main/resources/json/StandardSyncOutput.json +++ b/airbyte-config/models/src/main/resources/json/StandardSyncOutput.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardSyncOutput.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardSyncOutput.json", "title": "StandardSyncOutput", "description": "job sync config", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSyncSchedule.json b/airbyte-config/models/src/main/resources/json/StandardSyncSchedule.json similarity index 86% rename from dataline-config/models/src/main/resources/json/StandardSyncSchedule.json rename to airbyte-config/models/src/main/resources/json/StandardSyncSchedule.json index 3f92096770c..c2860f4c424 100644 --- a/dataline-config/models/src/main/resources/json/StandardSyncSchedule.json +++ b/airbyte-config/models/src/main/resources/json/StandardSyncSchedule.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardSyncSchedule.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardSyncSchedule.json", "description": "ideally this should be a union but java codegen does not handle the union type properly.", "title": "StandardScheduleConfiguration", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardSyncSummary.json b/airbyte-config/models/src/main/resources/json/StandardSyncSummary.json similarity index 82% rename from dataline-config/models/src/main/resources/json/StandardSyncSummary.json rename to airbyte-config/models/src/main/resources/json/StandardSyncSummary.json index 0fddcf728ad..0d09c748ba9 100644 --- a/dataline-config/models/src/main/resources/json/StandardSyncSummary.json +++ b/airbyte-config/models/src/main/resources/json/StandardSyncSummary.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardSyncSummary.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardSyncSummary.json", "title": "StandardSyncSummary", "description": "standard information output by ALL taps for a sync step (our version of state.json)", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardTapConfig.json b/airbyte-config/models/src/main/resources/json/StandardTapConfig.json similarity index 79% rename from dataline-config/models/src/main/resources/json/StandardTapConfig.json rename to airbyte-config/models/src/main/resources/json/StandardTapConfig.json index ec2658d1e79..18d4fe59210 100644 --- a/dataline-config/models/src/main/resources/json/StandardTapConfig.json +++ b/airbyte-config/models/src/main/resources/json/StandardTapConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardTapConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardTapConfig.json", "title": "StandardTapConfig", "description": "StandardTapConfig", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardTargetConfig.json b/airbyte-config/models/src/main/resources/json/StandardTargetConfig.json similarity index 79% rename from dataline-config/models/src/main/resources/json/StandardTargetConfig.json rename to airbyte-config/models/src/main/resources/json/StandardTargetConfig.json index 837c6fd86c8..bf70f37e0ac 100644 --- a/dataline-config/models/src/main/resources/json/StandardTargetConfig.json +++ b/airbyte-config/models/src/main/resources/json/StandardTargetConfig.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardTargetConfig.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardTargetConfig.json", "title": "StandardTargetConfig", "description": "StandardTargetConfig", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/StandardWorkspace.json b/airbyte-config/models/src/main/resources/json/StandardWorkspace.json similarity index 85% rename from dataline-config/models/src/main/resources/json/StandardWorkspace.json rename to airbyte-config/models/src/main/resources/json/StandardWorkspace.json index 991220eaf77..0f3189ade2e 100644 --- a/dataline-config/models/src/main/resources/json/StandardWorkspace.json +++ b/airbyte-config/models/src/main/resources/json/StandardWorkspace.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/StandardWorkspaceConfiguration.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/StandardWorkspaceConfiguration.json", "title": "StandardWorkspace", "description": "workspace configuration", "type": "object", diff --git a/dataline-config/models/src/main/resources/json/State.json b/airbyte-config/models/src/main/resources/json/State.json similarity index 82% rename from dataline-config/models/src/main/resources/json/State.json rename to airbyte-config/models/src/main/resources/json/State.json index 16bcf67d449..7897c4971ae 100644 --- a/dataline-config/models/src/main/resources/json/State.json +++ b/airbyte-config/models/src/main/resources/json/State.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/State.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/State.json", "title": "State", "description": "information output by the connection.", "type": "object", diff --git a/dataline-config/models/src/test/java/io/dataline/config/ConfigSchemaTest.java b/airbyte-config/models/src/test/java/io/airbyte/config/ConfigSchemaTest.java similarity index 96% rename from dataline-config/models/src/test/java/io/dataline/config/ConfigSchemaTest.java rename to airbyte-config/models/src/test/java/io/airbyte/config/ConfigSchemaTest.java index f92d96c7bbf..0fdf34fb907 100644 --- a/dataline-config/models/src/test/java/io/dataline/config/ConfigSchemaTest.java +++ b/airbyte-config/models/src/test/java/io/airbyte/config/ConfigSchemaTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config; +package io.airbyte.config; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/dataline-config/models/src/test/java/io/dataline/config/EnvConfigsTest.java b/airbyte-config/models/src/test/java/io/airbyte/config/EnvConfigsTest.java similarity index 99% rename from dataline-config/models/src/test/java/io/dataline/config/EnvConfigsTest.java rename to airbyte-config/models/src/test/java/io/airbyte/config/EnvConfigsTest.java index 1693fca4871..fe36028e2fe 100644 --- a/dataline-config/models/src/test/java/io/dataline/config/EnvConfigsTest.java +++ b/airbyte-config/models/src/test/java/io/airbyte/config/EnvConfigsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config; +package io.airbyte.config; import static org.mockito.Mockito.when; diff --git a/dataline-config/models/src/test/java/io/dataline/config/helpers/ScheduleHelpersTest.java b/airbyte-config/models/src/test/java/io/airbyte/config/helpers/ScheduleHelpersTest.java similarity index 95% rename from dataline-config/models/src/test/java/io/dataline/config/helpers/ScheduleHelpersTest.java rename to airbyte-config/models/src/test/java/io/airbyte/config/helpers/ScheduleHelpersTest.java index 7737ad694fb..40a7674a5cc 100644 --- a/dataline-config/models/src/test/java/io/dataline/config/helpers/ScheduleHelpersTest.java +++ b/airbyte-config/models/src/test/java/io/airbyte/config/helpers/ScheduleHelpersTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.config.helpers; +package io.airbyte.config.helpers; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.dataline.config.Schedule; +import io.airbyte.config.Schedule; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/dataline-config/persistence/build.gradle b/airbyte-config/persistence/build.gradle similarity index 63% rename from dataline-config/persistence/build.gradle rename to airbyte-config/persistence/build.gradle index ac2afe3329c..0130bf90b08 100644 --- a/dataline-config/persistence/build.gradle +++ b/airbyte-config/persistence/build.gradle @@ -1,5 +1,5 @@ dependencies { implementation group: 'commons-io', name: 'commons-io', version: '2.7' - implementation project(':dataline-config:models') + implementation project(':airbyte-config:models') } diff --git a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigNotFoundException.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigNotFoundException.java similarity index 93% rename from dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigNotFoundException.java rename to airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigNotFoundException.java index d9ae651861b..a77e5176dab 100644 --- a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigNotFoundException.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigNotFoundException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; -import io.dataline.config.ConfigSchema; +import io.airbyte.config.ConfigSchema; public class ConfigNotFoundException extends Exception { diff --git a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java similarity index 91% rename from dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java rename to airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java index 7f6d1e4b88f..098a9f9d2a3 100644 --- a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigPersistence.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.ConfigSchema; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.ConfigSchema; import java.io.IOException; import java.util.List; diff --git a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigRepository.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java similarity index 92% rename from dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigRepository.java rename to airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java index 1c5d74d065c..9e1cde0a5fb 100644 --- a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/ConfigRepository.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.ConfigSchema; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.SourceConnectionSpecification; -import io.dataline.config.StandardDestination; -import io.dataline.config.StandardSource; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.StandardWorkspace; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.ConfigSchema; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.SourceConnectionSpecification; +import io.airbyte.config.StandardDestination; +import io.airbyte.config.StandardSource; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.StandardWorkspace; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/DefaultConfigPersistence.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java similarity index 95% rename from dataline-config/persistence/src/main/java/io/dataline/config/persistence/DefaultConfigPersistence.java rename to airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java index d1dc40ff92b..90c693c38e8 100644 --- a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/DefaultConfigPersistence.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,14 +22,14 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.dataline.commons.json.JsonSchemaValidator; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.commons.json.Jsons; -import io.dataline.config.ConfigSchema; +import io.airbyte.commons.json.JsonSchemaValidator; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.ConfigSchema; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/PersistenceConstants.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/PersistenceConstants.java similarity index 95% rename from dataline-config/persistence/src/main/java/io/dataline/config/persistence/PersistenceConstants.java rename to airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/PersistenceConstants.java index f5a9f479df6..0f520348406 100644 --- a/dataline-config/persistence/src/main/java/io/dataline/config/persistence/PersistenceConstants.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/PersistenceConstants.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; import java.util.UUID; diff --git a/dataline-config/persistence/src/test/java/io/dataline/config/persistence/DefaultConfigPersistenceTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java similarity index 92% rename from dataline-config/persistence/src/test/java/io/dataline/config/persistence/DefaultConfigPersistenceTest.java rename to airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java index 7417b958e2f..6db553188a3 100644 --- a/dataline-config/persistence/src/test/java/io/dataline/config/persistence/DefaultConfigPersistenceTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.config.persistence; +package io.airbyte.config.persistence; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -30,12 +30,12 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import com.google.common.collect.Sets; -import io.dataline.commons.json.JsonSchemaValidator; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.ConfigSchema; -import io.dataline.config.Schema; -import io.dataline.config.StandardSource; -import io.dataline.config.StandardSync; +import io.airbyte.commons.json.JsonSchemaValidator; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.ConfigSchema; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardSource; +import io.airbyte.config.StandardSync; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-db/.dockerignore b/airbyte-db/.dockerignore similarity index 100% rename from dataline-db/.dockerignore rename to airbyte-db/.dockerignore diff --git a/dataline-db/Dockerfile b/airbyte-db/Dockerfile similarity index 100% rename from dataline-db/Dockerfile rename to airbyte-db/Dockerfile diff --git a/dataline-db/build.gradle b/airbyte-db/build.gradle similarity index 100% rename from dataline-db/build.gradle rename to airbyte-db/build.gradle diff --git a/dataline-db/src/main/java/io/dataline/db/ContextExecutionFunction.java b/airbyte-db/src/main/java/io/airbyte/db/ContextExecutionFunction.java similarity index 95% rename from dataline-db/src/main/java/io/dataline/db/ContextExecutionFunction.java rename to airbyte-db/src/main/java/io/airbyte/db/ContextExecutionFunction.java index 767e91072d7..3d8a0ff77e7 100644 --- a/dataline-db/src/main/java/io/dataline/db/ContextExecutionFunction.java +++ b/airbyte-db/src/main/java/io/airbyte/db/ContextExecutionFunction.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.db; +package io.airbyte.db; import java.sql.SQLException; import org.jooq.DSLContext; diff --git a/dataline-db/src/main/java/io/dataline/db/ContextQueryFunction.java b/airbyte-db/src/main/java/io/airbyte/db/ContextQueryFunction.java similarity index 95% rename from dataline-db/src/main/java/io/dataline/db/ContextQueryFunction.java rename to airbyte-db/src/main/java/io/airbyte/db/ContextQueryFunction.java index a4624101e55..70a493ba30d 100644 --- a/dataline-db/src/main/java/io/dataline/db/ContextQueryFunction.java +++ b/airbyte-db/src/main/java/io/airbyte/db/ContextQueryFunction.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.db; +package io.airbyte.db; import java.sql.SQLException; import org.jooq.DSLContext; diff --git a/dataline-db/src/main/java/io/dataline/db/DatabaseHelper.java b/airbyte-db/src/main/java/io/airbyte/db/DatabaseHelper.java similarity index 97% rename from dataline-db/src/main/java/io/dataline/db/DatabaseHelper.java rename to airbyte-db/src/main/java/io/airbyte/db/DatabaseHelper.java index 0c3001b6efe..8f8dc54cfee 100644 --- a/dataline-db/src/main/java/io/dataline/db/DatabaseHelper.java +++ b/airbyte-db/src/main/java/io/airbyte/db/DatabaseHelper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.db; +package io.airbyte.db; import java.sql.Connection; import java.sql.SQLException; diff --git a/dataline-db/src/main/java/io/dataline/db/ServerUuid.java b/airbyte-db/src/main/java/io/airbyte/db/ServerUuid.java similarity index 90% rename from dataline-db/src/main/java/io/dataline/db/ServerUuid.java rename to airbyte-db/src/main/java/io/airbyte/db/ServerUuid.java index 10fcd704d2a..064a266703d 100644 --- a/dataline-db/src/main/java/io/dataline/db/ServerUuid.java +++ b/airbyte-db/src/main/java/io/airbyte/db/ServerUuid.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.db; +package io.airbyte.db; import static org.jooq.impl.DSL.field; @@ -33,7 +33,7 @@ import org.jooq.Record; import org.jooq.Result; /* - * The server UUID identifies a specific database installation of Dataline for analytics purposes. + * The server UUID identifies a specific database installation of Airbyte for analytics purposes. */ public class ServerUuid { @@ -42,7 +42,7 @@ public class ServerUuid { connectionPool, ctx -> { Result result = - ctx.select().from("dataline_metadata").where(field("key").eq("server-uuid")).fetch(); + ctx.select().from("airbyte_metadata").where(field("key").eq("server-uuid")).fetch(); Optional first = result.stream().findFirst(); if (first.isEmpty()) { diff --git a/dataline-db/src/main/resources/schema.sql b/airbyte-db/src/main/resources/schema.sql similarity index 87% rename from dataline-db/src/main/resources/schema.sql rename to airbyte-db/src/main/resources/schema.sql index 4eee0a22f11..c3b06975a4c 100644 --- a/dataline-db/src/main/resources/schema.sql +++ b/airbyte-db/src/main/resources/schema.sql @@ -1,8 +1,8 @@ -- database CREATE - DATABASE dataline; + DATABASE airbyte; -\connect dataline; +\connect airbyte; -- extensions CREATE @@ -21,7 +21,7 @@ -- tables CREATE TABLE - DATALINE_METADATA( + AIRBYTE_METADATA( KEY VARCHAR(255) PRIMARY KEY, value VARCHAR(255) ); @@ -44,7 +44,7 @@ CREATE -- entries INSERT INTO - DATALINE_METADATA + AIRBYTE_METADATA VALUES( 'server-uuid', uuid_generate_v4() @@ -52,4 +52,4 @@ CREATE -- grants GRANT ALL ON -DATABASE dataline TO docker; +DATABASE airbyte TO docker; diff --git a/dataline-db/src/test/java/io/dataline/db/TestServerUuid.java b/airbyte-db/src/test/java/io/airbyte/db/TestServerUuid.java similarity index 93% rename from dataline-db/src/test/java/io/dataline/db/TestServerUuid.java rename to airbyte-db/src/test/java/io/airbyte/db/TestServerUuid.java index 20710c1d210..75a607c0d2f 100644 --- a/dataline-db/src/test/java/io/dataline/db/TestServerUuid.java +++ b/airbyte-db/src/test/java/io/airbyte/db/TestServerUuid.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.db; +package io.airbyte.db; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,14 +45,14 @@ public class TestServerUuid { public static void dbSetup() throws IOException, InterruptedException { container = new PostgreSQLContainer("postgres:13-alpine") - .withDatabaseName("dataline") + .withDatabaseName("airbyte") .withUsername("docker") .withPassword("docker"); container.start(); container.copyFileToContainer(MountableFile.forClasspathResource("schema.sql"), "/etc/init.sql"); // execInContainer uses Docker's EXEC so it needs to be split up like this - container.execInContainer("psql", "-d", "dataline", "-U", "docker", "-a", "-f", "/etc/init.sql"); + container.execInContainer("psql", "-d", "airbyte", "-U", "docker", "-a", "-f", "/etc/init.sql"); connectionPool = DatabaseHelper.getConnectionPool(container.getUsername(), container.getPassword(), container.getJdbcUrl()); } diff --git a/dataline-integrations/README.md b/airbyte-integrations/README.md similarity index 66% rename from dataline-integrations/README.md rename to airbyte-integrations/README.md index 85b051bfefa..cb58aec841c 100644 --- a/dataline-integrations/README.md +++ b/airbyte-integrations/README.md @@ -4,9 +4,9 @@ ``` ./tools/integrations/manage.sh build # e.g. - # ./tools/integrations/manage.sh build dataline-integrations/singer/postgres/source + # ./tools/integrations/manage.sh build airbyte-integrations/singer/postgres/source ``` -1. Update the version in the dockerfile of the integration `LABEL io.dataline.version=0.1.0` -1. (If you want Dataline to use this new integration) Update the version of the integration in `Integrations.java` +1. Update the version in the dockerfile of the integration `LABEL io.airbyte.version=0.1.0` +1. (If you want Airbyte to use this new integration) Update the version of the integration in `Integrations.java` 1. Publish it to docker hub. `./tools/integrations/manage.sh build ` 1. Merge you changes. (Make sure you've done the previous step first, otherwise the application will look for the wrong integration!!!) diff --git a/dataline-integrations/build.gradle b/airbyte-integrations/build.gradle similarity index 100% rename from dataline-integrations/build.gradle rename to airbyte-integrations/build.gradle diff --git a/dataline-integrations/singer/bigquery/destination/.dockerignore b/airbyte-integrations/singer/bigquery/destination/.dockerignore similarity index 100% rename from dataline-integrations/singer/bigquery/destination/.dockerignore rename to airbyte-integrations/singer/bigquery/destination/.dockerignore diff --git a/dataline-integrations/singer/bigquery/destination/.gitignore b/airbyte-integrations/singer/bigquery/destination/.gitignore similarity index 100% rename from dataline-integrations/singer/bigquery/destination/.gitignore rename to airbyte-integrations/singer/bigquery/destination/.gitignore diff --git a/dataline-integrations/singer/bigquery/destination/Dockerfile b/airbyte-integrations/singer/bigquery/destination/Dockerfile similarity index 93% rename from dataline-integrations/singer/bigquery/destination/Dockerfile rename to airbyte-integrations/singer/bigquery/destination/Dockerfile index cd37995be91..447a6a55330 100644 --- a/dataline-integrations/singer/bigquery/destination/Dockerfile +++ b/airbyte-integrations/singer/bigquery/destination/Dockerfile @@ -17,4 +17,4 @@ COPY bigquery-destination.sh /singer/bigquery-destination.sh ENTRYPOINT ["sh", "/singer/bigquery-destination.sh"] -LABEL io.dataline.version=0.1.1 +LABEL io.airbyte.version=0.1.1 diff --git a/dataline-integrations/singer/bigquery/destination/README.md b/airbyte-integrations/singer/bigquery/destination/README.md similarity index 97% rename from dataline-integrations/singer/bigquery/destination/README.md rename to airbyte-integrations/singer/bigquery/destination/README.md index 84c344cf99e..7464b607ca9 100644 --- a/dataline-integrations/singer/bigquery/destination/README.md +++ b/airbyte-integrations/singer/bigquery/destination/README.md @@ -15,7 +15,7 @@ As a community contributor, you will need access to a GCP project and BigQuery t 1. Download this key as a JSON file 1. Move and rename this file to `config/credentials.json` -## Dataline Employee +## Airbyte Employee 1. Access the `BigQuery Integration Test User` secret on Rippling under the `Engineering` folder 1. Create a file with the contents at `config/credentials.json` diff --git a/dataline-integrations/singer/bigquery/destination/bigquery-destination.sh b/airbyte-integrations/singer/bigquery/destination/bigquery-destination.sh similarity index 100% rename from dataline-integrations/singer/bigquery/destination/bigquery-destination.sh rename to airbyte-integrations/singer/bigquery/destination/bigquery-destination.sh diff --git a/dataline-integrations/singer/bigquery/destination/build.gradle b/airbyte-integrations/singer/bigquery/destination/build.gradle similarity index 92% rename from dataline-integrations/singer/bigquery/destination/build.gradle rename to airbyte-integrations/singer/bigquery/destination/build.gradle index b1db41530bd..74a97e75802 100644 --- a/dataline-integrations/singer/bigquery/destination/build.gradle +++ b/airbyte-integrations/singer/bigquery/destination/build.gradle @@ -5,7 +5,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-bigquery-destination:dev' +def image = 'airbyte/integration-singer-bigquery-destination:dev' sourceSets { integrationTest { @@ -29,7 +29,7 @@ dependencies { integrationTestImplementation 'com.google.cloud:google-cloud-bigquery:1.117.0' integrationTestImplementation 'org.apache.commons:commons-text:1.9' - integrationTestImplementation project(':dataline-workers') + integrationTestImplementation project(':airbyte-workers') } diff --git a/dataline-integrations/singer/bigquery/destination/requirements.txt b/airbyte-integrations/singer/bigquery/destination/requirements.txt similarity index 100% rename from dataline-integrations/singer/bigquery/destination/requirements.txt rename to airbyte-integrations/singer/bigquery/destination/requirements.txt diff --git a/dataline-integrations/singer/bigquery/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestBigQueryDestination.java b/airbyte-integrations/singer/bigquery/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestBigQueryDestination.java similarity index 92% rename from dataline-integrations/singer/bigquery/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestBigQueryDestination.java rename to airbyte-integrations/singer/bigquery/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestBigQueryDestination.java index 5f6b139579c..eda6e799749 100644 --- a/dataline-integrations/singer/bigquery/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestBigQueryDestination.java +++ b/airbyte-integrations/singer/bigquery/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestBigQueryDestination.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.integration_tests.destinations; +package io.airbyte.integration_tests.destinations; import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertLinesMatch; @@ -35,10 +35,10 @@ import com.google.cloud.bigquery.DatasetInfo; import com.google.cloud.bigquery.FieldValue; import com.google.cloud.bigquery.QueryJobConfiguration; import com.google.cloud.bigquery.TableResult; -import io.dataline.commons.json.Jsons; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.json.Jsons; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -64,8 +64,8 @@ class TestBigQueryDestination { private static final BigQuery BQ = BigQueryOptions.getDefaultInstance().getService(); private static final Logger LOGGER = LoggerFactory.getLogger(TestBigQueryDestination.class); - private static final Path TESTS_PATH = Path.of("/tmp/dataline_integration_tests"); - private static final String IMAGE_NAME = "dataline/integration-singer-bigquery-destination:dev"; + private static final Path TESTS_PATH = Path.of("/tmp/airbyte_integration_tests"); + private static final String IMAGE_NAME = "airbyte/integration-singer-bigquery-destination:dev"; protected Path jobRoot; protected Path workspaceRoot; @@ -87,7 +87,7 @@ class TestBigQueryDestination { pbf = new DockerProcessBuilderFactory(workspaceRoot, workspaceRoot.toString(), "", "host"); - datasetName = "dataline_tests_" + RandomStringUtils.randomAlphanumeric(8); + datasetName = "airbyte_tests_" + RandomStringUtils.randomAlphanumeric(8); DatasetInfo datasetInfo = DatasetInfo.newBuilder(datasetName).build(); dataset = BQ.create(datasetInfo); LOGGER.info("BQ Dataset " + datasetName + " created..."); diff --git a/dataline-integrations/singer/bigquery/destination/src/test-integration/resources/singer-tap-output.txt b/airbyte-integrations/singer/bigquery/destination/src/test-integration/resources/singer-tap-output.txt similarity index 100% rename from dataline-integrations/singer/bigquery/destination/src/test-integration/resources/singer-tap-output.txt rename to airbyte-integrations/singer/bigquery/destination/src/test-integration/resources/singer-tap-output.txt diff --git a/dataline-integrations/singer/exchangerateapi_io/source/.dockerignore b/airbyte-integrations/singer/exchangerateapi_io/source/.dockerignore similarity index 100% rename from dataline-integrations/singer/exchangerateapi_io/source/.dockerignore rename to airbyte-integrations/singer/exchangerateapi_io/source/.dockerignore diff --git a/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile b/airbyte-integrations/singer/exchangerateapi_io/source/Dockerfile similarity index 91% rename from dataline-integrations/singer/exchangerateapi_io/source/Dockerfile rename to airbyte-integrations/singer/exchangerateapi_io/source/Dockerfile index 35d9fb8c26c..e6d6ce85c37 100644 --- a/dataline-integrations/singer/exchangerateapi_io/source/Dockerfile +++ b/airbyte-integrations/singer/exchangerateapi_io/source/Dockerfile @@ -17,4 +17,4 @@ COPY entrypoint.sh . ENTRYPOINT ["/singer/entrypoint.sh"] -LABEL io.dataline.version=0.1.2 +LABEL io.airbyte.version=0.1.2 diff --git a/dataline-integrations/singer/exchangerateapi_io/source/README.md b/airbyte-integrations/singer/exchangerateapi_io/source/README.md similarity index 100% rename from dataline-integrations/singer/exchangerateapi_io/source/README.md rename to airbyte-integrations/singer/exchangerateapi_io/source/README.md diff --git a/dataline-integrations/singer/exchangerateapi_io/source/build.gradle b/airbyte-integrations/singer/exchangerateapi_io/source/build.gradle similarity index 93% rename from dataline-integrations/singer/exchangerateapi_io/source/build.gradle rename to airbyte-integrations/singer/exchangerateapi_io/source/build.gradle index 92a64be0150..45393d79c4b 100644 --- a/dataline-integrations/singer/exchangerateapi_io/source/build.gradle +++ b/airbyte-integrations/singer/exchangerateapi_io/source/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-exchangerateapi_io-source:dev' +def image = 'airbyte/integration-singer-exchangerateapi_io-source:dev' sourceSets { integrationTest { diff --git a/dataline-integrations/singer/exchangerateapi_io/source/entrypoint.sh b/airbyte-integrations/singer/exchangerateapi_io/source/entrypoint.sh similarity index 100% rename from dataline-integrations/singer/exchangerateapi_io/source/entrypoint.sh rename to airbyte-integrations/singer/exchangerateapi_io/source/entrypoint.sh diff --git a/dataline-integrations/singer/exchangerateapi_io/source/requirements.txt b/airbyte-integrations/singer/exchangerateapi_io/source/requirements.txt similarity index 100% rename from dataline-integrations/singer/exchangerateapi_io/source/requirements.txt rename to airbyte-integrations/singer/exchangerateapi_io/source/requirements.txt diff --git a/dataline-integrations/singer/local_csv/destination/.dockerignore b/airbyte-integrations/singer/local_csv/destination/.dockerignore similarity index 100% rename from dataline-integrations/singer/local_csv/destination/.dockerignore rename to airbyte-integrations/singer/local_csv/destination/.dockerignore diff --git a/dataline-integrations/singer/local_csv/destination/Dockerfile b/airbyte-integrations/singer/local_csv/destination/Dockerfile similarity index 91% rename from dataline-integrations/singer/local_csv/destination/Dockerfile rename to airbyte-integrations/singer/local_csv/destination/Dockerfile index 9fbc760145d..3d99926e9d4 100644 --- a/dataline-integrations/singer/local_csv/destination/Dockerfile +++ b/airbyte-integrations/singer/local_csv/destination/Dockerfile @@ -17,4 +17,4 @@ COPY entrypoint.sh . ENTRYPOINT ["/singer/entrypoint.sh"] -LABEL io.dataline.version=0.1.0 +LABEL io.airbyte.version=0.1.0 diff --git a/dataline-integrations/singer/local_csv/destination/build.gradle b/airbyte-integrations/singer/local_csv/destination/build.gradle similarity index 84% rename from dataline-integrations/singer/local_csv/destination/build.gradle rename to airbyte-integrations/singer/local_csv/destination/build.gradle index f9f9c1d01e9..f3b2741d106 100644 --- a/dataline-integrations/singer/local_csv/destination/build.gradle +++ b/airbyte-integrations/singer/local_csv/destination/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-csv-destination:dev' +def image = 'airbyte/integration-singer-csv-destination:dev' sourceSets { integrationTest { @@ -24,8 +24,8 @@ configurations { } dependencies { - integrationTestImplementation project(':dataline-config:models') - integrationTestImplementation project(':dataline-workers') + integrationTestImplementation project(':airbyte-config:models') + integrationTestImplementation project(':airbyte-workers') } task imageName { diff --git a/dataline-integrations/singer/local_csv/destination/entrypoint.sh b/airbyte-integrations/singer/local_csv/destination/entrypoint.sh similarity index 100% rename from dataline-integrations/singer/local_csv/destination/entrypoint.sh rename to airbyte-integrations/singer/local_csv/destination/entrypoint.sh diff --git a/dataline-integrations/singer/local_csv/destination/requirements.txt b/airbyte-integrations/singer/local_csv/destination/requirements.txt similarity index 100% rename from dataline-integrations/singer/local_csv/destination/requirements.txt rename to airbyte-integrations/singer/local_csv/destination/requirements.txt diff --git a/dataline-integrations/singer/local_csv/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestLocalCsvDestination.java b/airbyte-integrations/singer/local_csv/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestLocalCsvDestination.java similarity index 88% rename from dataline-integrations/singer/local_csv/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestLocalCsvDestination.java rename to airbyte-integrations/singer/local_csv/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestLocalCsvDestination.java index 6c371d58733..91fb1b4f724 100644 --- a/dataline-integrations/singer/local_csv/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestLocalCsvDestination.java +++ b/airbyte-integrations/singer/local_csv/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestLocalCsvDestination.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,24 +22,24 @@ * SOFTWARE. */ -package io.dataline.integration_tests.destinations; +package io.airbyte.integration_tests.destinations; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertLinesMatch; import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; -import io.dataline.workers.protocols.singer.SingerCheckConnectionWorker; -import io.dataline.workers.protocols.singer.SingerDiscoverSchemaWorker; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; +import io.airbyte.workers.protocols.singer.SingerCheckConnectionWorker; +import io.airbyte.workers.protocols.singer.SingerDiscoverSchemaWorker; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -60,8 +60,8 @@ class TestLocalCsvDestination { private static final Logger LOGGER = LoggerFactory.getLogger(TestLocalCsvDestination.class); - private static final String IMAGE_NAME = "dataline/integration-singer-csv-destination:dev"; - private static final Path TESTS_PATH = Path.of("/tmp/dataline_integration_tests"); + private static final String IMAGE_NAME = "airbyte/integration-singer-csv-destination:dev"; + private static final Path TESTS_PATH = Path.of("/tmp/airbyte_integration_tests"); private static final List EXPECTED_OUTPUT = Arrays.asList(("date,NZD,HKD\n" + "2020-08-29T00:00:00Z,0.12,2.13\n" + @@ -80,8 +80,8 @@ class TestLocalCsvDestination { @BeforeEach public void setUp() throws IOException { Files.createDirectories(TESTS_PATH); - workspaceRoot = Files.createTempDirectory(TESTS_PATH, "dataline-integration"); - localRoot = Files.createTempDirectory(TESTS_PATH, "dataline-local"); + workspaceRoot = Files.createTempDirectory(TESTS_PATH, "airbyte-integration"); + localRoot = Files.createTempDirectory(TESTS_PATH, "airbyte-local"); jobRoot = Path.of(workspaceRoot.toString(), "job"); Files.createDirectories(jobRoot); diff --git a/dataline-integrations/singer/local_csv/destination/src/test-integration/resources/singer-tap-output.txt b/airbyte-integrations/singer/local_csv/destination/src/test-integration/resources/singer-tap-output.txt similarity index 100% rename from dataline-integrations/singer/local_csv/destination/src/test-integration/resources/singer-tap-output.txt rename to airbyte-integrations/singer/local_csv/destination/src/test-integration/resources/singer-tap-output.txt diff --git a/dataline-integrations/singer/postgres/destination/.dockerignore b/airbyte-integrations/singer/postgres/destination/.dockerignore similarity index 100% rename from dataline-integrations/singer/postgres/destination/.dockerignore rename to airbyte-integrations/singer/postgres/destination/.dockerignore diff --git a/dataline-integrations/singer/postgres/destination/Dockerfile b/airbyte-integrations/singer/postgres/destination/Dockerfile similarity index 95% rename from dataline-integrations/singer/postgres/destination/Dockerfile rename to airbyte-integrations/singer/postgres/destination/Dockerfile index 9067d8d3dbe..aa88c88441a 100644 --- a/dataline-integrations/singer/postgres/destination/Dockerfile +++ b/airbyte-integrations/singer/postgres/destination/Dockerfile @@ -21,4 +21,4 @@ RUN apt-get update && \ ENTRYPOINT ["/run.sh"] -LABEL io.dataline.version=0.1.1 +LABEL io.airbyte.version=0.1.1 diff --git a/dataline-integrations/singer/postgres/destination/build.gradle b/airbyte-integrations/singer/postgres/destination/build.gradle similarity index 84% rename from dataline-integrations/singer/postgres/destination/build.gradle rename to airbyte-integrations/singer/postgres/destination/build.gradle index de17e9f1b41..5cb8cd9b74b 100644 --- a/dataline-integrations/singer/postgres/destination/build.gradle +++ b/airbyte-integrations/singer/postgres/destination/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-postgres-destination:dev' +def image = 'airbyte/integration-singer-postgres-destination:dev' sourceSets { integrationTest { @@ -30,9 +30,9 @@ dependencies { integrationTestImplementation "org.testcontainers:postgresql:1.14.3" integrationTestImplementation "org.postgresql:postgresql:42.2.16" - integrationTestImplementation project(':dataline-config:models') - integrationTestImplementation project(':dataline-workers') - integrationTestImplementation project(':dataline-db') + integrationTestImplementation project(':airbyte-config:models') + integrationTestImplementation project(':airbyte-workers') + integrationTestImplementation project(':airbyte-db') } task imageName { diff --git a/dataline-integrations/singer/postgres/destination/check_connection.py b/airbyte-integrations/singer/postgres/destination/check_connection.py similarity index 100% rename from dataline-integrations/singer/postgres/destination/check_connection.py rename to airbyte-integrations/singer/postgres/destination/check_connection.py diff --git a/dataline-integrations/singer/postgres/destination/requirements.txt b/airbyte-integrations/singer/postgres/destination/requirements.txt similarity index 100% rename from dataline-integrations/singer/postgres/destination/requirements.txt rename to airbyte-integrations/singer/postgres/destination/requirements.txt diff --git a/dataline-integrations/singer/postgres/destination/run.sh b/airbyte-integrations/singer/postgres/destination/run.sh similarity index 100% rename from dataline-integrations/singer/postgres/destination/run.sh rename to airbyte-integrations/singer/postgres/destination/run.sh diff --git a/dataline-integrations/singer/postgres/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestPostgresDestination.java b/airbyte-integrations/singer/postgres/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestPostgresDestination.java similarity index 86% rename from dataline-integrations/singer/postgres/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestPostgresDestination.java rename to airbyte-integrations/singer/postgres/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestPostgresDestination.java index 8be27bc7bee..dbdaa2f4654 100644 --- a/dataline-integrations/singer/postgres/destination/src/test-integration/java/io/dataline/integration_tests/destinations/TestPostgresDestination.java +++ b/airbyte-integrations/singer/postgres/destination/src/test-integration/java/io/airbyte/integration_tests/destinations/TestPostgresDestination.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,26 +22,26 @@ * SOFTWARE. */ -package io.dataline.integration_tests.destinations; +package io.airbyte.integration_tests.destinations; -import static io.dataline.workers.JobStatus.FAILED; -import static io.dataline.workers.JobStatus.SUCCESSFUL; +import static io.airbyte.workers.JobStatus.FAILED; +import static io.airbyte.workers.JobStatus.SUCCESSFUL; import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertLinesMatch; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.db.DatabaseHelper; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; -import io.dataline.workers.protocols.singer.SingerCheckConnectionWorker; -import io.dataline.workers.protocols.singer.SingerDiscoverSchemaWorker; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; +import io.airbyte.workers.protocols.singer.SingerCheckConnectionWorker; +import io.airbyte.workers.protocols.singer.SingerDiscoverSchemaWorker; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -60,8 +60,8 @@ import org.testcontainers.containers.PostgreSQLContainer; class TestPostgresDestination { - private static final String IMAGE_NAME = "dataline/integration-singer-postgres-destination:dev"; - private static final Path TESTS_PATH = Path.of("/tmp/dataline_integration_tests"); + private static final String IMAGE_NAME = "airbyte/integration-singer-postgres-destination:dev"; + private static final Path TESTS_PATH = Path.of("/tmp/airbyte_integration_tests"); protected Path jobRoot; protected Path workspaceRoot; @@ -77,7 +77,7 @@ class TestPostgresDestination { PSQL.start(); Files.createDirectories(TESTS_PATH); - workspaceRoot = Files.createTempDirectory(TESTS_PATH, "dataline-integration"); + workspaceRoot = Files.createTempDirectory(TESTS_PATH, "airbyte-integration"); jobRoot = Path.of(workspaceRoot.toString(), "job"); Files.createDirectories(jobRoot); diff --git a/dataline-integrations/singer/postgres/destination/src/test-integration/resources/singer-tap-output.txt b/airbyte-integrations/singer/postgres/destination/src/test-integration/resources/singer-tap-output.txt similarity index 100% rename from dataline-integrations/singer/postgres/destination/src/test-integration/resources/singer-tap-output.txt rename to airbyte-integrations/singer/postgres/destination/src/test-integration/resources/singer-tap-output.txt diff --git a/dataline-integrations/singer/postgres/source/.dockerignore b/airbyte-integrations/singer/postgres/source/.dockerignore similarity index 100% rename from dataline-integrations/singer/postgres/source/.dockerignore rename to airbyte-integrations/singer/postgres/source/.dockerignore diff --git a/dataline-integrations/singer/postgres/source/Dockerfile b/airbyte-integrations/singer/postgres/source/Dockerfile similarity index 93% rename from dataline-integrations/singer/postgres/source/Dockerfile rename to airbyte-integrations/singer/postgres/source/Dockerfile index 29c4f890aaa..47adf55a75a 100644 --- a/dataline-integrations/singer/postgres/source/Dockerfile +++ b/airbyte-integrations/singer/postgres/source/Dockerfile @@ -21,4 +21,4 @@ COPY entrypoint.sh . ENTRYPOINT ["/singer/entrypoint.sh"] -LABEL io.dataline.version=0.1.1 +LABEL io.airbyte.version=0.1.1 diff --git a/dataline-integrations/singer/postgres/source/build.gradle b/airbyte-integrations/singer/postgres/source/build.gradle similarity index 81% rename from dataline-integrations/singer/postgres/source/build.gradle rename to airbyte-integrations/singer/postgres/source/build.gradle index e4f17c2e94a..b126dd3d379 100644 --- a/dataline-integrations/singer/postgres/source/build.gradle +++ b/airbyte-integrations/singer/postgres/source/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-postgres-source:dev' +def image = 'airbyte/integration-singer-postgres-source:dev' sourceSets { integrationTest { @@ -30,10 +30,10 @@ dependencies { integrationTestImplementation "org.testcontainers:postgresql:1.14.3" integrationTestImplementation "org.postgresql:postgresql:42.2.16" - integrationTestImplementation project(':dataline-config:models') - integrationTestImplementation project(':dataline-workers') - integrationTestImplementation project(':dataline-test-utils') - integrationTestImplementation project(':dataline-singer') + integrationTestImplementation project(':airbyte-config:models') + integrationTestImplementation project(':airbyte-workers') + integrationTestImplementation project(':airbyte-test-utils') + integrationTestImplementation project(':airbyte-singer') } task imageName { diff --git a/dataline-integrations/singer/postgres/source/entrypoint.sh b/airbyte-integrations/singer/postgres/source/entrypoint.sh similarity index 100% rename from dataline-integrations/singer/postgres/source/entrypoint.sh rename to airbyte-integrations/singer/postgres/source/entrypoint.sh diff --git a/dataline-integrations/singer/postgres/source/requirements.txt b/airbyte-integrations/singer/postgres/source/requirements.txt similarity index 100% rename from dataline-integrations/singer/postgres/source/requirements.txt rename to airbyte-integrations/singer/postgres/source/requirements.txt diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerPostgresSourceTest.java b/airbyte-integrations/singer/postgres/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerPostgresSourceTest.java similarity index 85% rename from dataline-integrations/singer/postgres/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerPostgresSourceTest.java rename to airbyte-integrations/singer/postgres/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerPostgresSourceTest.java index d29dbecafb3..7b45d8af861 100644 --- a/dataline-integrations/singer/postgres/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerPostgresSourceTest.java +++ b/airbyte-integrations/singer/postgres/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerPostgresSourceTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,33 +22,33 @@ * SOFTWARE. */ -package io.dataline.integrations.io.dataline.integration_tests.sources; +package io.airbyte.integrations.io.airbyte.integration_tests.sources; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.Jsons; -import io.dataline.commons.resources.MoreResources; -import io.dataline.config.Schema; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardTapConfig; -import io.dataline.singer.SingerMessage; -import io.dataline.test.utils.PostgreSQLContainerHelper; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; -import io.dataline.workers.protocols.singer.DefaultSingerTap; -import io.dataline.workers.protocols.singer.SingerCheckConnectionWorker; -import io.dataline.workers.protocols.singer.SingerDiscoverSchemaWorker; -import io.dataline.workers.protocols.singer.SingerMessageTracker; -import io.dataline.workers.protocols.singer.SingerTap; +import io.airbyte.commons.json.Jsons; +import io.airbyte.commons.resources.MoreResources; +import io.airbyte.config.Schema; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.singer.SingerMessage; +import io.airbyte.test.utils.PostgreSQLContainerHelper; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; +import io.airbyte.workers.protocols.singer.DefaultSingerTap; +import io.airbyte.workers.protocols.singer.SingerCheckConnectionWorker; +import io.airbyte.workers.protocols.singer.SingerDiscoverSchemaWorker; +import io.airbyte.workers.protocols.singer.SingerMessageTracker; +import io.airbyte.workers.protocols.singer.SingerTap; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -72,8 +72,8 @@ import org.testcontainers.utility.MountableFile; public class SingerPostgresSourceTest { private static final Logger LOGGER = LoggerFactory.getLogger(SingerPostgresSourceTest.class); - private static final String IMAGE_NAME = "dataline/integration-singer-postgres-source:dev"; - private static final Path TESTS_PATH = Path.of("/tmp/dataline_integration_tests"); + private static final String IMAGE_NAME = "airbyte/integration-singer-postgres-source:dev"; + private static final Path TESTS_PATH = Path.of("/tmp/airbyte_integration_tests"); private PostgreSQLContainer psqlDb; private ProcessBuilderFactory pbf; @@ -86,7 +86,7 @@ public class SingerPostgresSourceTest { PostgreSQLContainerHelper.runSqlScript(MountableFile.forClasspathResource("simple_postgres_init.sql"), psqlDb); Files.createDirectories(TESTS_PATH); - Path workspaceRoot = Files.createTempDirectory(TESTS_PATH, "dataline-integration"); + Path workspaceRoot = Files.createTempDirectory(TESTS_PATH, "airbyte-integration"); jobRoot = workspaceRoot.resolve("job"); Files.createDirectories(jobRoot); diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_init.sql b/airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_init.sql similarity index 100% rename from dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_init.sql rename to airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_init.sql diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_source_schema.json b/airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_source_schema.json similarity index 100% rename from dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_source_schema.json rename to airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_source_schema.json diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_update.sql b/airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_update.sql similarity index 100% rename from dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_update.sql rename to airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_postgres_update.sql diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_expected_messages.json b/airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_expected_messages.json similarity index 100% rename from dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_expected_messages.json rename to airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_expected_messages.json diff --git a/dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_update_expected_messages.json b/airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_update_expected_messages.json similarity index 100% rename from dataline-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_update_expected_messages.json rename to airbyte-integrations/singer/postgres/source/src/test-integration/resources/simple_schema_update_expected_messages.json diff --git a/dataline-integrations/singer/stripe/source/.dockerignore b/airbyte-integrations/singer/stripe/source/.dockerignore similarity index 100% rename from dataline-integrations/singer/stripe/source/.dockerignore rename to airbyte-integrations/singer/stripe/source/.dockerignore diff --git a/dataline-integrations/singer/stripe/source/.gitignore b/airbyte-integrations/singer/stripe/source/.gitignore similarity index 100% rename from dataline-integrations/singer/stripe/source/.gitignore rename to airbyte-integrations/singer/stripe/source/.gitignore diff --git a/dataline-integrations/singer/stripe/source/Dockerfile b/airbyte-integrations/singer/stripe/source/Dockerfile similarity index 91% rename from dataline-integrations/singer/stripe/source/Dockerfile rename to airbyte-integrations/singer/stripe/source/Dockerfile index e1f31cd8893..7a77b204de8 100644 --- a/dataline-integrations/singer/stripe/source/Dockerfile +++ b/airbyte-integrations/singer/stripe/source/Dockerfile @@ -17,4 +17,4 @@ COPY entrypoint.sh . ENTRYPOINT ["/singer/entrypoint.sh"] -LABEL io.dataline.version=0.1.0 +LABEL io.airbyte.version=0.1.0 diff --git a/dataline-integrations/singer/stripe/source/README.md b/airbyte-integrations/singer/stripe/source/README.md similarity index 96% rename from dataline-integrations/singer/stripe/source/README.md rename to airbyte-integrations/singer/stripe/source/README.md index 949f7014ab8..8f9cf0bce67 100644 --- a/dataline-integrations/singer/stripe/source/README.md +++ b/airbyte-integrations/singer/stripe/source/README.md @@ -14,7 +14,7 @@ In order to test the Stripe source, you will need API credentials and the abilit } ``` -## Dataline Employee +## Airbyte Employee 1. Access the `Stripe Integration Test Config` secret on Rippling under the `Engineering` folder 1. Create a file with the contents at `config/config.json` diff --git a/dataline-integrations/singer/stripe/source/build.gradle b/airbyte-integrations/singer/stripe/source/build.gradle similarity index 91% rename from dataline-integrations/singer/stripe/source/build.gradle rename to airbyte-integrations/singer/stripe/source/build.gradle index bac1d1ded6a..2f9a0c30117 100644 --- a/dataline-integrations/singer/stripe/source/build.gradle +++ b/airbyte-integrations/singer/stripe/source/build.gradle @@ -4,7 +4,7 @@ plugins { id 'com.bmuschko.docker-remote-api' version '6.6.1' } -def image = 'dataline/integration-singer-stripe-source:dev' +def image = 'airbyte/integration-singer-stripe-source:dev' sourceSets { integrationTest { @@ -29,7 +29,7 @@ dependencies { integrationTestImplementation 'org.apache.commons:commons-text:1.9' integrationTestImplementation "com.stripe:stripe-java:20.6.0" - integrationTestImplementation project(':dataline-workers') + integrationTestImplementation project(':airbyte-workers') } task imageName { diff --git a/dataline-integrations/singer/stripe/source/entrypoint.sh b/airbyte-integrations/singer/stripe/source/entrypoint.sh similarity index 100% rename from dataline-integrations/singer/stripe/source/entrypoint.sh rename to airbyte-integrations/singer/stripe/source/entrypoint.sh diff --git a/dataline-integrations/singer/stripe/source/requirements.txt b/airbyte-integrations/singer/stripe/source/requirements.txt similarity index 100% rename from dataline-integrations/singer/stripe/source/requirements.txt rename to airbyte-integrations/singer/stripe/source/requirements.txt diff --git a/dataline-integrations/singer/stripe/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerStripeSourceTest.java b/airbyte-integrations/singer/stripe/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerStripeSourceTest.java similarity index 94% rename from dataline-integrations/singer/stripe/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerStripeSourceTest.java rename to airbyte-integrations/singer/stripe/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerStripeSourceTest.java index 86523c64bd0..2734e07635b 100644 --- a/dataline-integrations/singer/stripe/source/src/test-integration/java/io/dataline/integrations/io/dataline/integration_tests/sources/SingerStripeSourceTest.java +++ b/airbyte-integrations/singer/stripe/source/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SingerStripeSourceTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.integrations.io.dataline.integration_tests.sources; +package io.airbyte.integrations.io.airbyte.integration_tests.sources; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,10 +35,10 @@ import com.stripe.model.Customer; import com.stripe.net.RequestOptions; import com.stripe.param.CustomerCreateParams; import com.stripe.param.CustomerListParams; -import io.dataline.commons.io.IOs; -import io.dataline.commons.json.Jsons; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.json.Jsons; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -60,8 +60,8 @@ public class SingerStripeSourceTest { private static final Logger LOGGER = LoggerFactory.getLogger(SingerStripeSourceTest.class); - private static final Path TESTS_PATH = Path.of("/tmp/dataline_integration_tests"); - private static final String IMAGE_NAME = "dataline/integration-singer-stripe-source:dev"; + private static final Path TESTS_PATH = Path.of("/tmp/airbyte_integration_tests"); + private static final String IMAGE_NAME = "airbyte/integration-singer-stripe-source:dev"; private static final String CATALOG = "catalog.json"; private static final String CONFIG = "config.json"; diff --git a/dataline-integrations/singer/stripe/source/src/test-integration/resources/catalog.json b/airbyte-integrations/singer/stripe/source/src/test-integration/resources/catalog.json similarity index 100% rename from dataline-integrations/singer/stripe/source/src/test-integration/resources/catalog.json rename to airbyte-integrations/singer/stripe/source/src/test-integration/resources/catalog.json diff --git a/dataline-integrations/singer/stripe/source/src/test-integration/resources/sync_output_subset.txt b/airbyte-integrations/singer/stripe/source/src/test-integration/resources/sync_output_subset.txt similarity index 100% rename from dataline-integrations/singer/stripe/source/src/test-integration/resources/sync_output_subset.txt rename to airbyte-integrations/singer/stripe/source/src/test-integration/resources/sync_output_subset.txt diff --git a/dataline-integrations/src/main/java/io/dataline/integrations/Integrations.java b/airbyte-integrations/src/main/java/io/airbyte/integrations/Integrations.java similarity index 84% rename from dataline-integrations/src/main/java/io/dataline/integrations/Integrations.java rename to airbyte-integrations/src/main/java/io/airbyte/integrations/Integrations.java index 70c7c5c6567..06aa46b713d 100644 --- a/dataline-integrations/src/main/java/io/dataline/integrations/Integrations.java +++ b/airbyte-integrations/src/main/java/io/airbyte/integrations/Integrations.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.integrations; +package io.airbyte.integrations; import java.util.UUID; @@ -30,22 +30,22 @@ public enum Integrations { POSTGRES_TAP( UUID.fromString("2168516a-5c9a-4582-90dc-5e3a01e3f607"), - new IntegrationMapping("dataline/integration-singer-postgres-source:0.1.1")), + new IntegrationMapping("airbyte/integration-singer-postgres-source:0.1.1")), EXCHANGERATEAPI_IO_TAP( UUID.fromString("37eb2ebf-0899-4b22-aba8-8537ec88b5a8"), - new IntegrationMapping("dataline/integration-singer-exchangerateapi_io-source:0.1.2")), + new IntegrationMapping("airbyte/integration-singer-exchangerateapi_io-source:0.1.2")), STRIPE_TAP( UUID.fromString("dd42e77b-24ce-485d-8146-ee6c96d5b454"), - new IntegrationMapping("dataline/integration-singer-stripe-source:0.1.0")), + new IntegrationMapping("airbyte/integration-singer-stripe-source:0.1.0")), POSTGRES_TARGET( UUID.fromString("a6655e6a-838c-4ecb-a28f-ffdcd27ec710"), - new IntegrationMapping("dataline/integration-singer-postgres-destination:0.1.1")), + new IntegrationMapping("airbyte/integration-singer-postgres-destination:0.1.1")), BIGQUERY_TARGET( UUID.fromString("e28a1a10-214a-4051-8cf4-79b6f88719cd"), - new IntegrationMapping("dataline/integration-singer-bigquery-destination:0.1.1")), + new IntegrationMapping("airbyte/integration-singer-bigquery-destination:0.1.1")), CSV_TARGET( UUID.fromString("8442ee76-cc1d-419a-bd8b-859a090366d4"), - new IntegrationMapping("dataline/integration-singer-csv-destination:0.1.0")); + new IntegrationMapping("airbyte/integration-singer-csv-destination:0.1.0")); private final UUID specId; private final IntegrationMapping integrationMapping; diff --git a/dataline-scheduler/.dockerignore b/airbyte-scheduler/.dockerignore similarity index 100% rename from dataline-scheduler/.dockerignore rename to airbyte-scheduler/.dockerignore diff --git a/dataline-scheduler/Dockerfile b/airbyte-scheduler/Dockerfile similarity index 97% rename from dataline-scheduler/Dockerfile rename to airbyte-scheduler/Dockerfile index b9dbd5f7129..ad6ab54ca14 100644 --- a/dataline-scheduler/Dockerfile +++ b/airbyte-scheduler/Dockerfile @@ -17,7 +17,7 @@ RUN add-apt-repository \ RUN apt-get update && apt-get install -y docker-ce-cli ENV WAIT_VERSION=2.7.2 -ENV APPLICATION dataline-scheduler +ENV APPLICATION airbyte-scheduler WORKDIR /app diff --git a/dataline-scheduler/build.gradle b/airbyte-scheduler/build.gradle similarity index 69% rename from dataline-scheduler/build.gradle rename to airbyte-scheduler/build.gradle index 8ff052a9a06..a43e467f496 100644 --- a/dataline-scheduler/build.gradle +++ b/airbyte-scheduler/build.gradle @@ -6,17 +6,17 @@ plugins { } dependencies { - implementation project(':dataline-config:models') - implementation project(':dataline-config:persistence') - implementation project(':dataline-db') - implementation project(':dataline-integrations') - implementation project(':dataline-workers') + implementation project(':airbyte-config:models') + implementation project(':airbyte-config:persistence') + implementation project(':airbyte-db') + implementation project(':airbyte-integrations') + implementation project(':airbyte-workers') testImplementation "org.testcontainers:postgresql:1.14.3" } application { - mainClass = 'io.dataline.scheduler.SchedulerApp' + mainClass = 'io.airbyte.scheduler.SchedulerApp' } Properties env = new Properties() @@ -30,5 +30,5 @@ run { environment "VERSION", env.VERSION environment "DATABASE_USER", env.DATABASE_USER environment "DATABASE_PASSWORD", env.DATABASE_PASSWORD - environment "DATABASE_URL", "jdbc:postgresql://localhost:5432/dataline" + environment "DATABASE_URL", "jdbc:postgresql://localhost:5432/airbyte" } diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/Job.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/Job.java similarity index 96% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/Job.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/Job.java index 2403c07f887..096bd27d1ef 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/Job.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/Job.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.config.JobConfig; -import io.dataline.config.JobOutput; +import io.airbyte.config.JobConfig; +import io.airbyte.config.JobOutput; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobLogs.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobLogs.java similarity index 95% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/JobLogs.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobLogs.java index ccd736b97c5..8d64af20e25 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobLogs.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobLogs.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import java.nio.file.Paths; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobRetrier.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobRetrier.java similarity index 95% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/JobRetrier.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobRetrier.java index 339634fc48c..5a959864da6 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobRetrier.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobRetrier.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.config.JobConfig; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.config.JobConfig; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.time.Instant; import java.util.concurrent.TimeUnit; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobScheduler.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java similarity index 88% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/JobScheduler.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java index 935a8fc93af..9b5a11f8ed5 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobScheduler.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,17 +22,17 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import com.google.common.annotations.VisibleForTesting; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.job_factory.DefaultSyncJobFactory; -import io.dataline.scheduler.job_factory.SyncJobFactory; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.job_factory.DefaultSyncJobFactory; +import io.airbyte.scheduler.job_factory.SyncJobFactory; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.time.Instant; import java.util.List; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobStatus.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobStatus.java similarity index 95% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/JobStatus.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobStatus.java index e75b083dea4..ea1573325c5 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobStatus.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobStatus.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import com.google.common.collect.Sets; import java.util.Set; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobSubmitter.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobSubmitter.java similarity index 93% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/JobSubmitter.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobSubmitter.java index debe4a678e2..957f01f4071 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/JobSubmitter.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobSubmitter.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.commons.concurrency.LifecycledCallable; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; +import io.airbyte.commons.concurrency.LifecycledCallable; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; import java.nio.file.Path; import java.util.Optional; import java.util.concurrent.ExecutorService; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/ScheduleJobPredicate.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScheduleJobPredicate.java similarity index 94% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/ScheduleJobPredicate.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScheduleJobPredicate.java index 48931ae3853..80ed8702f0c 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/ScheduleJobPredicate.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScheduleJobPredicate.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.config.Schedule; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.helpers.ScheduleHelpers; +import io.airbyte.config.Schedule; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.helpers.ScheduleHelpers; import java.time.Instant; import java.util.Optional; import java.util.function.BiPredicate; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerApp.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerApp.java similarity index 88% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerApp.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerApp.java index b1d1b0f93f4..129949dee8f 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerApp.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerApp.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.dataline.config.Configs; -import io.dataline.config.EnvConfigs; -import io.dataline.config.persistence.ConfigPersistence; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.DefaultConfigPersistence; -import io.dataline.db.DatabaseHelper; -import io.dataline.scheduler.persistence.DefaultSchedulerPersistence; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.workers.process.DockerProcessBuilderFactory; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.config.Configs; +import io.airbyte.config.EnvConfigs; +import io.airbyte.config.persistence.ConfigPersistence; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.DefaultConfigPersistence; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.scheduler.persistence.DefaultSchedulerPersistence; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.workers.process.DockerProcessBuilderFactory; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.nio.file.Path; import java.time.Instant; import java.util.concurrent.ExecutorService; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerShutdownHandler.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerShutdownHandler.java similarity index 96% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerShutdownHandler.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerShutdownHandler.java index b6672b4bd18..8c78341b83f 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/SchedulerShutdownHandler.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/SchedulerShutdownHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/ScopeHelper.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScopeHelper.java similarity index 94% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/ScopeHelper.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScopeHelper.java index 1d5bcaa92fc..b0fab235546 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/ScopeHelper.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/ScopeHelper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import com.google.common.base.Preconditions; -import io.dataline.config.JobConfig; +import io.airbyte.config.JobConfig; public class ScopeHelper { diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRun.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRun.java similarity index 90% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRun.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRun.java index dac1ff178b4..2bea7405863 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRun.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRun.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.commons.functional.CheckedSupplier; -import io.dataline.config.JobOutput; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.Worker; +import io.airbyte.commons.functional.CheckedSupplier; +import io.airbyte.config.JobOutput; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.Worker; import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.Callable; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRunFactory.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRunFactory.java similarity index 84% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRunFactory.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRunFactory.java index cd70d02bf7a..f162c815e45 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/WorkerRunFactory.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/WorkerRunFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,25 +22,25 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; -import io.dataline.config.JobCheckConnectionConfig; -import io.dataline.config.JobDiscoverSchemaConfig; -import io.dataline.config.JobOutput; -import io.dataline.config.JobSyncConfig; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardSyncInput; -import io.dataline.workers.Worker; -import io.dataline.workers.process.ProcessBuilderFactory; -import io.dataline.workers.protocols.singer.DefaultSingerTap; -import io.dataline.workers.protocols.singer.DefaultSingerTarget; -import io.dataline.workers.protocols.singer.SingerCheckConnectionWorker; -import io.dataline.workers.protocols.singer.SingerDiscoverSchemaWorker; -import io.dataline.workers.protocols.singer.SingerSyncWorker; -import io.dataline.workers.wrappers.JobOutputCheckConnectionWorker; -import io.dataline.workers.wrappers.JobOutputDiscoverSchemaWorker; -import io.dataline.workers.wrappers.JobOutputSyncWorker; +import io.airbyte.config.JobCheckConnectionConfig; +import io.airbyte.config.JobDiscoverSchemaConfig; +import io.airbyte.config.JobOutput; +import io.airbyte.config.JobSyncConfig; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.workers.Worker; +import io.airbyte.workers.process.ProcessBuilderFactory; +import io.airbyte.workers.protocols.singer.DefaultSingerTap; +import io.airbyte.workers.protocols.singer.DefaultSingerTarget; +import io.airbyte.workers.protocols.singer.SingerCheckConnectionWorker; +import io.airbyte.workers.protocols.singer.SingerDiscoverSchemaWorker; +import io.airbyte.workers.protocols.singer.SingerSyncWorker; +import io.airbyte.workers.wrappers.JobOutputCheckConnectionWorker; +import io.airbyte.workers.wrappers.JobOutputDiscoverSchemaWorker; +import io.airbyte.workers.wrappers.JobOutputSyncWorker; import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactory.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java similarity index 85% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactory.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java index 6b358de0d9b..6bcaccd72e6 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactory.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,13 @@ * SOFTWARE. */ -package io.dataline.scheduler.job_factory; +package io.airbyte.scheduler.job_factory; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.util.UUID; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/SyncJobFactory.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/SyncJobFactory.java similarity index 94% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/SyncJobFactory.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/SyncJobFactory.java index 97d086fc887..4985caa543c 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/job_factory/SyncJobFactory.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/SyncJobFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler.job_factory; +package io.airbyte.scheduler.job_factory; import java.util.UUID; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistence.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistence.java similarity index 95% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistence.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistence.java index 8ffc9046bd3..c603724f506 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistence.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistence.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,24 +22,24 @@ * SOFTWARE. */ -package io.dataline.scheduler.persistence; +package io.airbyte.scheduler.persistence; import com.google.common.annotations.VisibleForTesting; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.JobCheckConnectionConfig; -import io.dataline.config.JobConfig; -import io.dataline.config.JobDiscoverSchemaConfig; -import io.dataline.config.JobOutput; -import io.dataline.config.JobSyncConfig; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncOutput; -import io.dataline.db.DatabaseHelper; -import io.dataline.integrations.Integrations; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; -import io.dataline.scheduler.ScopeHelper; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.JobCheckConnectionConfig; +import io.airbyte.config.JobConfig; +import io.airbyte.config.JobDiscoverSchemaConfig; +import io.airbyte.config.JobOutput; +import io.airbyte.config.JobSyncConfig; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncOutput; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.integrations.Integrations; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; +import io.airbyte.scheduler.ScopeHelper; import java.io.IOException; import java.nio.file.Path; import java.sql.SQLException; diff --git a/dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/SchedulerPersistence.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/SchedulerPersistence.java similarity index 88% rename from dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/SchedulerPersistence.java rename to airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/SchedulerPersistence.java index 55989bcfddb..cd498541f52 100644 --- a/dataline-scheduler/src/main/java/io/dataline/scheduler/persistence/SchedulerPersistence.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/persistence/SchedulerPersistence.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,14 +22,14 @@ * SOFTWARE. */ -package io.dataline.scheduler.persistence; +package io.airbyte.scheduler.persistence; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.JobConfig; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.JobConfig; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; import java.io.IOException; import java.nio.file.Path; import java.util.List; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobLogsTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobLogsTest.java similarity index 95% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/JobLogsTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobLogsTest.java index aa9ccd3abdf..7517c80a6e4 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobLogsTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobLogsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobRetrierTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobRetrierTest.java similarity index 95% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/JobRetrierTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobRetrierTest.java index bd962b2261d..4fcd1336b21 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobRetrierTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobRetrierTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.dataline.config.JobConfig; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.config.JobConfig; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.time.Duration; import java.time.Instant; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobSchedulerTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java similarity index 91% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/JobSchedulerTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java index fd33bd5c58b..6bcbcfd5599 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobSchedulerTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -30,17 +30,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DataType; -import io.dataline.config.Field; -import io.dataline.config.Schema; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.Stream; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.job_factory.SyncJobFactory; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DataType; +import io.airbyte.config.Field; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.Stream; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.job_factory.SyncJobFactory; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.util.Collections; import java.util.Optional; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobSubmitterTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSubmitterTest.java similarity index 82% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/JobSubmitterTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSubmitterTest.java index d0f36fcc07f..55e74b7fb4b 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/JobSubmitterTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSubmitterTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -38,11 +38,11 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.MoreExecutors; -import io.dataline.config.JobOutput; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; +import io.airbyte.config.JobOutput; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; import java.io.IOException; import java.nio.file.Files; import java.util.Map; @@ -98,9 +98,9 @@ public class JobSubmitterTest { jobSubmitter.run(); InOrder inOrder = inOrder(persistence); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.RUNNING); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.RUNNING); inOrder.verify(persistence).writeOutput(1L, new JobOutput()); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.COMPLETED); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.COMPLETED); inOrder.verifyNoMoreInteractions(); } @@ -111,8 +111,8 @@ public class JobSubmitterTest { jobSubmitter.run(); InOrder inOrder = inOrder(persistence); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.RUNNING); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.FAILED); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.RUNNING); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.FAILED); inOrder.verifyNoMoreInteractions(); } @@ -123,9 +123,9 @@ public class JobSubmitterTest { jobSubmitter.run(); InOrder inOrder = inOrder(persistence); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.RUNNING); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.RUNNING); inOrder.verify(persistence).incrementAttempts(1L); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.FAILED); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.FAILED); inOrder.verifyNoMoreInteractions(); } @@ -136,7 +136,7 @@ public class JobSubmitterTest { jobSubmitter.run(); InOrder inOrder = inOrder(persistence); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.FAILED); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.FAILED); inOrder.verifyNoMoreInteractions(); } @@ -148,9 +148,9 @@ public class JobSubmitterTest { jobSubmitter.run(); InOrder inOrder = inOrder(persistence); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.RUNNING); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.RUNNING); inOrder.verify(persistence).incrementAttempts(1L); - inOrder.verify(persistence).updateStatus(1L, io.dataline.scheduler.JobStatus.FAILED); + inOrder.verify(persistence).updateStatus(1L, io.airbyte.scheduler.JobStatus.FAILED); inOrder.verifyNoMoreInteractions(); } diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/ScheduleJobPredicateTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScheduleJobPredicateTest.java similarity index 96% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/ScheduleJobPredicateTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScheduleJobPredicateTest.java index fb4c8171112..bb6b45a0490 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/ScheduleJobPredicateTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScheduleJobPredicateTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.config.Schedule; -import io.dataline.config.StandardSyncSchedule; +import io.airbyte.config.Schedule; +import io.airbyte.config.StandardSyncSchedule; import java.time.Duration; import java.time.Instant; import java.util.Optional; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/SchedulerShutdownHandlerTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/SchedulerShutdownHandlerTest.java similarity index 96% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/SchedulerShutdownHandlerTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/SchedulerShutdownHandlerTest.java index 48b50e0265e..43e937fec61 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/SchedulerShutdownHandlerTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/SchedulerShutdownHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/ScopeHelperTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScopeHelperTest.java similarity index 94% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/ScopeHelperTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScopeHelperTest.java index c15f3d57d7c..78bc5dfc0de 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/ScopeHelperTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/ScopeHelperTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.*; -import io.dataline.config.JobConfig; +import io.airbyte.config.JobConfig; import java.util.UUID; import org.junit.jupiter.api.Test; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunFactoryTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunFactoryTest.java similarity index 88% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunFactoryTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunFactoryTest.java index 87defc95bfb..c74dcc77a25 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunFactoryTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunFactoryTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; @@ -31,17 +31,17 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.Jsons; -import io.dataline.config.JobConfig; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardSyncInput; -import io.dataline.workers.Worker; -import io.dataline.workers.process.ProcessBuilderFactory; -import io.dataline.workers.wrappers.JobOutputCheckConnectionWorker; -import io.dataline.workers.wrappers.JobOutputDiscoverSchemaWorker; -import io.dataline.workers.wrappers.JobOutputSyncWorker; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.JobConfig; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.workers.Worker; +import io.airbyte.workers.process.ProcessBuilderFactory; +import io.airbyte.workers.wrappers.JobOutputCheckConnectionWorker; +import io.airbyte.workers.wrappers.JobOutputDiscoverSchemaWorker; +import io.airbyte.workers.wrappers.JobOutputSyncWorker; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunTest.java similarity index 93% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunTest.java index ead72659d48..5601931e7f8 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/WorkerRunTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/WorkerRunTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,13 @@ * SOFTWARE. */ -package io.dataline.scheduler; +package io.airbyte.scheduler; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.verify; -import io.dataline.config.JobOutput; -import io.dataline.workers.Worker; +import io.airbyte.config.JobOutput; +import io.airbyte.workers.Worker; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactoryTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java similarity index 86% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactoryTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java index 17a7f210646..1af1f3f4140 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/job_factory/DefaultSyncJobFactoryTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.scheduler.job_factory; +package io.airbyte.scheduler.job_factory; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.Test; diff --git a/dataline-scheduler/src/test/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistenceTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistenceTest.java similarity index 95% rename from dataline-scheduler/src/test/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistenceTest.java rename to airbyte-scheduler/src/test/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistenceTest.java index 46906f1a82e..ae8c655e3ca 100644 --- a/dataline-scheduler/src/test/java/io/dataline/scheduler/persistence/DefaultSchedulerPersistenceTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/persistence/DefaultSchedulerPersistenceTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.scheduler.persistence; +package io.airbyte.scheduler.persistence; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -34,24 +34,24 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DataType; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.Field; -import io.dataline.config.JobCheckConnectionConfig; -import io.dataline.config.JobConfig; -import io.dataline.config.JobDiscoverSchemaConfig; -import io.dataline.config.JobOutput; -import io.dataline.config.JobSyncConfig; -import io.dataline.config.Schema; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.config.Stream; -import io.dataline.db.DatabaseHelper; -import io.dataline.integrations.Integrations; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; -import io.dataline.scheduler.ScopeHelper; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DataType; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.Field; +import io.airbyte.config.JobCheckConnectionConfig; +import io.airbyte.config.JobConfig; +import io.airbyte.config.JobDiscoverSchemaConfig; +import io.airbyte.config.JobOutput; +import io.airbyte.config.JobSyncConfig; +import io.airbyte.config.Schema; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.config.Stream; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.integrations.Integrations; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; +import io.airbyte.scheduler.ScopeHelper; import java.io.IOException; import java.nio.file.Path; import java.sql.SQLException; @@ -93,7 +93,7 @@ class DefaultSchedulerPersistenceTest { JsonNode implementationJson = Jsons.jsonNode(ImmutableMap.builder() .put("apiKey", "123-abc") - .put("hostname", "dataline.io") + .put("hostname", "airbyte.io") .build()); SOURCE_CONNECTION_IMPLEMENTATION = new SourceConnectionImplementation() @@ -144,14 +144,14 @@ class DefaultSchedulerPersistenceTest { @BeforeAll public static void dbSetup() throws IOException, InterruptedException { container = new PostgreSQLContainer("postgres:13-alpine") - .withDatabaseName("dataline") + .withDatabaseName("airbyte") .withUsername("docker") .withPassword("docker"); container.start(); container.copyFileToContainer(MountableFile.forClasspathResource("schema.sql"), "/etc/init.sql"); // execInContainer uses Docker's EXEC so it needs to be split up like this - container.execInContainer("psql", "-d", "dataline", "-U", "docker", "-a", "-f", "/etc/init.sql"); + container.execInContainer("psql", "-d", "airbyte", "-U", "docker", "-a", "-f", "/etc/init.sql"); connectionPool = DatabaseHelper.getConnectionPool( diff --git a/dataline-server/.dockerignore b/airbyte-server/.dockerignore similarity index 100% rename from dataline-server/.dockerignore rename to airbyte-server/.dockerignore diff --git a/dataline-server/Dockerfile b/airbyte-server/Dockerfile similarity index 93% rename from dataline-server/Dockerfile rename to airbyte-server/Dockerfile index fd690bfca63..6ea7658ccae 100644 --- a/dataline-server/Dockerfile +++ b/airbyte-server/Dockerfile @@ -3,7 +3,7 @@ FROM openjdk:14.0.2-slim AS server EXPOSE 8000 ENV WAIT_VERSION=2.7.2 -ENV APPLICATION dataline-server +ENV APPLICATION airbyte-server WORKDIR /app diff --git a/dataline-server/build.gradle b/airbyte-server/build.gradle similarity index 74% rename from dataline-server/build.gradle rename to airbyte-server/build.gradle index 453d3d9ebb8..dae03b9e523 100644 --- a/dataline-server/build.gradle +++ b/airbyte-server/build.gradle @@ -12,18 +12,18 @@ dependencies { implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson' implementation group: 'org.glassfish.jersey.ext', name: 'jersey-bean-validation' - implementation project(':dataline-analytics') - implementation project(':dataline-api') - implementation project(':dataline-config:models') - implementation project(':dataline-config:persistence') - implementation project(':dataline-config:init') - implementation project(':dataline-db') - implementation project(':dataline-scheduler') + implementation project(':airbyte-analytics') + implementation project(':airbyte-api') + implementation project(':airbyte-config:models') + implementation project(':airbyte-config:persistence') + implementation project(':airbyte-config:init') + implementation project(':airbyte-db') + implementation project(':airbyte-scheduler') } application { - mainClass = 'io.dataline.server.ServerApp' + mainClass = 'io.airbyte.server.ServerApp' } Properties env = new Properties() @@ -36,5 +36,5 @@ run { environment "VERSION", env.VERSION environment "DATABASE_USER", env.DATABASE_USER environment "DATABASE_PASSWORD", env.DATABASE_PASSWORD - environment "DATABASE_URL", "jdbc:postgresql://localhost:5432/dataline" + environment "DATABASE_URL", "jdbc:postgresql://localhost:5432/airbyte" } diff --git a/dataline-server/src/main/java/io/dataline/server/ConfigurationApiFactory.java b/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java similarity index 89% rename from dataline-server/src/main/java/io/dataline/server/ConfigurationApiFactory.java rename to airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java index deece1eef99..52d5d77608f 100644 --- a/dataline-server/src/main/java/io/dataline/server/ConfigurationApiFactory.java +++ b/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.server; +package io.airbyte.server; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.server.apis.ConfigurationApi; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.server.apis.ConfigurationApi; import org.glassfish.hk2.api.Factory; public class ConfigurationApiFactory implements Factory { diff --git a/dataline-server/src/main/java/io/dataline/server/CorsFilter.java b/airbyte-server/src/main/java/io/airbyte/server/CorsFilter.java similarity index 97% rename from dataline-server/src/main/java/io/dataline/server/CorsFilter.java rename to airbyte-server/src/main/java/io/airbyte/server/CorsFilter.java index fb74156f8a9..fd998dee8b0 100644 --- a/dataline-server/src/main/java/io/dataline/server/CorsFilter.java +++ b/airbyte-server/src/main/java/io/airbyte/server/CorsFilter.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server; +package io.airbyte.server; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; diff --git a/dataline-server/src/main/java/io/dataline/server/ServerApp.java b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java similarity index 85% rename from dataline-server/src/main/java/io/dataline/server/ServerApp.java rename to airbyte-server/src/main/java/io/airbyte/server/ServerApp.java index c4a322518f9..afe97678caa 100644 --- a/dataline-server/src/main/java/io/dataline/server/ServerApp.java +++ b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,26 +22,26 @@ * SOFTWARE. */ -package io.dataline.server; +package io.airbyte.server; -import io.dataline.analytics.TrackingClientSingleton; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.Configs; -import io.dataline.config.EnvConfigs; -import io.dataline.config.StandardWorkspace; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.DefaultConfigPersistence; -import io.dataline.config.persistence.PersistenceConstants; -import io.dataline.db.DatabaseHelper; -import io.dataline.scheduler.persistence.DefaultSchedulerPersistence; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.server.apis.ConfigurationApi; -import io.dataline.server.errors.InvalidInputExceptionMapper; -import io.dataline.server.errors.InvalidJsonExceptionMapper; -import io.dataline.server.errors.InvalidJsonInputExceptionMapper; -import io.dataline.server.errors.KnownExceptionMapper; -import io.dataline.server.errors.UncaughtExceptionMapper; +import io.airbyte.analytics.TrackingClientSingleton; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.Configs; +import io.airbyte.config.EnvConfigs; +import io.airbyte.config.StandardWorkspace; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.DefaultConfigPersistence; +import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.scheduler.persistence.DefaultSchedulerPersistence; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.server.apis.ConfigurationApi; +import io.airbyte.server.errors.InvalidInputExceptionMapper; +import io.airbyte.server.errors.InvalidJsonExceptionMapper; +import io.airbyte.server.errors.InvalidJsonInputExceptionMapper; +import io.airbyte.server.errors.KnownExceptionMapper; +import io.airbyte.server.errors.UncaughtExceptionMapper; import java.io.IOException; import java.nio.file.Path; import java.util.UUID; diff --git a/dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java similarity index 78% rename from dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java rename to airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java index 9ecf88b8f90..71331d2d6fa 100644 --- a/dataline-server/src/main/java/io/dataline/server/apis/ConfigurationApi.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,67 +22,67 @@ * SOFTWARE. */ -package io.dataline.server.apis; +package io.airbyte.server.apis; -import io.dataline.api.model.CheckConnectionRead; -import io.dataline.api.model.ConnectionCreate; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.ConnectionSyncRead; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.DestinationIdRequestBody; -import io.dataline.api.model.DestinationImplementationCreate; -import io.dataline.api.model.DestinationImplementationIdRequestBody; -import io.dataline.api.model.DestinationImplementationRead; -import io.dataline.api.model.DestinationImplementationReadList; -import io.dataline.api.model.DestinationImplementationUpdate; -import io.dataline.api.model.DestinationRead; -import io.dataline.api.model.DestinationReadList; -import io.dataline.api.model.DestinationSpecificationRead; -import io.dataline.api.model.JobIdRequestBody; -import io.dataline.api.model.JobInfoRead; -import io.dataline.api.model.JobListRequestBody; -import io.dataline.api.model.JobReadList; -import io.dataline.api.model.SlugRequestBody; -import io.dataline.api.model.SourceIdRequestBody; -import io.dataline.api.model.SourceImplementationCreate; -import io.dataline.api.model.SourceImplementationDiscoverSchemaRead; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.api.model.SourceImplementationReadList; -import io.dataline.api.model.SourceImplementationUpdate; -import io.dataline.api.model.SourceRead; -import io.dataline.api.model.SourceReadList; -import io.dataline.api.model.SourceSpecificationRead; -import io.dataline.api.model.WbConnectionRead; -import io.dataline.api.model.WbConnectionReadList; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.api.model.WorkspaceRead; -import io.dataline.api.model.WorkspaceUpdate; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.server.errors.KnownException; -import io.dataline.server.handlers.ConnectionsHandler; -import io.dataline.server.handlers.DestinationImplementationsHandler; -import io.dataline.server.handlers.DestinationSpecificationsHandler; -import io.dataline.server.handlers.DestinationsHandler; -import io.dataline.server.handlers.JobHistoryHandler; -import io.dataline.server.handlers.SchedulerHandler; -import io.dataline.server.handlers.SourceImplementationsHandler; -import io.dataline.server.handlers.SourceSpecificationsHandler; -import io.dataline.server.handlers.SourcesHandler; -import io.dataline.server.handlers.WebBackendConnectionsHandler; -import io.dataline.server.handlers.WorkspacesHandler; -import io.dataline.server.validation.IntegrationSchemaValidation; +import io.airbyte.api.model.CheckConnectionRead; +import io.airbyte.api.model.ConnectionCreate; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.ConnectionSyncRead; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.DestinationIdRequestBody; +import io.airbyte.api.model.DestinationImplementationCreate; +import io.airbyte.api.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.model.DestinationImplementationRead; +import io.airbyte.api.model.DestinationImplementationReadList; +import io.airbyte.api.model.DestinationImplementationUpdate; +import io.airbyte.api.model.DestinationRead; +import io.airbyte.api.model.DestinationReadList; +import io.airbyte.api.model.DestinationSpecificationRead; +import io.airbyte.api.model.JobIdRequestBody; +import io.airbyte.api.model.JobInfoRead; +import io.airbyte.api.model.JobListRequestBody; +import io.airbyte.api.model.JobReadList; +import io.airbyte.api.model.SlugRequestBody; +import io.airbyte.api.model.SourceIdRequestBody; +import io.airbyte.api.model.SourceImplementationCreate; +import io.airbyte.api.model.SourceImplementationDiscoverSchemaRead; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.api.model.SourceImplementationReadList; +import io.airbyte.api.model.SourceImplementationUpdate; +import io.airbyte.api.model.SourceRead; +import io.airbyte.api.model.SourceReadList; +import io.airbyte.api.model.SourceSpecificationRead; +import io.airbyte.api.model.WbConnectionRead; +import io.airbyte.api.model.WbConnectionReadList; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.api.model.WorkspaceRead; +import io.airbyte.api.model.WorkspaceUpdate; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.server.errors.KnownException; +import io.airbyte.server.handlers.ConnectionsHandler; +import io.airbyte.server.handlers.DestinationImplementationsHandler; +import io.airbyte.server.handlers.DestinationSpecificationsHandler; +import io.airbyte.server.handlers.DestinationsHandler; +import io.airbyte.server.handlers.JobHistoryHandler; +import io.airbyte.server.handlers.SchedulerHandler; +import io.airbyte.server.handlers.SourceImplementationsHandler; +import io.airbyte.server.handlers.SourceSpecificationsHandler; +import io.airbyte.server.handlers.SourcesHandler; +import io.airbyte.server.handlers.WebBackendConnectionsHandler; +import io.airbyte.server.handlers.WorkspacesHandler; +import io.airbyte.server.validation.IntegrationSchemaValidation; import java.io.IOException; import javax.validation.Valid; import org.eclipse.jetty.http.HttpStatus; @javax.ws.rs.Path("/v1") -public class ConfigurationApi implements io.dataline.api.V1Api { +public class ConfigurationApi implements io.airbyte.api.V1Api { private final WorkspacesHandler workspacesHandler; private final SourcesHandler sourcesHandler; diff --git a/dataline-server/src/main/java/io/dataline/server/converters/SchemaConverter.java b/airbyte-server/src/main/java/io/airbyte/server/converters/SchemaConverter.java similarity index 87% rename from dataline-server/src/main/java/io/dataline/server/converters/SchemaConverter.java rename to airbyte-server/src/main/java/io/airbyte/server/converters/SchemaConverter.java index 2750e783f40..31841d397f5 100644 --- a/dataline-server/src/main/java/io/dataline/server/converters/SchemaConverter.java +++ b/airbyte-server/src/main/java/io/airbyte/server/converters/SchemaConverter.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,16 @@ * SOFTWARE. */ -package io.dataline.server.converters; +package io.airbyte.server.converters; -import io.dataline.api.model.SourceSchema; -import io.dataline.api.model.SourceSchemaField; -import io.dataline.api.model.SourceSchemaStream; -import io.dataline.commons.enums.Enums; -import io.dataline.config.DataType; -import io.dataline.config.Field; -import io.dataline.config.Schema; -import io.dataline.config.Stream; +import io.airbyte.api.model.SourceSchema; +import io.airbyte.api.model.SourceSchemaField; +import io.airbyte.api.model.SourceSchemaStream; +import io.airbyte.commons.enums.Enums; +import io.airbyte.config.DataType; +import io.airbyte.config.Field; +import io.airbyte.config.Schema; +import io.airbyte.config.Stream; import java.util.List; import java.util.stream.Collectors; @@ -71,7 +71,7 @@ public class SchemaConverter { .map( persistenceField -> new SourceSchemaField() .name(persistenceField.getName()) - .dataType(Enums.convertTo(persistenceField.getDataType(), io.dataline.api.model.DataType.class)) + .dataType(Enums.convertTo(persistenceField.getDataType(), io.airbyte.api.model.DataType.class)) .selected(persistenceField.getSelected())) .collect(Collectors.toList()); diff --git a/dataline-server/src/main/java/io/dataline/server/errors/InvalidInputExceptionMapper.java b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidInputExceptionMapper.java similarity index 96% rename from dataline-server/src/main/java/io/dataline/server/errors/InvalidInputExceptionMapper.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/InvalidInputExceptionMapper.java index bff27bcf56d..42a42195da3 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/InvalidInputExceptionMapper.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidInputExceptionMapper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.ws.rs.core.Response; diff --git a/dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonExceptionMapper.java b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonExceptionMapper.java similarity index 94% rename from dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonExceptionMapper.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonExceptionMapper.java index 3920c3bf09c..d47614123ae 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonExceptionMapper.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonExceptionMapper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; import com.fasterxml.jackson.core.JsonParseException; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; diff --git a/dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonInputExceptionMapper.java b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonInputExceptionMapper.java similarity index 94% rename from dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonInputExceptionMapper.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonInputExceptionMapper.java index dd0f92dacb1..1c5ee915941 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/InvalidJsonInputExceptionMapper.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/InvalidJsonInputExceptionMapper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; import com.fasterxml.jackson.databind.JsonMappingException; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; diff --git a/dataline-server/src/main/java/io/dataline/server/errors/KnownException.java b/airbyte-server/src/main/java/io/airbyte/server/errors/KnownException.java similarity index 95% rename from dataline-server/src/main/java/io/dataline/server/errors/KnownException.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/KnownException.java index 6a2f41626b9..a29f8c6cbff 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/KnownException.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/KnownException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; public class KnownException extends RuntimeException { diff --git a/dataline-server/src/main/java/io/dataline/server/errors/KnownExceptionMapper.java b/airbyte-server/src/main/java/io/airbyte/server/errors/KnownExceptionMapper.java similarity index 94% rename from dataline-server/src/main/java/io/dataline/server/errors/KnownExceptionMapper.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/KnownExceptionMapper.java index 8d3718d8ffe..b138b6c8e81 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/KnownExceptionMapper.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/KnownExceptionMapper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; diff --git a/dataline-server/src/main/java/io/dataline/server/errors/UncaughtExceptionMapper.java b/airbyte-server/src/main/java/io/airbyte/server/errors/UncaughtExceptionMapper.java similarity index 94% rename from dataline-server/src/main/java/io/dataline/server/errors/UncaughtExceptionMapper.java rename to airbyte-server/src/main/java/io/airbyte/server/errors/UncaughtExceptionMapper.java index 43b6a199a97..7c571b634b3 100644 --- a/dataline-server/src/main/java/io/dataline/server/errors/UncaughtExceptionMapper.java +++ b/airbyte-server/src/main/java/io/airbyte/server/errors/UncaughtExceptionMapper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.server.errors; +package io.airbyte.server.errors; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/ConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java similarity index 91% rename from dataline-server/src/main/java/io/dataline/server/handlers/ConnectionsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java index 2d269c6547f..41bbaa926cd 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/ConnectionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,27 +22,27 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionCreate; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.ConnectionSchedule; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.Schedule; -import io.dataline.config.Schema; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.converters.SchemaConverter; +import io.airbyte.api.model.ConnectionCreate; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.ConnectionSchedule; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.Schedule; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.converters.SchemaConverter; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationImplementationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java similarity index 91% rename from dataline-server/src/main/java/io/dataline/server/handlers/DestinationImplementationsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java index 8d66ffc4f0c..95d4ecae0d0 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationImplementationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,26 +22,26 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.DestinationImplementationCreate; -import io.dataline.api.model.DestinationImplementationIdRequestBody; -import io.dataline.api.model.DestinationImplementationRead; -import io.dataline.api.model.DestinationImplementationReadList; -import io.dataline.api.model.DestinationImplementationUpdate; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.StandardDestination; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.validation.IntegrationSchemaValidation; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.DestinationImplementationCreate; +import io.airbyte.api.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.model.DestinationImplementationRead; +import io.airbyte.api.model.DestinationImplementationReadList; +import io.airbyte.api.model.DestinationImplementationUpdate; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.StandardDestination; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.validation.IntegrationSchemaValidation; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationSpecificationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationSpecificationsHandler.java similarity index 85% rename from dataline-server/src/main/java/io/dataline/server/handlers/DestinationSpecificationsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationSpecificationsHandler.java index cc3fa8c247f..9b8f412cff4 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationSpecificationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationSpecificationsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; -import io.dataline.api.model.DestinationIdRequestBody; -import io.dataline.api.model.DestinationSpecificationRead; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.errors.KnownException; +import io.airbyte.api.model.DestinationIdRequestBody; +import io.airbyte.api.model.DestinationSpecificationRead; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.errors.KnownException; import java.io.IOException; import org.eclipse.jetty.http.HttpStatus; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java similarity index 84% rename from dataline-server/src/main/java/io/dataline/server/handlers/DestinationsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java index 52700a90eac..b1723c49a66 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/DestinationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; -import io.dataline.api.model.DestinationIdRequestBody; -import io.dataline.api.model.DestinationRead; -import io.dataline.api.model.DestinationReadList; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardDestination; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; +import io.airbyte.api.model.DestinationIdRequestBody; +import io.airbyte.api.model.DestinationRead; +import io.airbyte.api.model.DestinationReadList; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardDestination; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/JobHistoryHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/JobHistoryHandler.java similarity index 83% rename from dataline-server/src/main/java/io/dataline/server/handlers/JobHistoryHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/JobHistoryHandler.java index 2e4b338e067..000d1d09606 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/JobHistoryHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/JobHistoryHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,22 +22,22 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.google.common.annotations.VisibleForTesting; -import io.dataline.api.model.JobConfigType; -import io.dataline.api.model.JobIdRequestBody; -import io.dataline.api.model.JobInfoRead; -import io.dataline.api.model.JobListRequestBody; -import io.dataline.api.model.JobRead; -import io.dataline.api.model.JobReadList; -import io.dataline.api.model.LogRead; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.io.IOs; -import io.dataline.config.JobConfig; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.ScopeHelper; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.api.model.JobConfigType; +import io.airbyte.api.model.JobIdRequestBody; +import io.airbyte.api.model.JobInfoRead; +import io.airbyte.api.model.JobListRequestBody; +import io.airbyte.api.model.JobRead; +import io.airbyte.api.model.JobReadList; +import io.airbyte.api.model.LogRead; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.io.IOs; +import io.airbyte.config.JobConfig; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.ScopeHelper; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/SchedulerHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java similarity index 87% rename from dataline-server/src/main/java/io/dataline/server/handlers/SchedulerHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java index e7ca4a9be49..4a8c1bc8ef2 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/SchedulerHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,31 +22,31 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.google.common.collect.ImmutableMap; -import io.dataline.analytics.TrackingClientSingleton; -import io.dataline.api.model.CheckConnectionRead; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionSyncRead; -import io.dataline.api.model.DestinationImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationDiscoverSchemaRead; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.JobOutput; -import io.dataline.config.Schema; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.server.converters.SchemaConverter; +import io.airbyte.analytics.TrackingClientSingleton; +import io.airbyte.api.model.CheckConnectionRead; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionSyncRead; +import io.airbyte.api.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationDiscoverSchemaRead; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.JobOutput; +import io.airbyte.config.Schema; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.server.converters.SchemaConverter; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/SourceImplementationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java similarity index 91% rename from dataline-server/src/main/java/io/dataline/server/handlers/SourceImplementationsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java index eaa3a83aefb..020b0a5c32c 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/SourceImplementationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,26 +22,26 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.SourceImplementationCreate; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.api.model.SourceImplementationReadList; -import io.dataline.api.model.SourceImplementationUpdate; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.SourceConnectionSpecification; -import io.dataline.config.StandardSource; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.validation.IntegrationSchemaValidation; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.SourceImplementationCreate; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.api.model.SourceImplementationReadList; +import io.airbyte.api.model.SourceImplementationUpdate; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.SourceConnectionSpecification; +import io.airbyte.config.StandardSource; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.validation.IntegrationSchemaValidation; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/SourceSpecificationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceSpecificationsHandler.java similarity index 85% rename from dataline-server/src/main/java/io/dataline/server/handlers/SourceSpecificationsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/SourceSpecificationsHandler.java index 6509d22d88d..6f87dfd4f7d 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/SourceSpecificationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceSpecificationsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; -import io.dataline.api.model.SourceIdRequestBody; -import io.dataline.api.model.SourceSpecificationRead; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.SourceConnectionSpecification; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.errors.KnownException; +import io.airbyte.api.model.SourceIdRequestBody; +import io.airbyte.api.model.SourceSpecificationRead; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.SourceConnectionSpecification; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.errors.KnownException; import java.io.IOException; public class SourceSpecificationsHandler { diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/SourcesHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java similarity index 84% rename from dataline-server/src/main/java/io/dataline/server/handlers/SourcesHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java index 616854fb879..6e6176b29f1 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/SourcesHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; -import io.dataline.api.model.SourceIdRequestBody; -import io.dataline.api.model.SourceRead; -import io.dataline.api.model.SourceReadList; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardSource; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; +import io.airbyte.api.model.SourceIdRequestBody; +import io.airbyte.api.model.SourceRead; +import io.airbyte.api.model.SourceReadList; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardSource; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/WebBackendConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java similarity index 85% rename from dataline-server/src/main/java/io/dataline/server/handlers/WebBackendConnectionsHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java index 34f716c8e62..d72723737fa 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/WebBackendConnectionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,22 +22,22 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.JobConfigType; -import io.dataline.api.model.JobListRequestBody; -import io.dataline.api.model.JobReadList; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.api.model.WbConnectionRead; -import io.dataline.api.model.WbConnectionReadList; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.persistence.ConfigNotFoundException; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.JobConfigType; +import io.airbyte.api.model.JobListRequestBody; +import io.airbyte.api.model.JobReadList; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.api.model.WbConnectionRead; +import io.airbyte.api.model.WbConnectionReadList; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.persistence.ConfigNotFoundException; import java.io.IOException; import java.util.List; diff --git a/dataline-server/src/main/java/io/dataline/server/handlers/WorkspacesHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java similarity index 85% rename from dataline-server/src/main/java/io/dataline/server/handlers/WorkspacesHandler.java rename to airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java index a1b472835aa..679df4b10a2 100644 --- a/dataline-server/src/main/java/io/dataline/server/handlers/WorkspacesHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,18 +22,18 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; -import io.dataline.analytics.TrackingClientSingleton; -import io.dataline.api.model.SlugRequestBody; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.api.model.WorkspaceRead; -import io.dataline.api.model.WorkspaceUpdate; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardWorkspace; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.PersistenceConstants; +import io.airbyte.analytics.TrackingClientSingleton; +import io.airbyte.api.model.SlugRequestBody; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.api.model.WorkspaceRead; +import io.airbyte.api.model.WorkspaceUpdate; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardWorkspace; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.PersistenceConstants; import java.io.IOException; import java.util.UUID; diff --git a/dataline-server/src/main/java/io/dataline/server/validation/IntegrationSchemaValidation.java b/airbyte-server/src/main/java/io/airbyte/server/validation/IntegrationSchemaValidation.java similarity index 87% rename from dataline-server/src/main/java/io/dataline/server/validation/IntegrationSchemaValidation.java rename to airbyte-server/src/main/java/io/airbyte/server/validation/IntegrationSchemaValidation.java index a0c1908a011..5bf41a590d7 100644 --- a/dataline-server/src/main/java/io/dataline/server/validation/IntegrationSchemaValidation.java +++ b/airbyte-server/src/main/java/io/airbyte/server/validation/IntegrationSchemaValidation.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,13 @@ * SOFTWARE. */ -package io.dataline.server.validation; +package io.airbyte.server.validation; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.JsonSchemaValidator; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.SourceConnectionSpecification; +import io.airbyte.commons.json.JsonSchemaValidator; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.SourceConnectionSpecification; public class IntegrationSchemaValidation { diff --git a/dataline-server/src/test/java/io/dataline/server/ServerAppTest.java b/airbyte-server/src/test/java/io/airbyte/server/ServerAppTest.java similarity index 95% rename from dataline-server/src/test/java/io/dataline/server/ServerAppTest.java rename to airbyte-server/src/test/java/io/airbyte/server/ServerAppTest.java index b91bd5296f7..64cd29acc3c 100644 --- a/dataline-server/src/test/java/io/dataline/server/ServerAppTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/ServerAppTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server; +package io.airbyte.server; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dataline-server/src/test/java/io/dataline/server/converters/SchemaConverterTest.java b/airbyte-server/src/test/java/io/airbyte/server/converters/SchemaConverterTest.java similarity index 79% rename from dataline-server/src/test/java/io/dataline/server/converters/SchemaConverterTest.java rename to airbyte-server/src/test/java/io/airbyte/server/converters/SchemaConverterTest.java index 40129bf0e3b..9c9116e470a 100644 --- a/dataline-server/src/test/java/io/dataline/server/converters/SchemaConverterTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/converters/SchemaConverterTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.server.converters; +package io.airbyte.server.converters; import static org.junit.jupiter.api.Assertions.*; import com.google.common.collect.Lists; -import io.dataline.api.model.SourceSchema; -import io.dataline.api.model.SourceSchemaField; -import io.dataline.api.model.SourceSchemaStream; -import io.dataline.commons.enums.Enums; -import io.dataline.config.DataType; -import io.dataline.config.Field; -import io.dataline.config.Schema; -import io.dataline.config.Stream; +import io.airbyte.api.model.SourceSchema; +import io.airbyte.api.model.SourceSchemaField; +import io.airbyte.api.model.SourceSchemaStream; +import io.airbyte.commons.enums.Enums; +import io.airbyte.config.DataType; +import io.airbyte.config.Field; +import io.airbyte.config.Schema; +import io.airbyte.config.Stream; import org.junit.jupiter.api.Test; class SchemaConverterTest { @@ -52,7 +52,7 @@ class SchemaConverterTest { .streams(Lists.newArrayList(new SourceSchemaStream() .name("users") .fields(Lists.newArrayList(new SourceSchemaField() - .dataType(io.dataline.api.model.DataType.STRING) + .dataType(io.airbyte.api.model.DataType.STRING) .name("id") .selected(true))))); @@ -68,7 +68,7 @@ class SchemaConverterTest { @Test void testEnumConversion() { - assertTrue(Enums.isCompatible(io.dataline.api.model.DataType.class, DataType.class)); + assertTrue(Enums.isCompatible(io.airbyte.api.model.DataType.class, DataType.class)); } } diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/ConnectionsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java similarity index 87% rename from dataline-server/src/test/java/io/dataline/server/handlers/ConnectionsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java index 53b70e7c0e0..a9078ff5c4b 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/ConnectionsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -31,27 +31,27 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionCreate; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.ConnectionSchedule; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.SourceSchema; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DataType; -import io.dataline.config.Schedule; -import io.dataline.config.Schema; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.helpers.ConnectionHelpers; -import io.dataline.server.helpers.SourceImplementationHelpers; +import io.airbyte.api.model.ConnectionCreate; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.ConnectionSchedule; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.SourceSchema; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DataType; +import io.airbyte.config.Schedule; +import io.airbyte.config.Schema; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.helpers.ConnectionHelpers; +import io.airbyte.server.helpers.SourceImplementationHelpers; import java.io.IOException; import java.util.UUID; import java.util.function.Supplier; @@ -207,8 +207,8 @@ class ConnectionsHandlerTest { assertTrue(Enums.isCompatible(StandardSync.SyncMode.class, ConnectionRead.SyncModeEnum.class)); assertTrue(Enums.isCompatible(StandardSync.Status.class, ConnectionStatus.class)); assertTrue(Enums.isCompatible(ConnectionSchedule.TimeUnitEnum.class, Schedule.TimeUnit.class)); - assertTrue(Enums.isCompatible(io.dataline.api.model.DataType.class, DataType.class)); - assertTrue(Enums.isCompatible(DataType.class, io.dataline.api.model.DataType.class)); + assertTrue(Enums.isCompatible(io.airbyte.api.model.DataType.class, DataType.class)); + assertTrue(Enums.isCompatible(DataType.class, io.airbyte.api.model.DataType.class)); } } diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationImplementationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java similarity index 91% rename from dataline-server/src/test/java/io/dataline/server/handlers/DestinationImplementationsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java index 4c3c91f0e39..a6e8f9a606f 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationImplementationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -32,29 +32,29 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.DestinationImplementationCreate; -import io.dataline.api.model.DestinationImplementationIdRequestBody; -import io.dataline.api.model.DestinationImplementationRead; -import io.dataline.api.model.DestinationImplementationReadList; -import io.dataline.api.model.DestinationImplementationUpdate; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.StandardDestination; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.helpers.ConnectionHelpers; -import io.dataline.server.helpers.DestinationHelpers; -import io.dataline.server.helpers.DestinationImplementationHelpers; -import io.dataline.server.helpers.DestinationSpecificationHelpers; -import io.dataline.server.validation.IntegrationSchemaValidation; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.DestinationImplementationCreate; +import io.airbyte.api.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.model.DestinationImplementationRead; +import io.airbyte.api.model.DestinationImplementationReadList; +import io.airbyte.api.model.DestinationImplementationUpdate; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.StandardDestination; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.helpers.ConnectionHelpers; +import io.airbyte.server.helpers.DestinationHelpers; +import io.airbyte.server.helpers.DestinationImplementationHelpers; +import io.airbyte.server.helpers.DestinationSpecificationHelpers; +import io.airbyte.server.validation.IntegrationSchemaValidation; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationSpecificationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationSpecificationsHandlerTest.java similarity index 86% rename from dataline-server/src/test/java/io/dataline/server/handlers/DestinationSpecificationsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationSpecificationsHandlerTest.java index fcbe9546232..03be73785ba 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationSpecificationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationSpecificationsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.api.model.DestinationIdRequestBody; -import io.dataline.api.model.DestinationSpecificationRead; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionSpecification; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.helpers.DestinationSpecificationHelpers; +import io.airbyte.api.model.DestinationIdRequestBody; +import io.airbyte.api.model.DestinationSpecificationRead; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionSpecification; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.helpers.DestinationSpecificationHelpers; import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java similarity index 89% rename from dataline-server/src/test/java/io/dataline/server/handlers/DestinationsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java index ff3cd297512..ba6f4382b4b 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/DestinationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.api.model.DestinationIdRequestBody; -import io.dataline.api.model.DestinationRead; -import io.dataline.api.model.DestinationReadList; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardDestination; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; +import io.airbyte.api.model.DestinationIdRequestBody; +import io.airbyte.api.model.DestinationRead; +import io.airbyte.api.model.DestinationReadList; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardDestination; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/JobHistoryHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/JobHistoryHandlerTest.java similarity index 87% rename from dataline-server/src/test/java/io/dataline/server/handlers/JobHistoryHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/JobHistoryHandlerTest.java index 54169fcb596..a3e1776b16a 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/JobHistoryHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/JobHistoryHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,27 +22,27 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.api.model.JobConfigType; -import io.dataline.api.model.JobIdRequestBody; -import io.dataline.api.model.JobInfoRead; -import io.dataline.api.model.JobListRequestBody; -import io.dataline.api.model.JobRead; -import io.dataline.api.model.JobReadList; -import io.dataline.api.model.LogRead; -import io.dataline.commons.enums.Enums; -import io.dataline.config.JobCheckConnectionConfig; -import io.dataline.config.JobConfig; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; -import io.dataline.scheduler.ScopeHelper; -import io.dataline.scheduler.persistence.SchedulerPersistence; +import io.airbyte.api.model.JobConfigType; +import io.airbyte.api.model.JobIdRequestBody; +import io.airbyte.api.model.JobInfoRead; +import io.airbyte.api.model.JobListRequestBody; +import io.airbyte.api.model.JobRead; +import io.airbyte.api.model.JobReadList; +import io.airbyte.api.model.LogRead; +import io.airbyte.commons.enums.Enums; +import io.airbyte.config.JobCheckConnectionConfig; +import io.airbyte.config.JobConfig; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; +import io.airbyte.scheduler.ScopeHelper; +import io.airbyte.scheduler.persistence.SchedulerPersistence; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/SchedulerHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java similarity index 87% rename from dataline-server/src/test/java/io/dataline/server/handlers/SchedulerHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java index 04975be17b4..aa4763e75ed 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/SchedulerHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; @@ -30,24 +30,24 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.api.model.CheckConnectionRead; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.DestinationImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.scheduler.Job; -import io.dataline.scheduler.JobStatus; -import io.dataline.scheduler.persistence.SchedulerPersistence; -import io.dataline.server.helpers.ConnectionHelpers; -import io.dataline.server.helpers.DestinationImplementationHelpers; -import io.dataline.server.helpers.SourceImplementationHelpers; +import io.airbyte.api.model.CheckConnectionRead; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.scheduler.Job; +import io.airbyte.scheduler.JobStatus; +import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.server.helpers.ConnectionHelpers; +import io.airbyte.server.helpers.DestinationImplementationHelpers; +import io.airbyte.server.helpers.SourceImplementationHelpers; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/SourceImplementationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java similarity index 90% rename from dataline-server/src/test/java/io/dataline/server/handlers/SourceImplementationsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java index 2eaea86950c..1744213e326 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/SourceImplementationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -32,29 +32,29 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.ConnectionUpdate; -import io.dataline.api.model.SourceImplementationCreate; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.api.model.SourceImplementationReadList; -import io.dataline.api.model.SourceImplementationUpdate; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.commons.json.Jsons; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.SourceConnectionSpecification; -import io.dataline.config.StandardSource; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.helpers.ConnectionHelpers; -import io.dataline.server.helpers.SourceHelpers; -import io.dataline.server.helpers.SourceImplementationHelpers; -import io.dataline.server.helpers.SourceSpecificationHelpers; -import io.dataline.server.validation.IntegrationSchemaValidation; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.ConnectionUpdate; +import io.airbyte.api.model.SourceImplementationCreate; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.api.model.SourceImplementationReadList; +import io.airbyte.api.model.SourceImplementationUpdate; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.SourceConnectionSpecification; +import io.airbyte.config.StandardSource; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.helpers.ConnectionHelpers; +import io.airbyte.server.helpers.SourceHelpers; +import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.server.helpers.SourceSpecificationHelpers; +import io.airbyte.server.validation.IntegrationSchemaValidation; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/SourceSpecificationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceSpecificationsHandlerTest.java similarity index 85% rename from dataline-server/src/test/java/io/dataline/server/handlers/SourceSpecificationsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/SourceSpecificationsHandlerTest.java index 96aa38d9902..8617a0aa83a 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/SourceSpecificationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceSpecificationsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.api.model.SourceIdRequestBody; -import io.dataline.api.model.SourceSpecificationRead; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.SourceConnectionSpecification; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.server.helpers.SourceSpecificationHelpers; +import io.airbyte.api.model.SourceIdRequestBody; +import io.airbyte.api.model.SourceSpecificationRead; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.SourceConnectionSpecification; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.server.helpers.SourceSpecificationHelpers; import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/SourcesHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java similarity index 88% rename from dataline-server/src/test/java/io/dataline/server/handlers/SourcesHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java index 20be66b194d..0600e430e57 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/SourcesHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.api.model.SourceIdRequestBody; -import io.dataline.api.model.SourceRead; -import io.dataline.api.model.SourceReadList; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardSource; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; +import io.airbyte.api.model.SourceIdRequestBody; +import io.airbyte.api.model.SourceRead; +import io.airbyte.api.model.SourceReadList; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardSource; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/WebBackendConnectionsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java similarity index 84% rename from dataline-server/src/test/java/io/dataline/server/handlers/WebBackendConnectionsHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java index d5617d8f8d2..49727e27a04 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/WebBackendConnectionsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,33 +22,33 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.api.model.ConnectionIdRequestBody; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionReadList; -import io.dataline.api.model.JobConfigType; -import io.dataline.api.model.JobListRequestBody; -import io.dataline.api.model.JobRead; -import io.dataline.api.model.JobReadList; -import io.dataline.api.model.SourceImplementationIdRequestBody; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.api.model.WbConnectionRead; -import io.dataline.api.model.WbConnectionReadList; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.commons.enums.Enums; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSource; -import io.dataline.config.StandardSync; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.server.helpers.ConnectionHelpers; -import io.dataline.server.helpers.SourceHelpers; -import io.dataline.server.helpers.SourceImplementationHelpers; +import io.airbyte.api.model.ConnectionIdRequestBody; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionReadList; +import io.airbyte.api.model.JobConfigType; +import io.airbyte.api.model.JobListRequestBody; +import io.airbyte.api.model.JobRead; +import io.airbyte.api.model.JobReadList; +import io.airbyte.api.model.SourceImplementationIdRequestBody; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.api.model.WbConnectionRead; +import io.airbyte.api.model.WbConnectionReadList; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.commons.enums.Enums; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSource; +import io.airbyte.config.StandardSync; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.server.helpers.ConnectionHelpers; +import io.airbyte.server.helpers.SourceHelpers; +import io.airbyte.server.helpers.SourceImplementationHelpers; import java.io.IOException; import java.time.Instant; import java.util.Collections; diff --git a/dataline-server/src/test/java/io/dataline/server/handlers/WorkspacesHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java similarity index 88% rename from dataline-server/src/test/java/io/dataline/server/handlers/WorkspacesHandlerTest.java rename to airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java index 06c45714416..3469094c760 100644 --- a/dataline-server/src/test/java/io/dataline/server/handlers/WorkspacesHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,22 +22,22 @@ * SOFTWARE. */ -package io.dataline.server.handlers; +package io.airbyte.server.handlers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.api.model.SlugRequestBody; -import io.dataline.api.model.WorkspaceIdRequestBody; -import io.dataline.api.model.WorkspaceRead; -import io.dataline.api.model.WorkspaceUpdate; -import io.dataline.commons.json.JsonValidationException; -import io.dataline.config.StandardWorkspace; -import io.dataline.config.persistence.ConfigNotFoundException; -import io.dataline.config.persistence.ConfigRepository; -import io.dataline.config.persistence.PersistenceConstants; +import io.airbyte.api.model.SlugRequestBody; +import io.airbyte.api.model.WorkspaceIdRequestBody; +import io.airbyte.api.model.WorkspaceRead; +import io.airbyte.api.model.WorkspaceUpdate; +import io.airbyte.commons.json.JsonValidationException; +import io.airbyte.config.StandardWorkspace; +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.config.persistence.PersistenceConstants; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; @@ -62,7 +62,7 @@ class WorkspacesHandlerTest { return new StandardWorkspace() .withWorkspaceId(workspaceId) .withCustomerId(UUID.randomUUID()) - .withEmail("test@dataline.io") + .withEmail("test@airbyte.io") .withName("test workspace") .withSlug("default") .withInitialSetupComplete(false); @@ -115,7 +115,7 @@ class WorkspacesHandlerTest { final StandardWorkspace expectedWorkspace = new StandardWorkspace() .withWorkspaceId(workspace.getWorkspaceId()) .withCustomerId(workspace.getCustomerId()) - .withEmail("test@dataline.io") + .withEmail("test@airbyte.io") .withName("test workspace") .withSlug("default") .withAnonymousDataCollection(true) diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/ConnectionHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/ConnectionHelpers.java similarity index 87% rename from dataline-server/src/test/java/io/dataline/server/helpers/ConnectionHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/ConnectionHelpers.java index 748d6df2cc3..7377715fb9c 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/ConnectionHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/ConnectionHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,22 +22,22 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; import com.google.common.collect.Lists; -import io.dataline.api.model.ConnectionRead; -import io.dataline.api.model.ConnectionSchedule; -import io.dataline.api.model.ConnectionStatus; -import io.dataline.api.model.SourceSchema; -import io.dataline.api.model.SourceSchemaField; -import io.dataline.api.model.SourceSchemaStream; -import io.dataline.config.DataType; -import io.dataline.config.Field; -import io.dataline.config.Schedule; -import io.dataline.config.Schema; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncSchedule; -import io.dataline.config.Stream; +import io.airbyte.api.model.ConnectionRead; +import io.airbyte.api.model.ConnectionSchedule; +import io.airbyte.api.model.ConnectionStatus; +import io.airbyte.api.model.SourceSchema; +import io.airbyte.api.model.SourceSchemaField; +import io.airbyte.api.model.SourceSchemaStream; +import io.airbyte.config.DataType; +import io.airbyte.config.Field; +import io.airbyte.config.Schedule; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncSchedule; +import io.airbyte.config.Stream; import java.util.UUID; public class ConnectionHelpers { @@ -85,7 +85,7 @@ public class ConnectionHelpers { public static SourceSchema generateBasicApiSchema() { final SourceSchemaField field = new SourceSchemaField() - .dataType(io.dataline.api.model.DataType.STRING) + .dataType(io.airbyte.api.model.DataType.STRING) .name("id") .selected(true); diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationHelpers.java similarity index 92% rename from dataline-server/src/test/java/io/dataline/server/helpers/DestinationHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationHelpers.java index cb9b5647666..0f336821c1f 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; -import io.dataline.config.StandardDestination; +import io.airbyte.config.StandardDestination; import java.util.UUID; public class DestinationHelpers { diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationImplementationHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationImplementationHelpers.java similarity index 89% rename from dataline-server/src/test/java/io/dataline/server/helpers/DestinationImplementationHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationImplementationHelpers.java index 605067d1306..cf13d017e75 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationImplementationHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationImplementationHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DestinationConnectionImplementation; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DestinationConnectionImplementation; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -37,7 +37,7 @@ public class DestinationImplementationHelpers { public static JsonNode getTestImplementationJson() throws IOException { final Path path = - Paths.get("../dataline-server/src/test/resources/json/TestImplementation.json"); + Paths.get("../airbyte-server/src/test/resources/json/TestImplementation.json"); return Jsons.deserialize(Files.readString(path)); } diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationSpecificationHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationSpecificationHelpers.java similarity index 88% rename from dataline-server/src/test/java/io/dataline/server/helpers/DestinationSpecificationHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationSpecificationHelpers.java index 667d02c2f8d..12bc35c7a87 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/DestinationSpecificationHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/DestinationSpecificationHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DestinationConnectionSpecification; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DestinationConnectionSpecification; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -43,7 +43,7 @@ public class DestinationSpecificationHelpers { final UUID destinationSpecificationId = UUID.randomUUID(); final Path path = - Paths.get("../dataline-server/src/test/resources/json/TestSpecification.json"); + Paths.get("../airbyte-server/src/test/resources/json/TestSpecification.json"); return new DestinationConnectionSpecification() .withDestinationId(destinationId) diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/SourceHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceHelpers.java similarity index 92% rename from dataline-server/src/test/java/io/dataline/server/helpers/SourceHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/SourceHelpers.java index 6358ea52bcf..22a2875f903 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/SourceHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; -import io.dataline.config.StandardSource; +import io.airbyte.config.StandardSource; import java.util.UUID; public class SourceHelpers { diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/SourceImplementationHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceImplementationHelpers.java similarity index 88% rename from dataline-server/src/test/java/io/dataline/server/helpers/SourceImplementationHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/SourceImplementationHelpers.java index dc11b1e255c..98a99d65dcf 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/SourceImplementationHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceImplementationHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,13 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.api.model.SourceImplementationRead; -import io.dataline.commons.json.Jsons; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSource; +import io.airbyte.api.model.SourceImplementationRead; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSource; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -54,7 +54,7 @@ public class SourceImplementationHelpers { } public static JsonNode getTestImplementationJson() throws IOException { - final Path path = Paths.get("../dataline-server/src/test/resources/json/TestImplementation.json"); + final Path path = Paths.get("../airbyte-server/src/test/resources/json/TestImplementation.json"); return Jsons.deserialize(Files.readString(path)); } diff --git a/dataline-server/src/test/java/io/dataline/server/helpers/SourceSpecificationHelpers.java b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceSpecificationHelpers.java similarity index 87% rename from dataline-server/src/test/java/io/dataline/server/helpers/SourceSpecificationHelpers.java rename to airbyte-server/src/test/java/io/airbyte/server/helpers/SourceSpecificationHelpers.java index 2097af1c7aa..f16d17236e3 100644 --- a/dataline-server/src/test/java/io/dataline/server/helpers/SourceSpecificationHelpers.java +++ b/airbyte-server/src/test/java/io/airbyte/server/helpers/SourceSpecificationHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.server.helpers; +package io.airbyte.server.helpers; -import io.dataline.commons.json.Jsons; -import io.dataline.config.SourceConnectionSpecification; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.SourceConnectionSpecification; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -41,7 +41,7 @@ public class SourceSpecificationHelpers { public static SourceConnectionSpecification generateSourceSpecification(UUID sourceId) throws IOException { final UUID sourceSpecificationId = UUID.randomUUID(); - final Path path = Paths.get("../dataline-server/src/test/resources/json/TestSpecification.json"); + final Path path = Paths.get("../airbyte-server/src/test/resources/json/TestSpecification.json"); return new SourceConnectionSpecification() .withSourceId(sourceId) diff --git a/airbyte-server/src/test/resources/json/TestImplementation.json b/airbyte-server/src/test/resources/json/TestImplementation.json new file mode 100644 index 00000000000..3c88772c28c --- /dev/null +++ b/airbyte-server/src/test/resources/json/TestImplementation.json @@ -0,0 +1,4 @@ +{ + "apiKey": "123-abc", + "hostname": "airbyte.io" +} diff --git a/dataline-server/src/test/resources/json/TestSpecification.json b/airbyte-server/src/test/resources/json/TestSpecification.json similarity index 76% rename from dataline-server/src/test/resources/json/TestSpecification.json rename to airbyte-server/src/test/resources/json/TestSpecification.json index e9688d232ca..399ab4e9842 100644 --- a/dataline-server/src/test/resources/json/TestSpecification.json +++ b/airbyte-server/src/test/resources/json/TestSpecification.json @@ -1,7 +1,7 @@ { "specification": { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-server/src/test/resources/json/TestSpecification.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-server/src/test/resources/json/TestSpecification.json", "title": "TestSpecification", "description": "information output by the connection.", "type": "object", diff --git a/dataline-singer/build.gradle b/airbyte-singer/build.gradle similarity index 85% rename from dataline-singer/build.gradle rename to airbyte-singer/build.gradle index de93860b36d..915a8ecb94c 100644 --- a/dataline-singer/build.gradle +++ b/airbyte-singer/build.gradle @@ -7,14 +7,14 @@ dependencies { } jsonSchema2Pojo { - // todo (cgardens) - this path cannot be the same as the one in dataline-configs:model, + // todo (cgardens) - this path cannot be the same as the one in airbyte-configs:model, // otherwise they clobber each other, when we are accessing them as java resources. // we need to find a more graceful way of handling this issue, but for now this keeps // us moving forward. source = files("${sourceSets.main.output.resourcesDir}/singer_json") targetDirectory = new File(project.buildDir, 'generated/src/gen/java/') - targetPackage = 'io.dataline.singer' + targetPackage = 'io.airbyte.singer' useLongIntegers = true removeOldOutput = true @@ -26,13 +26,13 @@ jsonSchema2Pojo { task postprocess { doFirst { - def original = new File(project.buildDir, 'generated/src/gen/java/io/dataline/singer/SingerColumn.java') + def original = new File(project.buildDir, 'generated/src/gen/java/io/airbyte/singer/SingerColumn.java') def lines = original.readLines() original.withWriter('utf-8') { writer -> lines.each { if (it.contains("private List type")) - writer.writeLine(" @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = io.dataline.singer.SingerTypeDeserializer.class)") + writer.writeLine(" @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = io.airbyte.singer.SingerTypeDeserializer.class)") writer.writeLine(it) } } diff --git a/dataline-singer/src/main/java/io/dataline/singer/SingerConfigSchema.java b/airbyte-singer/src/main/java/io/airbyte/singer/SingerConfigSchema.java similarity index 94% rename from dataline-singer/src/main/java/io/dataline/singer/SingerConfigSchema.java rename to airbyte-singer/src/main/java/io/airbyte/singer/SingerConfigSchema.java index a6bef75bcf6..c0cfd98d013 100644 --- a/dataline-singer/src/main/java/io/dataline/singer/SingerConfigSchema.java +++ b/airbyte-singer/src/main/java/io/airbyte/singer/SingerConfigSchema.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.singer; +package io.airbyte.singer; -import io.dataline.commons.io.IOs; -import io.dataline.commons.resources.MoreResources; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.resources.MoreResources; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/dataline-singer/src/main/java/io/dataline/singer/SingerTypeDeserializer.java b/airbyte-singer/src/main/java/io/airbyte/singer/SingerTypeDeserializer.java similarity index 96% rename from dataline-singer/src/main/java/io/dataline/singer/SingerTypeDeserializer.java rename to airbyte-singer/src/main/java/io/airbyte/singer/SingerTypeDeserializer.java index 8afebf0d799..dff8242c59f 100644 --- a/dataline-singer/src/main/java/io/dataline/singer/SingerTypeDeserializer.java +++ b/airbyte-singer/src/main/java/io/airbyte/singer/SingerTypeDeserializer.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.singer; +package io.airbyte.singer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.ObjectCodec; @@ -33,7 +33,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import com.fasterxml.jackson.databind.type.ArrayType; import com.fasterxml.jackson.databind.type.SimpleType; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/dataline-singer/src/main/resources/singer_json/SingerCatalog.json b/airbyte-singer/src/main/resources/singer_json/SingerCatalog.json similarity index 98% rename from dataline-singer/src/main/resources/singer_json/SingerCatalog.json rename to airbyte-singer/src/main/resources/singer_json/SingerCatalog.json index 0dae3d479f1..c838cabcf84 100644 --- a/dataline-singer/src/main/resources/singer_json/SingerCatalog.json +++ b/airbyte-singer/src/main/resources/singer_json/SingerCatalog.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/SingerCatalog.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/SingerCatalog.json", "title": "SingerCatalog", "description": "the schema of the singer catalog", "type": "object", diff --git a/dataline-singer/src/main/resources/singer_json/SingerMessage.json b/airbyte-singer/src/main/resources/singer_json/SingerMessage.json similarity index 93% rename from dataline-singer/src/main/resources/singer_json/SingerMessage.json rename to airbyte-singer/src/main/resources/singer_json/SingerMessage.json index b13597233a1..d2bbf1b6be2 100644 --- a/dataline-singer/src/main/resources/singer_json/SingerMessage.json +++ b/airbyte-singer/src/main/resources/singer_json/SingerMessage.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://github.com/datalineio/dataline/blob/master/dataline-config/src/main/resources/json/SingerMessage.json", + "$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/src/main/resources/json/SingerMessage.json", "title": "SingerMessage", "description": "This is a compromise. Java codegen doesn't support union types. So we need to just make a flat json schema that looks like at of the possible permutations of a singer message. See the description for each field to see which message type that field belongs to.", "type": "object", diff --git a/dataline-singer/src/test/java/io/dataline/singer/SingerConfigSchemaTest.java b/airbyte-singer/src/test/java/io/airbyte/singer/SingerConfigSchemaTest.java similarity index 96% rename from dataline-singer/src/test/java/io/dataline/singer/SingerConfigSchemaTest.java rename to airbyte-singer/src/test/java/io/airbyte/singer/SingerConfigSchemaTest.java index 99a2ebcf4a3..8fcbaab5fe9 100644 --- a/dataline-singer/src/test/java/io/dataline/singer/SingerConfigSchemaTest.java +++ b/airbyte-singer/src/test/java/io/airbyte/singer/SingerConfigSchemaTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.singer; +package io.airbyte.singer; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/dataline-singer/src/test/java/io/dataline/singer/SingerTypeDeserializerTest.java b/airbyte-singer/src/test/java/io/airbyte/singer/SingerTypeDeserializerTest.java similarity index 95% rename from dataline-singer/src/test/java/io/dataline/singer/SingerTypeDeserializerTest.java rename to airbyte-singer/src/test/java/io/airbyte/singer/SingerTypeDeserializerTest.java index 4f28234c9e6..35402f4cd14 100644 --- a/dataline-singer/src/test/java/io/dataline/singer/SingerTypeDeserializerTest.java +++ b/airbyte-singer/src/test/java/io/airbyte/singer/SingerTypeDeserializerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.singer; +package io.airbyte.singer; import com.google.common.collect.Lists; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dataline-test-utils/build.gradle b/airbyte-test-utils/build.gradle similarity index 100% rename from dataline-test-utils/build.gradle rename to airbyte-test-utils/build.gradle diff --git a/dataline-test-utils/src/main/java/io/dataline/test/utils/PostgreSQLContainerHelper.java b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/PostgreSQLContainerHelper.java similarity index 96% rename from dataline-test-utils/src/main/java/io/dataline/test/utils/PostgreSQLContainerHelper.java rename to airbyte-test-utils/src/main/java/io/airbyte/test/utils/PostgreSQLContainerHelper.java index b35139add49..27449ae4140 100644 --- a/dataline-test-utils/src/main/java/io/dataline/test/utils/PostgreSQLContainerHelper.java +++ b/airbyte-test-utils/src/main/java/io/airbyte/test/utils/PostgreSQLContainerHelper.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.test.utils; +package io.airbyte.test.utils; import java.io.IOException; import java.util.UUID; diff --git a/dataline-tests/build.gradle b/airbyte-tests/build.gradle similarity index 85% rename from dataline-tests/build.gradle rename to airbyte-tests/build.gradle index 8ec50805688..728bcbfd801 100644 --- a/dataline-tests/build.gradle +++ b/airbyte-tests/build.gradle @@ -24,10 +24,10 @@ configurations { } dependencies { - acceptanceTestsImplementation project(':dataline-api') - acceptanceTestsImplementation project(':dataline-config:persistence') - acceptanceTestsImplementation project(':dataline-db') - acceptanceTestsImplementation project(':dataline-test-utils') + acceptanceTestsImplementation project(':airbyte-api') + acceptanceTestsImplementation project(':airbyte-config:persistence') + acceptanceTestsImplementation project(':airbyte-db') + acceptanceTestsImplementation project(':airbyte-test-utils') acceptanceTestsImplementation "org.testcontainers:postgresql:1.14.3" acceptanceTestsImplementation "org.postgresql:postgresql:42.2.16" diff --git a/dataline-tests/src/acceptanceTests/java/io/dataline/test/acceptance/AcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java similarity index 91% rename from dataline-tests/src/acceptanceTests/java/io/dataline/test/acceptance/AcceptanceTests.java rename to airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java index 837be26dbec..560c91e6563 100644 --- a/dataline-tests/src/acceptanceTests/java/io/dataline/test/acceptance/AcceptanceTests.java +++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/AcceptanceTests.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,39 +22,39 @@ * SOFTWARE. */ -package io.dataline.test.acceptance; +package io.airbyte.test.acceptance; -import static io.dataline.api.client.model.ConnectionSchedule.TimeUnitEnum.MINUTES; +import static io.airbyte.api.client.model.ConnectionSchedule.TimeUnitEnum.MINUTES; import static java.time.temporal.ChronoUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.common.collect.ImmutableMap; -import io.dataline.api.client.DatalineApiClient; -import io.dataline.api.client.invoker.ApiClient; -import io.dataline.api.client.invoker.ApiException; -import io.dataline.api.client.model.CheckConnectionRead; -import io.dataline.api.client.model.ConnectionCreate; -import io.dataline.api.client.model.ConnectionIdRequestBody; -import io.dataline.api.client.model.ConnectionRead; -import io.dataline.api.client.model.ConnectionSchedule; -import io.dataline.api.client.model.ConnectionStatus; -import io.dataline.api.client.model.ConnectionSyncRead; -import io.dataline.api.client.model.ConnectionUpdate; -import io.dataline.api.client.model.DestinationIdRequestBody; -import io.dataline.api.client.model.DestinationImplementationCreate; -import io.dataline.api.client.model.DestinationImplementationIdRequestBody; -import io.dataline.api.client.model.DestinationImplementationRead; -import io.dataline.api.client.model.SourceIdRequestBody; -import io.dataline.api.client.model.SourceImplementationCreate; -import io.dataline.api.client.model.SourceImplementationIdRequestBody; -import io.dataline.api.client.model.SourceImplementationRead; -import io.dataline.api.client.model.SourceSchema; -import io.dataline.api.client.model.SourceSpecificationRead; -import io.dataline.commons.json.Jsons; -import io.dataline.commons.resources.MoreResources; -import io.dataline.config.persistence.PersistenceConstants; -import io.dataline.db.DatabaseHelper; -import io.dataline.test.utils.PostgreSQLContainerHelper; +import io.airbyte.api.client.AirbyteApiClient; +import io.airbyte.api.client.invoker.ApiClient; +import io.airbyte.api.client.invoker.ApiException; +import io.airbyte.api.client.model.CheckConnectionRead; +import io.airbyte.api.client.model.ConnectionCreate; +import io.airbyte.api.client.model.ConnectionIdRequestBody; +import io.airbyte.api.client.model.ConnectionRead; +import io.airbyte.api.client.model.ConnectionSchedule; +import io.airbyte.api.client.model.ConnectionStatus; +import io.airbyte.api.client.model.ConnectionSyncRead; +import io.airbyte.api.client.model.ConnectionUpdate; +import io.airbyte.api.client.model.DestinationIdRequestBody; +import io.airbyte.api.client.model.DestinationImplementationCreate; +import io.airbyte.api.client.model.DestinationImplementationIdRequestBody; +import io.airbyte.api.client.model.DestinationImplementationRead; +import io.airbyte.api.client.model.SourceIdRequestBody; +import io.airbyte.api.client.model.SourceImplementationCreate; +import io.airbyte.api.client.model.SourceImplementationIdRequestBody; +import io.airbyte.api.client.model.SourceImplementationRead; +import io.airbyte.api.client.model.SourceSchema; +import io.airbyte.api.client.model.SourceSpecificationRead; +import io.airbyte.commons.json.Jsons; +import io.airbyte.commons.resources.MoreResources; +import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.db.DatabaseHelper; +import io.airbyte.test.utils.PostgreSQLContainerHelper; import java.io.IOException; import java.sql.SQLException; import java.time.Duration; @@ -89,7 +89,7 @@ public class AcceptanceTests { private PostgreSQLContainer sourcePsql; private PostgreSQLContainer targetPsql; - private DatalineApiClient apiClient = new DatalineApiClient( + private AirbyteApiClient apiClient = new AirbyteApiClient( new ApiClient().setScheme("http") .setHost("localhost") .setPort(8001) @@ -258,7 +258,7 @@ public class AcceptanceTests { createConnection(connectionName, sourceImplId, destinationImplId, schema, connectionSchedule, syncMode); - // When a new connection is created, Dataline might sync it immediately (before the sync interval). + // When a new connection is created, Airbyte might sync it immediately (before the sync interval). // Then it will wait the sync interval. Thread.sleep(Duration.of(30, SECONDS).toMillis()); assertSourceAndTargetDbInSync(sourcePsql, targetPsql); diff --git a/dataline-tests/src/acceptanceTests/resources/simple_postgres_init.sql b/airbyte-tests/src/acceptanceTests/resources/simple_postgres_init.sql similarity index 100% rename from dataline-tests/src/acceptanceTests/resources/simple_postgres_init.sql rename to airbyte-tests/src/acceptanceTests/resources/simple_postgres_init.sql diff --git a/dataline-tests/src/acceptanceTests/resources/simple_postgres_source_schema.json b/airbyte-tests/src/acceptanceTests/resources/simple_postgres_source_schema.json similarity index 100% rename from dataline-tests/src/acceptanceTests/resources/simple_postgres_source_schema.json rename to airbyte-tests/src/acceptanceTests/resources/simple_postgres_source_schema.json diff --git a/dataline-webapp/.dockerignore b/airbyte-webapp/.dockerignore similarity index 100% rename from dataline-webapp/.dockerignore rename to airbyte-webapp/.dockerignore diff --git a/dataline-webapp/.eslintrc b/airbyte-webapp/.eslintrc similarity index 98% rename from dataline-webapp/.eslintrc rename to airbyte-webapp/.eslintrc index e5bd28a6b69..7b6d396eb41 100644 --- a/dataline-webapp/.eslintrc +++ b/airbyte-webapp/.eslintrc @@ -4,4 +4,4 @@ "rules": { "prettier/prettier": "error" } -} \ No newline at end of file +} diff --git a/dataline-webapp/.gitattributes b/airbyte-webapp/.gitattributes similarity index 100% rename from dataline-webapp/.gitattributes rename to airbyte-webapp/.gitattributes diff --git a/dataline-webapp/.gitignore b/airbyte-webapp/.gitignore similarity index 100% rename from dataline-webapp/.gitignore rename to airbyte-webapp/.gitignore diff --git a/dataline-webapp/Dockerfile b/airbyte-webapp/Dockerfile similarity index 100% rename from dataline-webapp/Dockerfile rename to airbyte-webapp/Dockerfile diff --git a/dataline-webapp/README.md b/airbyte-webapp/README.md similarity index 100% rename from dataline-webapp/README.md rename to airbyte-webapp/README.md diff --git a/dataline-webapp/build.gradle b/airbyte-webapp/build.gradle similarity index 100% rename from dataline-webapp/build.gradle rename to airbyte-webapp/build.gradle diff --git a/dataline-webapp/config-overrides.js b/airbyte-webapp/config-overrides.js similarity index 100% rename from dataline-webapp/config-overrides.js rename to airbyte-webapp/config-overrides.js diff --git a/dataline-webapp/nginx/default.conf b/airbyte-webapp/nginx/default.conf similarity index 100% rename from dataline-webapp/nginx/default.conf rename to airbyte-webapp/nginx/default.conf diff --git a/dataline-webapp/package-lock.json b/airbyte-webapp/package-lock.json similarity index 99% rename from dataline-webapp/package-lock.json rename to airbyte-webapp/package-lock.json index d881f8f9483..c3612b64b61 100644 --- a/dataline-webapp/package-lock.json +++ b/airbyte-webapp/package-lock.json @@ -1,5 +1,5 @@ { - "name": "dataline-webapp", + "name": "airbyte-webapp", "version": "0.1.0", "lockfileVersion": 1, "requires": true, diff --git a/dataline-webapp/package.json b/airbyte-webapp/package.json similarity index 98% rename from dataline-webapp/package.json rename to airbyte-webapp/package.json index 28dc3bdfe8a..73ad47e916f 100644 --- a/dataline-webapp/package.json +++ b/airbyte-webapp/package.json @@ -1,5 +1,5 @@ { - "name": "dataline-webapp", + "name": "airbyte-webapp", "version": "0.1.0", "private": true, "scripts": { diff --git a/dataline-webapp/public/cactus.png b/airbyte-webapp/public/cactus.png similarity index 100% rename from dataline-webapp/public/cactus.png rename to airbyte-webapp/public/cactus.png diff --git a/dataline-webapp/public/default-logo-catalog.svg b/airbyte-webapp/public/default-logo-catalog.svg similarity index 100% rename from dataline-webapp/public/default-logo-catalog.svg rename to airbyte-webapp/public/default-logo-catalog.svg diff --git a/dataline-webapp/public/favicon.ico b/airbyte-webapp/public/favicon.ico similarity index 100% rename from dataline-webapp/public/favicon.ico rename to airbyte-webapp/public/favicon.ico diff --git a/dataline-webapp/public/fonts/inter/Inter-Bold.eot b/airbyte-webapp/public/fonts/inter/Inter-Bold.eot similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Bold.eot rename to airbyte-webapp/public/fonts/inter/Inter-Bold.eot diff --git a/dataline-webapp/public/fonts/inter/Inter-Bold.svg b/airbyte-webapp/public/fonts/inter/Inter-Bold.svg similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Bold.svg rename to airbyte-webapp/public/fonts/inter/Inter-Bold.svg diff --git a/dataline-webapp/public/fonts/inter/Inter-Bold.ttf b/airbyte-webapp/public/fonts/inter/Inter-Bold.ttf similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Bold.ttf rename to airbyte-webapp/public/fonts/inter/Inter-Bold.ttf diff --git a/dataline-webapp/public/fonts/inter/Inter-Bold.woff b/airbyte-webapp/public/fonts/inter/Inter-Bold.woff similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Bold.woff rename to airbyte-webapp/public/fonts/inter/Inter-Bold.woff diff --git a/dataline-webapp/public/fonts/inter/Inter-Bold.woff2 b/airbyte-webapp/public/fonts/inter/Inter-Bold.woff2 similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Bold.woff2 rename to airbyte-webapp/public/fonts/inter/Inter-Bold.woff2 diff --git a/dataline-webapp/public/fonts/inter/Inter-Medium.eot b/airbyte-webapp/public/fonts/inter/Inter-Medium.eot similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Medium.eot rename to airbyte-webapp/public/fonts/inter/Inter-Medium.eot diff --git a/dataline-webapp/public/fonts/inter/Inter-Medium.svg b/airbyte-webapp/public/fonts/inter/Inter-Medium.svg similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Medium.svg rename to airbyte-webapp/public/fonts/inter/Inter-Medium.svg diff --git a/dataline-webapp/public/fonts/inter/Inter-Medium.ttf b/airbyte-webapp/public/fonts/inter/Inter-Medium.ttf similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Medium.ttf rename to airbyte-webapp/public/fonts/inter/Inter-Medium.ttf diff --git a/dataline-webapp/public/fonts/inter/Inter-Medium.woff b/airbyte-webapp/public/fonts/inter/Inter-Medium.woff similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Medium.woff rename to airbyte-webapp/public/fonts/inter/Inter-Medium.woff diff --git a/dataline-webapp/public/fonts/inter/Inter-Medium.woff2 b/airbyte-webapp/public/fonts/inter/Inter-Medium.woff2 similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Medium.woff2 rename to airbyte-webapp/public/fonts/inter/Inter-Medium.woff2 diff --git a/dataline-webapp/public/fonts/inter/Inter-Regular.eot b/airbyte-webapp/public/fonts/inter/Inter-Regular.eot similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Regular.eot rename to airbyte-webapp/public/fonts/inter/Inter-Regular.eot diff --git a/dataline-webapp/public/fonts/inter/Inter-Regular.svg b/airbyte-webapp/public/fonts/inter/Inter-Regular.svg similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Regular.svg rename to airbyte-webapp/public/fonts/inter/Inter-Regular.svg diff --git a/dataline-webapp/public/fonts/inter/Inter-Regular.ttf b/airbyte-webapp/public/fonts/inter/Inter-Regular.ttf similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Regular.ttf rename to airbyte-webapp/public/fonts/inter/Inter-Regular.ttf diff --git a/dataline-webapp/public/fonts/inter/Inter-Regular.woff b/airbyte-webapp/public/fonts/inter/Inter-Regular.woff similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Regular.woff rename to airbyte-webapp/public/fonts/inter/Inter-Regular.woff diff --git a/dataline-webapp/public/fonts/inter/Inter-Regular.woff2 b/airbyte-webapp/public/fonts/inter/Inter-Regular.woff2 similarity index 100% rename from dataline-webapp/public/fonts/inter/Inter-Regular.woff2 rename to airbyte-webapp/public/fonts/inter/Inter-Regular.woff2 diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Bold.eot b/airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.eot similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Bold.eot rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.eot diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Bold.svg b/airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.svg similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Bold.svg rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.svg diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Bold.ttf b/airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.ttf similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Bold.ttf rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.ttf diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Bold.woff b/airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.woff similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Bold.woff rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.woff diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Bold.woff2 b/airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.woff2 similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Bold.woff2 rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Bold.woff2 diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Regular.eot b/airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.eot similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Regular.eot rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.eot diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Regular.svg b/airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.svg similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Regular.svg rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.svg diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Regular.ttf b/airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.ttf similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Regular.ttf rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.ttf diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Regular.woff b/airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.woff similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Regular.woff rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.woff diff --git a/dataline-webapp/public/fonts/montserrat/Montserrat-Regular.woff2 b/airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.woff2 similarity index 100% rename from dataline-webapp/public/fonts/montserrat/Montserrat-Regular.woff2 rename to airbyte-webapp/public/fonts/montserrat/Montserrat-Regular.woff2 diff --git a/dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.eot b/airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.eot similarity index 100% rename from dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.eot rename to airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.eot diff --git a/dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.svg b/airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.svg similarity index 100% rename from dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.svg rename to airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.svg diff --git a/dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.ttf b/airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.ttf similarity index 100% rename from dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.ttf rename to airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.ttf diff --git a/dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff b/airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff similarity index 100% rename from dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff rename to airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff diff --git a/dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff2 b/airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff2 similarity index 100% rename from dataline-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff2 rename to airbyte-webapp/public/fonts/robotoMono/RobotoMono-Regular.woff2 diff --git a/dataline-webapp/public/index.html b/airbyte-webapp/public/index.html similarity index 95% rename from dataline-webapp/public/index.html rename to airbyte-webapp/public/index.html index 232c010c260..cf4aedd7645 100644 --- a/dataline-webapp/public/index.html +++ b/airbyte-webapp/public/index.html @@ -11,7 +11,7 @@ /> - Dataline + Airbyte diff --git a/dataline-webapp/public/logo.svg b/airbyte-webapp/public/logo.svg similarity index 99% rename from dataline-webapp/public/logo.svg rename to airbyte-webapp/public/logo.svg index 5d3b724489b..8348ac95517 100644 --- a/dataline-webapp/public/logo.svg +++ b/airbyte-webapp/public/logo.svg @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/dataline-webapp/public/logo112.png b/airbyte-webapp/public/logo112.png similarity index 100% rename from dataline-webapp/public/logo112.png rename to airbyte-webapp/public/logo112.png diff --git a/dataline-webapp/public/logo224.png b/airbyte-webapp/public/logo224.png similarity index 100% rename from dataline-webapp/public/logo224.png rename to airbyte-webapp/public/logo224.png diff --git a/dataline-webapp/public/logo336.png b/airbyte-webapp/public/logo336.png similarity index 100% rename from dataline-webapp/public/logo336.png rename to airbyte-webapp/public/logo336.png diff --git a/dataline-webapp/public/manifest.json b/airbyte-webapp/public/manifest.json similarity index 91% rename from dataline-webapp/public/manifest.json rename to airbyte-webapp/public/manifest.json index 285ed873f5c..fcd8add36ff 100644 --- a/dataline-webapp/public/manifest.json +++ b/airbyte-webapp/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Dataline", - "name": "Dataline", + "short_name": "Airbyte", + "name": "Airbyte", "icons": [ { "src": "favicon.ico", diff --git a/dataline-webapp/public/robots.txt b/airbyte-webapp/public/robots.txt similarity index 100% rename from dataline-webapp/public/robots.txt rename to airbyte-webapp/public/robots.txt diff --git a/dataline-webapp/public/simpleLogo.svg b/airbyte-webapp/public/simpleLogo.svg similarity index 100% rename from dataline-webapp/public/simpleLogo.svg rename to airbyte-webapp/public/simpleLogo.svg diff --git a/dataline-webapp/public/welcome.svg b/airbyte-webapp/public/welcome.svg similarity index 99% rename from dataline-webapp/public/welcome.svg rename to airbyte-webapp/public/welcome.svg index a6744e20ccf..655b6152843 100644 --- a/dataline-webapp/public/welcome.svg +++ b/airbyte-webapp/public/welcome.svg @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/dataline-webapp/src/App.test.tsx b/airbyte-webapp/src/App.test.tsx similarity index 100% rename from dataline-webapp/src/App.test.tsx rename to airbyte-webapp/src/App.test.tsx diff --git a/dataline-webapp/src/App.tsx b/airbyte-webapp/src/App.tsx similarity index 100% rename from dataline-webapp/src/App.tsx rename to airbyte-webapp/src/App.tsx diff --git a/dataline-webapp/src/components/BaseClearView/BaseClearView.tsx b/airbyte-webapp/src/components/BaseClearView/BaseClearView.tsx similarity index 100% rename from dataline-webapp/src/components/BaseClearView/BaseClearView.tsx rename to airbyte-webapp/src/components/BaseClearView/BaseClearView.tsx diff --git a/dataline-webapp/src/components/BaseClearView/index.tsx b/airbyte-webapp/src/components/BaseClearView/index.tsx similarity index 100% rename from dataline-webapp/src/components/BaseClearView/index.tsx rename to airbyte-webapp/src/components/BaseClearView/index.tsx diff --git a/dataline-webapp/src/components/Breadcrumbs/Breadcrumbs.tsx b/airbyte-webapp/src/components/Breadcrumbs/Breadcrumbs.tsx similarity index 100% rename from dataline-webapp/src/components/Breadcrumbs/Breadcrumbs.tsx rename to airbyte-webapp/src/components/Breadcrumbs/Breadcrumbs.tsx diff --git a/dataline-webapp/src/components/Breadcrumbs/index.tsx b/airbyte-webapp/src/components/Breadcrumbs/index.tsx similarity index 100% rename from dataline-webapp/src/components/Breadcrumbs/index.tsx rename to airbyte-webapp/src/components/Breadcrumbs/index.tsx diff --git a/dataline-webapp/src/components/Button/Button.tsx b/airbyte-webapp/src/components/Button/Button.tsx similarity index 100% rename from dataline-webapp/src/components/Button/Button.tsx rename to airbyte-webapp/src/components/Button/Button.tsx diff --git a/dataline-webapp/src/components/Button/index.tsx b/airbyte-webapp/src/components/Button/index.tsx similarity index 100% rename from dataline-webapp/src/components/Button/index.tsx rename to airbyte-webapp/src/components/Button/index.tsx diff --git a/dataline-webapp/src/components/CenteredPageComponents/BigButton.tsx b/airbyte-webapp/src/components/CenteredPageComponents/BigButton.tsx similarity index 100% rename from dataline-webapp/src/components/CenteredPageComponents/BigButton.tsx rename to airbyte-webapp/src/components/CenteredPageComponents/BigButton.tsx diff --git a/dataline-webapp/src/components/CenteredPageComponents/PaddedCard.tsx b/airbyte-webapp/src/components/CenteredPageComponents/PaddedCard.tsx similarity index 100% rename from dataline-webapp/src/components/CenteredPageComponents/PaddedCard.tsx rename to airbyte-webapp/src/components/CenteredPageComponents/PaddedCard.tsx diff --git a/dataline-webapp/src/components/CenteredPageComponents/PageViewContainer.tsx b/airbyte-webapp/src/components/CenteredPageComponents/PageViewContainer.tsx similarity index 100% rename from dataline-webapp/src/components/CenteredPageComponents/PageViewContainer.tsx rename to airbyte-webapp/src/components/CenteredPageComponents/PageViewContainer.tsx diff --git a/dataline-webapp/src/components/CenteredPageComponents/Subtitle.tsx b/airbyte-webapp/src/components/CenteredPageComponents/Subtitle.tsx similarity index 100% rename from dataline-webapp/src/components/CenteredPageComponents/Subtitle.tsx rename to airbyte-webapp/src/components/CenteredPageComponents/Subtitle.tsx diff --git a/dataline-webapp/src/components/CenteredPageComponents/index.tsx b/airbyte-webapp/src/components/CenteredPageComponents/index.tsx similarity index 100% rename from dataline-webapp/src/components/CenteredPageComponents/index.tsx rename to airbyte-webapp/src/components/CenteredPageComponents/index.tsx diff --git a/dataline-webapp/src/components/ConnectionBlock/ConnectionBlock.tsx b/airbyte-webapp/src/components/ConnectionBlock/ConnectionBlock.tsx similarity index 100% rename from dataline-webapp/src/components/ConnectionBlock/ConnectionBlock.tsx rename to airbyte-webapp/src/components/ConnectionBlock/ConnectionBlock.tsx diff --git a/dataline-webapp/src/components/ConnectionBlock/components/Item.tsx b/airbyte-webapp/src/components/ConnectionBlock/components/Item.tsx similarity index 100% rename from dataline-webapp/src/components/ConnectionBlock/components/Item.tsx rename to airbyte-webapp/src/components/ConnectionBlock/components/Item.tsx diff --git a/dataline-webapp/src/components/ConnectionBlock/index.tsx b/airbyte-webapp/src/components/ConnectionBlock/index.tsx similarity index 100% rename from dataline-webapp/src/components/ConnectionBlock/index.tsx rename to airbyte-webapp/src/components/ConnectionBlock/index.tsx diff --git a/dataline-webapp/src/components/ContentCard/ContentCard.tsx b/airbyte-webapp/src/components/ContentCard/ContentCard.tsx similarity index 100% rename from dataline-webapp/src/components/ContentCard/ContentCard.tsx rename to airbyte-webapp/src/components/ContentCard/ContentCard.tsx diff --git a/dataline-webapp/src/components/ContentCard/index.tsx b/airbyte-webapp/src/components/ContentCard/index.tsx similarity index 100% rename from dataline-webapp/src/components/ContentCard/index.tsx rename to airbyte-webapp/src/components/ContentCard/index.tsx diff --git a/dataline-webapp/src/components/DropDown/DropDown.tsx b/airbyte-webapp/src/components/DropDown/DropDown.tsx similarity index 100% rename from dataline-webapp/src/components/DropDown/DropDown.tsx rename to airbyte-webapp/src/components/DropDown/DropDown.tsx diff --git a/dataline-webapp/src/components/DropDown/components/ListItem.tsx b/airbyte-webapp/src/components/DropDown/components/ListItem.tsx similarity index 100% rename from dataline-webapp/src/components/DropDown/components/ListItem.tsx rename to airbyte-webapp/src/components/DropDown/components/ListItem.tsx diff --git a/dataline-webapp/src/components/DropDown/components/Text.tsx b/airbyte-webapp/src/components/DropDown/components/Text.tsx similarity index 100% rename from dataline-webapp/src/components/DropDown/components/Text.tsx rename to airbyte-webapp/src/components/DropDown/components/Text.tsx diff --git a/dataline-webapp/src/components/DropDown/components/ValueInput.tsx b/airbyte-webapp/src/components/DropDown/components/ValueInput.tsx similarity index 100% rename from dataline-webapp/src/components/DropDown/components/ValueInput.tsx rename to airbyte-webapp/src/components/DropDown/components/ValueInput.tsx diff --git a/dataline-webapp/src/components/DropDown/index.tsx b/airbyte-webapp/src/components/DropDown/index.tsx similarity index 100% rename from dataline-webapp/src/components/DropDown/index.tsx rename to airbyte-webapp/src/components/DropDown/index.tsx diff --git a/dataline-webapp/src/components/FrequencyForm/FrequencyForm.tsx b/airbyte-webapp/src/components/FrequencyForm/FrequencyForm.tsx similarity index 100% rename from dataline-webapp/src/components/FrequencyForm/FrequencyForm.tsx rename to airbyte-webapp/src/components/FrequencyForm/FrequencyForm.tsx diff --git a/dataline-webapp/src/components/FrequencyForm/components/BottomBlock.tsx b/airbyte-webapp/src/components/FrequencyForm/components/BottomBlock.tsx similarity index 100% rename from dataline-webapp/src/components/FrequencyForm/components/BottomBlock.tsx rename to airbyte-webapp/src/components/FrequencyForm/components/BottomBlock.tsx diff --git a/dataline-webapp/src/components/FrequencyForm/index.tsx b/airbyte-webapp/src/components/FrequencyForm/index.tsx similarity index 100% rename from dataline-webapp/src/components/FrequencyForm/index.tsx rename to airbyte-webapp/src/components/FrequencyForm/index.tsx diff --git a/dataline-webapp/src/components/ImageBlock/ImageBlock.tsx b/airbyte-webapp/src/components/ImageBlock/ImageBlock.tsx similarity index 100% rename from dataline-webapp/src/components/ImageBlock/ImageBlock.tsx rename to airbyte-webapp/src/components/ImageBlock/ImageBlock.tsx diff --git a/dataline-webapp/src/components/ImageBlock/index.tsx b/airbyte-webapp/src/components/ImageBlock/index.tsx similarity index 100% rename from dataline-webapp/src/components/ImageBlock/index.tsx rename to airbyte-webapp/src/components/ImageBlock/index.tsx diff --git a/dataline-webapp/src/components/Input/Input.tsx b/airbyte-webapp/src/components/Input/Input.tsx similarity index 100% rename from dataline-webapp/src/components/Input/Input.tsx rename to airbyte-webapp/src/components/Input/Input.tsx diff --git a/dataline-webapp/src/components/Input/index.tsx b/airbyte-webapp/src/components/Input/index.tsx similarity index 100% rename from dataline-webapp/src/components/Input/index.tsx rename to airbyte-webapp/src/components/Input/index.tsx diff --git a/dataline-webapp/src/components/Label/Label.tsx b/airbyte-webapp/src/components/Label/Label.tsx similarity index 100% rename from dataline-webapp/src/components/Label/Label.tsx rename to airbyte-webapp/src/components/Label/Label.tsx diff --git a/dataline-webapp/src/components/Label/index.tsx b/airbyte-webapp/src/components/Label/index.tsx similarity index 100% rename from dataline-webapp/src/components/Label/index.tsx rename to airbyte-webapp/src/components/Label/index.tsx diff --git a/dataline-webapp/src/components/LabeledDropDown/LabeledDropDown.tsx b/airbyte-webapp/src/components/LabeledDropDown/LabeledDropDown.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledDropDown/LabeledDropDown.tsx rename to airbyte-webapp/src/components/LabeledDropDown/LabeledDropDown.tsx diff --git a/dataline-webapp/src/components/LabeledDropDown/index.tsx b/airbyte-webapp/src/components/LabeledDropDown/index.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledDropDown/index.tsx rename to airbyte-webapp/src/components/LabeledDropDown/index.tsx diff --git a/dataline-webapp/src/components/LabeledInput/LabeledInput.tsx b/airbyte-webapp/src/components/LabeledInput/LabeledInput.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledInput/LabeledInput.tsx rename to airbyte-webapp/src/components/LabeledInput/LabeledInput.tsx diff --git a/dataline-webapp/src/components/LabeledInput/index.tsx b/airbyte-webapp/src/components/LabeledInput/index.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledInput/index.tsx rename to airbyte-webapp/src/components/LabeledInput/index.tsx diff --git a/dataline-webapp/src/components/LabeledToggle/LabeledToggle.tsx b/airbyte-webapp/src/components/LabeledToggle/LabeledToggle.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledToggle/LabeledToggle.tsx rename to airbyte-webapp/src/components/LabeledToggle/LabeledToggle.tsx diff --git a/dataline-webapp/src/components/LabeledToggle/index.tsx b/airbyte-webapp/src/components/LabeledToggle/index.tsx similarity index 100% rename from dataline-webapp/src/components/LabeledToggle/index.tsx rename to airbyte-webapp/src/components/LabeledToggle/index.tsx diff --git a/dataline-webapp/src/components/Link/Link.tsx b/airbyte-webapp/src/components/Link/Link.tsx similarity index 100% rename from dataline-webapp/src/components/Link/Link.tsx rename to airbyte-webapp/src/components/Link/Link.tsx diff --git a/dataline-webapp/src/components/Link/index.tsx b/airbyte-webapp/src/components/Link/index.tsx similarity index 100% rename from dataline-webapp/src/components/Link/index.tsx rename to airbyte-webapp/src/components/Link/index.tsx diff --git a/dataline-webapp/src/components/LoadingPage/LoadingPage.tsx b/airbyte-webapp/src/components/LoadingPage/LoadingPage.tsx similarity index 100% rename from dataline-webapp/src/components/LoadingPage/LoadingPage.tsx rename to airbyte-webapp/src/components/LoadingPage/LoadingPage.tsx diff --git a/dataline-webapp/src/components/LoadingPage/index.tsx b/airbyte-webapp/src/components/LoadingPage/index.tsx similarity index 100% rename from dataline-webapp/src/components/LoadingPage/index.tsx rename to airbyte-webapp/src/components/LoadingPage/index.tsx diff --git a/dataline-webapp/src/components/MainView/MainView.tsx b/airbyte-webapp/src/components/MainView/MainView.tsx similarity index 100% rename from dataline-webapp/src/components/MainView/MainView.tsx rename to airbyte-webapp/src/components/MainView/MainView.tsx diff --git a/dataline-webapp/src/components/MainView/index.tsx b/airbyte-webapp/src/components/MainView/index.tsx similarity index 100% rename from dataline-webapp/src/components/MainView/index.tsx rename to airbyte-webapp/src/components/MainView/index.tsx diff --git a/dataline-webapp/src/components/Modal/Modal.tsx b/airbyte-webapp/src/components/Modal/Modal.tsx similarity index 100% rename from dataline-webapp/src/components/Modal/Modal.tsx rename to airbyte-webapp/src/components/Modal/Modal.tsx diff --git a/dataline-webapp/src/components/Modal/index.tsx b/airbyte-webapp/src/components/Modal/index.tsx similarity index 100% rename from dataline-webapp/src/components/Modal/index.tsx rename to airbyte-webapp/src/components/Modal/index.tsx diff --git a/dataline-webapp/src/components/PageTitle/PageTitle.tsx b/airbyte-webapp/src/components/PageTitle/PageTitle.tsx similarity index 100% rename from dataline-webapp/src/components/PageTitle/PageTitle.tsx rename to airbyte-webapp/src/components/PageTitle/PageTitle.tsx diff --git a/dataline-webapp/src/components/PageTitle/index.tsx b/airbyte-webapp/src/components/PageTitle/index.tsx similarity index 100% rename from dataline-webapp/src/components/PageTitle/index.tsx rename to airbyte-webapp/src/components/PageTitle/index.tsx diff --git a/dataline-webapp/src/components/ServiceForm/ServiceForm.tsx b/airbyte-webapp/src/components/ServiceForm/ServiceForm.tsx similarity index 100% rename from dataline-webapp/src/components/ServiceForm/ServiceForm.tsx rename to airbyte-webapp/src/components/ServiceForm/ServiceForm.tsx diff --git a/dataline-webapp/src/components/ServiceForm/components/BottomBlock.tsx b/airbyte-webapp/src/components/ServiceForm/components/BottomBlock.tsx similarity index 100% rename from dataline-webapp/src/components/ServiceForm/components/BottomBlock.tsx rename to airbyte-webapp/src/components/ServiceForm/components/BottomBlock.tsx diff --git a/dataline-webapp/src/components/ServiceForm/components/ConstructValidationSchema.tsx b/airbyte-webapp/src/components/ServiceForm/components/ConstructValidationSchema.tsx similarity index 100% rename from dataline-webapp/src/components/ServiceForm/components/ConstructValidationSchema.tsx rename to airbyte-webapp/src/components/ServiceForm/components/ConstructValidationSchema.tsx diff --git a/dataline-webapp/src/components/ServiceForm/components/EditControls.tsx b/airbyte-webapp/src/components/ServiceForm/components/EditControls.tsx similarity index 100% rename from dataline-webapp/src/components/ServiceForm/components/EditControls.tsx rename to airbyte-webapp/src/components/ServiceForm/components/EditControls.tsx diff --git a/dataline-webapp/src/components/ServiceForm/components/FormContent.tsx b/airbyte-webapp/src/components/ServiceForm/components/FormContent.tsx similarity index 100% rename from dataline-webapp/src/components/ServiceForm/components/FormContent.tsx rename to airbyte-webapp/src/components/ServiceForm/components/FormContent.tsx diff --git a/dataline-webapp/src/components/ServiceForm/components/Instruction.tsx b/airbyte-webapp/src/components/ServiceForm/components/Instruction.tsx similarity index 91% rename from dataline-webapp/src/components/ServiceForm/components/Instruction.tsx rename to airbyte-webapp/src/components/ServiceForm/components/Instruction.tsx index e2348d4a0b4..0a0173843b9 100644 --- a/dataline-webapp/src/components/ServiceForm/components/Instruction.tsx +++ b/airbyte-webapp/src/components/ServiceForm/components/Instruction.tsx @@ -24,7 +24,7 @@ const Instruction: React.FC = ({ dropDownData, serviceId }) => { dropDownData && dropDownData.find(item => item.value === serviceId); return service ? ( - + {} diff --git a/dataline-workers/src/main/java/io/dataline/workers/DiscoverSchemaWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DiscoverSchemaWorker.java similarity index 87% rename from dataline-workers/src/main/java/io/dataline/workers/DiscoverSchemaWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/DiscoverSchemaWorker.java index 4280f2e9c96..b7b46d21168 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/DiscoverSchemaWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DiscoverSchemaWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; public interface DiscoverSchemaWorker extends Worker {} diff --git a/dataline-workers/src/main/java/io/dataline/workers/EchoWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java similarity index 96% rename from dataline-workers/src/main/java/io/dataline/workers/EchoWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java index becf66b60c0..b80c265c726 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/EchoWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; import java.nio.file.Path; import org.slf4j.Logger; diff --git a/dataline-workers/src/main/java/io/dataline/workers/JobStatus.java b/airbyte-workers/src/main/java/io/airbyte/workers/JobStatus.java similarity index 95% rename from dataline-workers/src/main/java/io/dataline/workers/JobStatus.java rename to airbyte-workers/src/main/java/io/airbyte/workers/JobStatus.java index 5fa21857e33..965f4568232 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/JobStatus.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/JobStatus.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; /** * Indicates whether the worker's underlying process was successful. E.g this should return diff --git a/dataline-workers/src/main/java/io/dataline/workers/OutputAndStatus.java b/airbyte-workers/src/main/java/io/airbyte/workers/OutputAndStatus.java similarity index 97% rename from dataline-workers/src/main/java/io/dataline/workers/OutputAndStatus.java rename to airbyte-workers/src/main/java/io/airbyte/workers/OutputAndStatus.java index e788554974d..3dd018f1773 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/OutputAndStatus.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/OutputAndStatus.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; import java.util.Objects; import java.util.Optional; diff --git a/dataline-workers/src/main/java/io/dataline/workers/SyncException.java b/airbyte-workers/src/main/java/io/airbyte/workers/SyncException.java similarity index 95% rename from dataline-workers/src/main/java/io/dataline/workers/SyncException.java rename to airbyte-workers/src/main/java/io/airbyte/workers/SyncException.java index 4481bc58cf6..cf6789eba86 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/SyncException.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/SyncException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,6 +22,6 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; public class SyncException extends Exception {} diff --git a/dataline-workers/src/main/java/io/dataline/workers/SyncWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/SyncWorker.java similarity index 88% rename from dataline-workers/src/main/java/io/dataline/workers/SyncWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/SyncWorker.java index 4eccfede2bf..8cdaca693b5 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/SyncWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/SyncWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardSyncOutput; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardSyncOutput; public interface SyncWorker extends Worker {} diff --git a/dataline-workers/src/main/java/io/dataline/workers/Worker.java b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java similarity index 95% rename from dataline-workers/src/main/java/io/dataline/workers/Worker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/Worker.java index 036b0e6e66e..72419a118d0 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/Worker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; import java.nio.file.Path; diff --git a/dataline-workers/src/main/java/io/dataline/workers/WorkerConstants.java b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerConstants.java similarity index 96% rename from dataline-workers/src/main/java/io/dataline/workers/WorkerConstants.java rename to airbyte-workers/src/main/java/io/airbyte/workers/WorkerConstants.java index 419fcc48a91..282170091c6 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/WorkerConstants.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerConstants.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; public class WorkerConstants { diff --git a/dataline-workers/src/main/java/io/dataline/workers/WorkerException.java b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java similarity index 95% rename from dataline-workers/src/main/java/io/dataline/workers/WorkerException.java rename to airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java index 7f2928b68e6..3fa8bfee565 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/WorkerException.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerException.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; public class WorkerException extends Exception { diff --git a/dataline-workers/src/main/java/io/dataline/workers/WorkerUtils.java b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerUtils.java similarity index 94% rename from dataline-workers/src/main/java/io/dataline/workers/WorkerUtils.java rename to airbyte-workers/src/main/java/io/airbyte/workers/WorkerUtils.java index 626669cc4a1..a4e76bf3ddf 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/WorkerUtils.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/WorkerUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardTapConfig; -import io.dataline.config.StandardTargetConfig; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.config.StandardTargetConfig; import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dataline-workers/src/main/java/io/dataline/workers/process/DockerProcessBuilderFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessBuilderFactory.java similarity index 97% rename from dataline-workers/src/main/java/io/dataline/workers/process/DockerProcessBuilderFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessBuilderFactory.java index d2a301f8f44..98aefb00bbc 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/process/DockerProcessBuilderFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/DockerProcessBuilderFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.process; +package io.airbyte.workers.process; import com.google.common.base.Joiner; import com.google.common.collect.Lists; diff --git a/dataline-workers/src/main/java/io/dataline/workers/process/ProcessBuilderFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessBuilderFactory.java similarity index 94% rename from dataline-workers/src/main/java/io/dataline/workers/process/ProcessBuilderFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessBuilderFactory.java index 64d16a92a66..ff0a83b3124 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/process/ProcessBuilderFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/process/ProcessBuilderFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.process; +package io.airbyte.workers.process; import java.nio.file.Path; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactory.java similarity index 95% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactory.java index 8c0e652aa15..7aff327eb70 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.Jsons; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.json.Jsons; +import io.airbyte.singer.SingerMessage; import java.io.BufferedReader; import java.util.Optional; import java.util.stream.Stream; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTap.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTap.java similarity index 89% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTap.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTap.java index 5c245423e8a..45212ae3f48 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTap.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTap.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,25 +22,25 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import io.dataline.commons.io.IOs; -import io.dataline.commons.io.LineGobbler; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.config.StandardTapConfig; -import io.dataline.singer.SingerCatalog; -import io.dataline.singer.SingerMessage; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerException; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.io.LineGobbler; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.singer.SingerCatalog; +import io.airbyte.singer.SingerMessage; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerException; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTarget.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTarget.java similarity index 88% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTarget.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTarget.java index 22e93a4a072..ec530df901d 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/DefaultSingerTarget.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/DefaultSingerTarget.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; -import io.dataline.commons.io.IOs; -import io.dataline.commons.io.LineGobbler; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardTargetConfig; -import io.dataline.singer.SingerMessage; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerException; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.io.LineGobbler; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardTargetConfig; +import io.airbyte.singer.SingerMessage; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerException; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCatalogConverters.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCatalogConverters.java similarity index 88% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCatalogConverters.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCatalogConverters.java index 313023013a7..656f31a92f7 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCatalogConverters.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCatalogConverters.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DataType; -import io.dataline.config.Field; -import io.dataline.config.Schema; -import io.dataline.config.Stream; -import io.dataline.singer.SingerCatalog; -import io.dataline.singer.SingerColumn; -import io.dataline.singer.SingerMetadata; -import io.dataline.singer.SingerMetadataChild; -import io.dataline.singer.SingerStream; -import io.dataline.singer.SingerType; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DataType; +import io.airbyte.config.Field; +import io.airbyte.config.Schema; +import io.airbyte.config.Stream; +import io.airbyte.singer.SingerCatalog; +import io.airbyte.singer.SingerColumn; +import io.airbyte.singer.SingerMetadata; +import io.airbyte.singer.SingerMetadataChild; +import io.airbyte.singer.SingerStream; +import io.airbyte.singer.SingerType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -43,17 +43,17 @@ import java.util.stream.Collectors; public class SingerCatalogConverters { /** - * Takes in a singer catalog and a dataline schema. It then applies the dataline configuration to - * that catalog. e.g. If dataline says that a certain field should or should not be included in the - * sync, this method applies that to the catalog. Thus we produce a valid singer catalog that - * contains configurations stored in dataline. + * Takes in a singer catalog and a airbyte schema. It then applies the airbyte configuration to that + * catalog. e.g. If airbyte says that a certain field should or should not be included in the sync, + * this method applies that to the catalog. Thus we produce a valid singer catalog that contains + * configurations stored in airbyte. * * @param catalog - singer catalog - * @param schema - dataline schema - * @return singer catalog with dataline schema applied to it. + * @param schema - airbyte schema + * @return singer catalog with airbyte schema applied to it. */ public static SingerCatalog applySchemaToDiscoveredCatalog(SingerCatalog catalog, Schema schema) { - Map streamNameToDatalineStream = schema.getStreams() + Map streamNameToAirbyteStream = schema.getStreams() .stream() .collect(Collectors.toMap(Stream::getName, stream -> stream)); @@ -64,12 +64,12 @@ public class SingerCatalogConverters { // recourse here is probably to run discovery again and update sync // configuration. this method just outputs the original metadata. - if (!streamNameToDatalineStream.containsKey(stream.getStream())) { + if (!streamNameToAirbyteStream.containsKey(stream.getStream())) { return stream; } - final Stream datalineStream = streamNameToDatalineStream.get(stream.getStream()); + final Stream airbyteStream = streamNameToAirbyteStream.get(stream.getStream()); final Map fieldNameToField = - datalineStream.getFields() + airbyteStream.getFields() .stream() .collect(Collectors.toMap(Field::getName, field -> field)); @@ -99,7 +99,7 @@ public class SingerCatalogConverters { newSingerMetadata.getMetadata() .withReplicationMethod(SingerMetadataChild.ReplicationMethod.FULL_TABLE) - .withSelected(datalineStream.getSelected()); + .withSelected(airbyteStream.getSelected()); } return newSingerMetadata; }) @@ -122,7 +122,7 @@ public class SingerCatalogConverters { } // assumes discoverable input only. - public static Schema toDatalineSchema(SingerCatalog catalog) { + public static Schema toAirbyteSchema(SingerCatalog catalog) { Map> streamNameToMetadata = getStreamNameToMetadataList(catalog.getStreams()); diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorker.java similarity index 85% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorker.java index 2ce85eb32c8..f0ffec710dd 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,16 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.workers.CheckConnectionWorker; -import io.dataline.workers.DiscoverSchemaWorker; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.workers.CheckConnectionWorker; +import io.airbyte.workers.DiscoverSchemaWorker; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; import java.nio.file.Path; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorker.java similarity index 82% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorker.java index 52d939dc493..902d408b092 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,23 +22,23 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import static io.dataline.workers.JobStatus.FAILED; -import static io.dataline.workers.JobStatus.SUCCESSFUL; +import static io.airbyte.workers.JobStatus.FAILED; +import static io.airbyte.workers.JobStatus.SUCCESSFUL; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.io.IOs; -import io.dataline.commons.io.LineGobbler; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.singer.SingerCatalog; -import io.dataline.workers.DiscoverSchemaWorker; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.io.LineGobbler; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.singer.SingerCatalog; +import io.airbyte.workers.DiscoverSchemaWorker; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.IOException; import java.nio.file.Path; import java.util.concurrent.TimeUnit; @@ -93,7 +93,7 @@ public class SingerDiscoverSchemaWorker implements DiscoverSchemaWorker { return new OutputAndStatus<>( SUCCESSFUL, new StandardDiscoverSchemaOutput() - .withSchema(SingerCatalogConverters.toDatalineSchema(catalog))); + .withSchema(SingerCatalogConverters.toAirbyteSchema(catalog))); } else { LOGGER.debug("Discovery job subprocess finished with exit code {}", exitCode); return new OutputAndStatus<>(FAILED); diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageTracker.java similarity index 94% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageTracker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageTracker.java index d7abb2e4ca9..e17c4a9c0d0 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageTracker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.singer.SingerMessage; +import io.airbyte.singer.SingerMessage; import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageUtils.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageUtils.java similarity index 94% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageUtils.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageUtils.java index 1a9afa19d81..d16d23b357a 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerMessageUtils.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerMessageUtils.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,13 +22,13 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.json.Jsons; +import io.airbyte.singer.SingerMessage; import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerProtocolPredicate.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java similarity index 90% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerProtocolPredicate.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java index 4ce7a048b3b..449d320ccda 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerProtocolPredicate.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.JsonSchemaValidator; -import io.dataline.singer.SingerConfigSchema; +import io.airbyte.commons.json.JsonSchemaValidator; +import io.airbyte.singer.SingerConfigSchema; import java.util.function.Predicate; public class SingerProtocolPredicate implements Predicate { diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerStreamFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerStreamFactory.java similarity index 91% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerStreamFactory.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerStreamFactory.java index ccd3baa4100..97ec9f2c6a3 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerStreamFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerStreamFactory.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,9 +22,9 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.singer.SingerMessage; +import io.airbyte.singer.SingerMessage; import java.io.BufferedReader; import java.util.stream.Stream; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerSyncWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerSyncWorker.java similarity index 86% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerSyncWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerSyncWorker.java index f21208b9b36..5638aa6101f 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerSyncWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerSyncWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardSyncOutput; -import io.dataline.config.StandardSyncSummary; -import io.dataline.config.StandardTapConfig; -import io.dataline.config.StandardTargetConfig; -import io.dataline.config.State; -import io.dataline.singer.SingerMessage; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.SyncWorker; -import io.dataline.workers.WorkerUtils; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardSyncOutput; +import io.airbyte.config.StandardSyncSummary; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.config.StandardTargetConfig; +import io.airbyte.config.State; +import io.airbyte.singer.SingerMessage; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.SyncWorker; +import io.airbyte.workers.WorkerUtils; import java.nio.file.Path; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTap.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTap.java similarity index 89% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTap.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTap.java index 64c92a0611f..8703b08e797 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTap.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTap.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.config.StandardTapConfig; -import io.dataline.singer.SingerMessage; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.singer.SingerMessage; import java.nio.file.Path; import java.util.Optional; diff --git a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTarget.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTarget.java similarity index 86% rename from dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTarget.java rename to airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTarget.java index 5e0e59524ff..8489d8d41a8 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/protocols/singer/SingerTarget.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerTarget.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,11 +22,11 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; -import io.dataline.commons.functional.CheckedConsumer; -import io.dataline.config.StandardTargetConfig; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.functional.CheckedConsumer; +import io.airbyte.config.StandardTargetConfig; +import io.airbyte.singer.SingerMessage; import java.nio.file.Path; public interface SingerTarget extends CheckedConsumer, AutoCloseable { diff --git a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorker.java similarity index 84% rename from dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorker.java index 14e93e7e4ae..a38521e93c4 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.workers.CheckConnectionWorker; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.workers.CheckConnectionWorker; public class JobOutputCheckConnectionWorker extends OutputConvertingWorker { diff --git a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputDiscoverSchemaWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputDiscoverSchemaWorker.java similarity index 84% rename from dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputDiscoverSchemaWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputDiscoverSchemaWorker.java index 321dd4fad14..0eb1849f7fd 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputDiscoverSchemaWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputDiscoverSchemaWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.workers.DiscoverSchemaWorker; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.workers.DiscoverSchemaWorker; public class JobOutputDiscoverSchemaWorker extends OutputConvertingWorker { diff --git a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputSyncWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputSyncWorker.java similarity index 85% rename from dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputSyncWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputSyncWorker.java index 153f63ffa40..d93758a7ce0 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/wrappers/JobOutputSyncWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/JobOutputSyncWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardSyncOutput; -import io.dataline.workers.SyncWorker; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardSyncOutput; +import io.airbyte.workers.SyncWorker; public class JobOutputSyncWorker extends OutputConvertingWorker { diff --git a/dataline-workers/src/main/java/io/dataline/workers/wrappers/OutputConvertingWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/OutputConvertingWorker.java similarity index 93% rename from dataline-workers/src/main/java/io/dataline/workers/wrappers/OutputConvertingWorker.java rename to airbyte-workers/src/main/java/io/airbyte/workers/wrappers/OutputConvertingWorker.java index fe799b147eb..bd2d3fe21eb 100644 --- a/dataline-workers/src/main/java/io/dataline/workers/wrappers/OutputConvertingWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/wrappers/OutputConvertingWorker.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,10 +22,10 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.Worker; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.Worker; import java.nio.file.Path; import java.util.function.Function; diff --git a/dataline-workers/src/test/java/io/dataline/workers/TestConfigHelpers.java b/airbyte-workers/src/test/java/io/airbyte/workers/TestConfigHelpers.java similarity index 89% rename from dataline-workers/src/test/java/io/dataline/workers/TestConfigHelpers.java rename to airbyte-workers/src/test/java/io/airbyte/workers/TestConfigHelpers.java index ee4ca2bab34..f3f454c4b8e 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/TestConfigHelpers.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/TestConfigHelpers.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.workers; +package io.airbyte.workers; import com.fasterxml.jackson.databind.JsonNode; -import io.dataline.commons.json.Jsons; -import io.dataline.config.DataType; -import io.dataline.config.DestinationConnectionImplementation; -import io.dataline.config.Field; -import io.dataline.config.Schema; -import io.dataline.config.SourceConnectionImplementation; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.State; -import io.dataline.config.Stream; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.DataType; +import io.airbyte.config.DestinationConnectionImplementation; +import io.airbyte.config.Field; +import io.airbyte.config.Schema; +import io.airbyte.config.SourceConnectionImplementation; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.State; +import io.airbyte.config.Stream; import java.util.Collections; import java.util.Map; import java.util.UUID; @@ -64,7 +64,7 @@ public class TestConfigHelpers { final JsonNode destinationConnection = Jsons.jsonNode( Map.of( - "username", "dataline", + "username", "airbyte", "token", "anau81b")); final SourceConnectionImplementation sourceConnectionConfig = new SourceConnectionImplementation() diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactoryTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactoryTest.java similarity index 97% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactoryTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactoryTest.java index a1122852ec5..1384522922c 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerStreamFactoryTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerStreamFactoryTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -33,8 +33,8 @@ import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import io.dataline.commons.json.Jsons; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.json.Jsons; +import io.airbyte.singer.SingerMessage; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTapTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTapTest.java similarity index 89% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTapTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTapTest.java index ae24f1cb74c..eb80d15e8d0 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTapTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTapTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,22 +35,22 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.commons.io.IOs; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.config.StandardTapConfig; -import io.dataline.singer.SingerCatalog; -import io.dataline.singer.SingerMessage; -import io.dataline.singer.SingerStream; -import io.dataline.singer.SingerTableSchema; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.TestConfigHelpers; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerException; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.singer.SingerCatalog; +import io.airbyte.singer.SingerMessage; +import io.airbyte.singer.SingerStream; +import io.airbyte.singer.SingerTableSchema; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.TestConfigHelpers; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerException; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTargetTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTargetTest.java similarity index 91% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTargetTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTargetTest.java index 332681e2c2e..595b615230d 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/DefaultSingerTargetTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/DefaultSingerTargetTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; @@ -34,14 +34,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardTargetConfig; -import io.dataline.singer.SingerMessage; -import io.dataline.workers.TestConfigHelpers; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.WorkerException; -import io.dataline.workers.WorkerUtils; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardTargetConfig; +import io.airbyte.singer.SingerMessage; +import io.airbyte.workers.TestConfigHelpers; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.WorkerException; +import io.airbyte.workers.WorkerUtils; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCatalogConvertersTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCatalogConvertersTest.java similarity index 84% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCatalogConvertersTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCatalogConvertersTest.java index 8f081d44441..87613bd922c 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCatalogConvertersTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCatalogConvertersTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,16 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.dataline.commons.json.Jsons; -import io.dataline.commons.resources.MoreResources; -import io.dataline.config.Schema; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.singer.SingerCatalog; -import io.dataline.singer.SingerMetadataChild; +import io.airbyte.commons.json.Jsons; +import io.airbyte.commons.resources.MoreResources; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.singer.SingerCatalog; +import io.airbyte.singer.SingerMetadataChild; import java.io.IOException; import org.junit.jupiter.api.Test; @@ -41,11 +41,11 @@ class SingerCatalogConvertersTest { void applySchemaToDiscoveredCatalog() throws IOException { final SingerCatalog catalog = Jsons.deserialize(MoreResources.readResource("simple_postgres_singer_catalog.json"), SingerCatalog.class); - final Schema datalineSchema = + final Schema airbyteSchema = Jsons.deserialize(MoreResources.readResource("simple_postgres_schema.json"), StandardDiscoverSchemaOutput.class).getSchema(); final SingerCatalog actualCatalog = - SingerCatalogConverters.applySchemaToDiscoveredCatalog(catalog, datalineSchema); + SingerCatalogConverters.applySchemaToDiscoveredCatalog(catalog, airbyteSchema); final SingerCatalog expectedCatalog = Jsons.deserialize(MoreResources.readResource("simple_postgres_singer_catalog.json"), SingerCatalog.class); @@ -64,7 +64,7 @@ class SingerCatalogConvertersTest { } @Test - void toDatalineSchemaWithUnselectedTable() throws IOException { + void toAirbyteSchemaWithUnselectedTable() throws IOException { final SingerCatalog catalog = Jsons.deserialize(MoreResources.readResource("simple_postgres_singer_catalog.json"), SingerCatalog.class); final Schema expectedSchema = @@ -73,13 +73,13 @@ class SingerCatalogConvertersTest { expectedSchema.getStreams().get(0).getFields().get(0).withSelected(true); expectedSchema.getStreams().get(0).getFields().get(1).withSelected(true); - final Schema actualSchema = SingerCatalogConverters.toDatalineSchema(catalog); + final Schema actualSchema = SingerCatalogConverters.toAirbyteSchema(catalog); assertEquals(expectedSchema, actualSchema); } @Test - void toDatalineSchemaWithSelectedTable() throws IOException { + void toAirbyteSchemaWithSelectedTable() throws IOException { final SingerCatalog catalog = Jsons.deserialize(MoreResources.readResource("simple_postgres_singer_catalog.json"), SingerCatalog.class); catalog.getStreams().get(0).getMetadata().get(0).getMetadata().withSelected(true); @@ -90,7 +90,7 @@ class SingerCatalogConvertersTest { expectedSchema.getStreams().get(0).getFields().get(0).withSelected(true); expectedSchema.getStreams().get(0).getFields().get(1).withSelected(true); - final Schema actualSchema = SingerCatalogConverters.toDatalineSchema(catalog); + final Schema actualSchema = SingerCatalogConverters.toAirbyteSchema(catalog); assertEquals(expectedSchema, actualSchema); } diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorkerTest.java similarity index 90% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorkerTest.java index fdbbcc7a787..99b1a245a0d 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerCheckConnectionWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerCheckConnectionWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -33,14 +33,14 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.workers.DiscoverSchemaWorker; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; +import io.airbyte.commons.json.Jsons; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.workers.DiscoverSchemaWorker; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java similarity index 91% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java index 746161c8d3d..3d58a1ded55 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerDiscoverSchemaWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,15 +35,15 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.io.IOs; -import io.dataline.commons.json.Jsons; -import io.dataline.commons.resources.MoreResources; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.WorkerConstants; -import io.dataline.workers.process.ProcessBuilderFactory; +import io.airbyte.commons.io.IOs; +import io.airbyte.commons.json.Jsons; +import io.airbyte.commons.resources.MoreResources; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.WorkerConstants; +import io.airbyte.workers.process.ProcessBuilderFactory; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageTrackerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageTrackerTest.java similarity index 95% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageTrackerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageTrackerTest.java index 7847d44aaeb..27aca6b6351 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageTrackerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageTrackerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,15 +22,15 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; -import io.dataline.commons.json.Jsons; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.json.Jsons; +import io.airbyte.singer.SingerMessage; import org.junit.jupiter.api.Test; class SingerMessageTrackerTest { diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageUtilsTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageUtilsTest.java similarity index 95% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageUtilsTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageUtilsTest.java index 907f9e05104..5b833441582 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerMessageUtilsTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerMessageUtilsTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.jupiter.api.Assertions.*; -import io.dataline.commons.json.Jsons; -import io.dataline.singer.SingerMessage; +import io.airbyte.commons.json.Jsons; +import io.airbyte.singer.SingerMessage; import java.time.Instant; import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerProtocolPredicateTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicateTest.java similarity index 96% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerProtocolPredicateTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicateTest.java index 74f7ee5caa0..5043e1aef0b 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerProtocolPredicateTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicateTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.junit.Assert.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.dataline.commons.json.Jsons; +import io.airbyte.commons.json.Jsons; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerSyncWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerSyncWorkerTest.java similarity index 90% rename from dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerSyncWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerSyncWorkerTest.java index f3d5f69b141..ec20960adb7 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/protocols/singer/SingerSyncWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/protocols/singer/SingerSyncWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,18 +22,18 @@ * SOFTWARE. */ -package io.dataline.workers.protocols.singer; +package io.airbyte.workers.protocols.singer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.config.StandardSync; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardTapConfig; -import io.dataline.config.StandardTargetConfig; -import io.dataline.singer.SingerMessage; -import io.dataline.workers.TestConfigHelpers; +import io.airbyte.config.StandardSync; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardTapConfig; +import io.airbyte.config.StandardTargetConfig; +import io.airbyte.singer.SingerMessage; +import io.airbyte.workers.TestConfigHelpers; import java.nio.file.Path; import java.util.Optional; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorkerTest.java similarity index 86% rename from dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorkerTest.java index 4e7fe27b93c..ba797277954 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputCheckConnectionWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputCheckConnectionWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,19 +22,19 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardCheckConnectionInput; -import io.dataline.config.StandardCheckConnectionOutput; -import io.dataline.workers.CheckConnectionWorker; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardCheckConnectionInput; +import io.airbyte.config.StandardCheckConnectionOutput; +import io.airbyte.workers.CheckConnectionWorker; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputDiscoveryWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputDiscoveryWorkerTest.java similarity index 85% rename from dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputDiscoveryWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputDiscoveryWorkerTest.java index a622773b963..4550205b981 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputDiscoveryWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputDiscoveryWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,14 +30,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.dataline.config.JobOutput; -import io.dataline.config.Schema; -import io.dataline.config.StandardDiscoverSchemaInput; -import io.dataline.config.StandardDiscoverSchemaOutput; -import io.dataline.config.Stream; -import io.dataline.workers.DiscoverSchemaWorker; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; +import io.airbyte.config.JobOutput; +import io.airbyte.config.Schema; +import io.airbyte.config.StandardDiscoverSchemaInput; +import io.airbyte.config.StandardDiscoverSchemaOutput; +import io.airbyte.config.Stream; +import io.airbyte.workers.DiscoverSchemaWorker; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputSyncWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputSyncWorkerTest.java similarity index 86% rename from dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputSyncWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputSyncWorkerTest.java index 3049037d127..566b6c8b3fc 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/wrappers/JobOutputSyncWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/JobOutputSyncWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,20 +22,20 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.dataline.config.JobOutput; -import io.dataline.config.StandardSyncInput; -import io.dataline.config.StandardSyncOutput; -import io.dataline.config.State; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.SyncWorker; +import io.airbyte.config.JobOutput; +import io.airbyte.config.StandardSyncInput; +import io.airbyte.config.StandardSyncOutput; +import io.airbyte.config.State; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.SyncWorker; import java.nio.file.Path; import java.util.UUID; import org.junit.jupiter.api.Test; diff --git a/dataline-workers/src/test/java/io/dataline/workers/wrappers/OutputConvertingWorkerTest.java b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/OutputConvertingWorkerTest.java similarity index 92% rename from dataline-workers/src/test/java/io/dataline/workers/wrappers/OutputConvertingWorkerTest.java rename to airbyte-workers/src/test/java/io/airbyte/workers/wrappers/OutputConvertingWorkerTest.java index e836c82216a..a0ffbcdaf0c 100644 --- a/dataline-workers/src/test/java/io/dataline/workers/wrappers/OutputConvertingWorkerTest.java +++ b/airbyte-workers/src/test/java/io/airbyte/workers/wrappers/OutputConvertingWorkerTest.java @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2020 Dataline + * Copyright (c) 2020 Airbyte * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,16 +22,16 @@ * SOFTWARE. */ -package io.dataline.workers.wrappers; +package io.airbyte.workers.wrappers; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.dataline.workers.JobStatus; -import io.dataline.workers.OutputAndStatus; -import io.dataline.workers.Worker; +import io.airbyte.workers.JobStatus; +import io.airbyte.workers.OutputAndStatus; +import io.airbyte.workers.Worker; import java.nio.file.Path; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/dataline-workers/src/test/resources/simple_discovered_postgres_schema.json b/airbyte-workers/src/test/resources/simple_discovered_postgres_schema.json similarity index 100% rename from dataline-workers/src/test/resources/simple_discovered_postgres_schema.json rename to airbyte-workers/src/test/resources/simple_discovered_postgres_schema.json diff --git a/dataline-workers/src/test/resources/simple_postgres_full_table_sync_catalog.json b/airbyte-workers/src/test/resources/simple_postgres_full_table_sync_catalog.json similarity index 100% rename from dataline-workers/src/test/resources/simple_postgres_full_table_sync_catalog.json rename to airbyte-workers/src/test/resources/simple_postgres_full_table_sync_catalog.json diff --git a/dataline-workers/src/test/resources/simple_postgres_init.sql b/airbyte-workers/src/test/resources/simple_postgres_init.sql similarity index 100% rename from dataline-workers/src/test/resources/simple_postgres_init.sql rename to airbyte-workers/src/test/resources/simple_postgres_init.sql diff --git a/dataline-workers/src/test/resources/simple_postgres_schema.json b/airbyte-workers/src/test/resources/simple_postgres_schema.json similarity index 100% rename from dataline-workers/src/test/resources/simple_postgres_schema.json rename to airbyte-workers/src/test/resources/simple_postgres_schema.json diff --git a/dataline-workers/src/test/resources/simple_postgres_singer_catalog.json b/airbyte-workers/src/test/resources/simple_postgres_singer_catalog.json similarity index 100% rename from dataline-workers/src/test/resources/simple_postgres_singer_catalog.json rename to airbyte-workers/src/test/resources/simple_postgres_singer_catalog.json diff --git a/api_docs/index.html b/api_docs/index.html index d1d162dd9a4..5d38230f05e 100644 --- a/api_docs/index.html +++ b/api_docs/index.html @@ -1,7 +1,7 @@ - Dataline Configuration API + Airbyte Configuration API -

Dataline Configuration API

-

Dataline Configuration API -https://dataline.io.

+

Airbyte Configuration API

+

Airbyte Configuration API +https://airbyte.io.

This API is a collection HTTP RPC-style methods. While it is not a REST API, those familiar with REST should find the conventions of this API recognizable.

Here are some conventions that this API follows:

    @@ -203,7 +203,7 @@ font-style: italic;
More information: https://openapi-generator.tech
-
Contact Info: contact@dataline.io
+
Contact Info: contact@airbyte.io
Version: 1.0.0-oas3
BasePath:
MIT
@@ -777,7 +777,7 @@ font-style: italic;
Up 
post /v1/destinations/list
-
List all of the destinations that Dataline supports (listDestinations)
+
List all of the destinations that Airbyte supports (listDestinations)
@@ -1420,7 +1420,7 @@ font-style: italic;
Up 
post /v1/sources/list
-
List all of the sources that Dataline supports (listSources)
+
List all of the sources that Airbyte supports (listSources)
diff --git a/build.gradle b/build.gradle index b1a76109d24..7d4373ef142 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ if (!env.containsKey('VERSION')) { } allprojects { - group = "io.dataline.${rootProject.name}" + group = "io.airbyte.${rootProject.name}" version = env.VERSION } @@ -70,7 +70,7 @@ spotless { check.dependsOn 'spotlessApply' // Disabled because it generate an obnoxious warning -// TODO: https://github.com/datalineio/dataline/issues/225 +// TODO: https://github.com/airbytehq/airbyte/issues/225 // // cpdCheck { // ignoreFailures = true @@ -90,7 +90,7 @@ allprojects { // Java projects common configurations subprojects { - if (project.name == 'dataline-webapp') { + if (project.name == 'airbyte-webapp') { return } @@ -118,8 +118,8 @@ subprojects { } dependencies { - if (project.name != 'dataline-commons') { - implementation project(':dataline-commons') + if (project.name != 'airbyte-commons') { + implementation project(':airbyte-commons') } implementation(platform("com.fasterxml.jackson:jackson-bom:2.10.4")) diff --git a/dataline-analytics/build.gradle b/dataline-analytics/build.gradle deleted file mode 100644 index 8a217b7289c..00000000000 --- a/dataline-analytics/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - implementation 'com.segment.analytics.java:analytics:2.1.1' - - - implementation project(':dataline-config:models') - implementation project(':dataline-config:persistence') -} diff --git a/dataline-server/src/test/resources/json/TestImplementation.json b/dataline-server/src/test/resources/json/TestImplementation.json deleted file mode 100644 index 793f429e95a..00000000000 --- a/dataline-server/src/test/resources/json/TestImplementation.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "apiKey": "123-abc", - "hostname": "dataline.io" -} diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml index 3136e07de0a..ffa94a49889 100644 --- a/docker-compose.build.yaml +++ b/docker-compose.build.yaml @@ -2,37 +2,37 @@ version: "3.7" services: db: - image: dataline/db:dev + image: airbyte/db:dev build: dockerfile: Dockerfile - context: dataline-db + context: airbyte-db labels: - io.dataline.git-revision: ${GIT_REVISION} + io.airbyte.git-revision: ${GIT_REVISION} seed: - image: dataline/seed:dev + image: airbyte/seed:dev build: dockerfile: Dockerfile - context: dataline-config/init + context: airbyte-config/init labels: - io.dataline.git-revision: ${GIT_REVISION} + io.airbyte.git-revision: ${GIT_REVISION} scheduler: - image: dataline/scheduler:dev + image: airbyte/scheduler:dev build: dockerfile: Dockerfile - context: dataline-scheduler + context: airbyte-scheduler labels: - io.dataline.git-revision: ${GIT_REVISION} + io.airbyte.git-revision: ${GIT_REVISION} server: - image: dataline/server:dev + image: airbyte/server:dev build: dockerfile: Dockerfile - context: dataline-server + context: airbyte-server labels: - io.dataline.git-revision: ${GIT_REVISION} + io.airbyte.git-revision: ${GIT_REVISION} webapp: - image: dataline/webapp:dev + image: airbyte/webapp:dev build: dockerfile: Dockerfile - context: dataline-webapp + context: airbyte-webapp labels: - io.dataline.git-revision: ${GIT_REVISION} + io.airbyte.git-revision: ${GIT_REVISION} diff --git a/docker-compose.yaml b/docker-compose.yaml index e9b234574f1..28f758b7b46 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,8 +6,8 @@ services: init: image: alpine db: - image: dataline/db:${VERSION} - container_name: dataline-db + image: airbyte/db:${VERSION} + container_name: airbyte-db environment: - POSTGRES_USER=${DATABASE_USER} - POSTGRES_PASSWORD=${DATABASE_PASSWORD} @@ -17,8 +17,8 @@ services: depends_on: - init seed: - image: dataline/seed:${VERSION} - container_name: dataline-data-seed + image: airbyte/seed:${VERSION} + container_name: airbyte-data-seed # Pre-populate the volume if it is empty. # See: https://docs.docker.com/storage/volumes/#populate-a-volume-using-a-container volumes: @@ -26,8 +26,8 @@ services: depends_on: - init scheduler: - image: dataline/scheduler:${VERSION} - container_name: dataline-scheduler + image: airbyte/scheduler:${VERSION} + container_name: airbyte-scheduler environment: - DATABASE_USER=${DATABASE_USER} - DATABASE_PASSWORD=${DATABASE_PASSWORD} @@ -46,8 +46,8 @@ services: - db - seed server: - image: dataline/server:${VERSION} - container_name: dataline-server + image: airbyte/server:${VERSION} + container_name: airbyte-server environment: - DATABASE_USER=${DATABASE_USER} - DATABASE_PASSWORD=${DATABASE_PASSWORD} @@ -63,8 +63,8 @@ services: depends_on: - db webapp: - image: dataline/webapp:${VERSION} - container_name: dataline-webapp + image: airbyte/webapp:${VERSION} + container_name: airbyte-webapp ports: - 8000:80 depends_on: diff --git a/docs/.gitbook/assets/dataline_light-background.svg b/docs/.gitbook/assets/airbyte_light-background.svg similarity index 100% rename from docs/.gitbook/assets/dataline_light-background.svg rename to docs/.gitbook/assets/airbyte_light-background.svg diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 5789084199c..8770f813c40 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -5,10 +5,10 @@ ## Deployment -* [Deploying Dataline](deployment/deploying-dataline/README.md) - * [On your workstation](deployment/deploying-dataline/with-docker.md) - * [On AWS \(EC2\)](deployment/deploying-dataline/on-aws-ec2.md) - * [On GCP \(Compute Engine\)](deployment/deploying-dataline/on-gcp-compute-engine.md) +* [Deploying Airbyte](deployment/deploying-airbyte/README.md) + * [On your workstation](deployment/deploying-airbyte/with-docker.md) + * [On AWS \(EC2\)](deployment/deploying-airbyte/on-aws-ec2.md) + * [On GCP \(Compute Engine\)](deployment/deploying-airbyte/on-gcp-compute-engine.md) ## Integrations @@ -20,11 +20,11 @@ ## Contributing -* [Contributing to Dataline](contributing/contributing-to-dataline/README.md) - * [Developing Locally](contributing/contributing-to-dataline/developing-locally.md) - * [Code Style](contributing/contributing-to-dataline/code-style.md) - * [Updating Documentation](contributing/contributing-to-dataline/updating-documentation/README.md) - * [Source Documentation Template](contributing/contributing-to-dataline/updating-documentation/source-documentation-template.md) +* [Contributing to Airbyte](contributing/contributing-to-airbyte/README.md) + * [Developing Locally](contributing/contributing-to-airbyte/developing-locally.md) + * [Code Style](contributing/contributing-to-airbyte/code-style.md) + * [Updating Documentation](contributing/contributing-to-airbyte/updating-documentation/README.md) + * [Source Documentation Template](contributing/contributing-to-airbyte/updating-documentation/source-documentation-template.md) * [Code of Conduct](contributing/code-of-conduct.md) ## Architecture diff --git a/docs/architecture/configuration-data-model.md b/docs/architecture/configuration-data-model.md index 90ab670c3ec..b22dd387365 100644 --- a/docs/architecture/configuration-data-model.md +++ b/docs/architecture/configuration-data-model.md @@ -40,9 +40,9 @@ This section enumerates the full set of features we expect to give to these mode The basic flow will go as follows: * Insert credentials for a source. -* Receive feedback on whether Dataline was able to reach the source with the given credentials. +* Receive feedback on whether Airbyte was able to reach the source with the given credentials. * Insert credentials for a destination. -* Receive feedback on whether Dataline was able to reach the destination with the given credentials. +* Receive feedback on whether Airbyte was able to reach the destination with the given credentials. * Show intent to connect source to destination. * Receives schema of the source. * Selects which part of the schema will be synced. @@ -54,7 +54,7 @@ The basic flow will go as follows: #### SourceConnectionConfiguration -Any credentials needed to establish a connection with the data source. This configuration will look difference for each source. Dataline only enforces that it is valid json-schema. Here is an example of one might look like for a postgres tap. +Any credentials needed to establish a connection with the data source. This configuration will look difference for each source. Airbyte only enforces that it is valid json-schema. Here is an example of one might look like for a postgres tap. ```javascript { @@ -120,7 +120,7 @@ Any credentials needed to establish a connection with the data source. This conf This is the output of the `testConnection` method. It is the same schema for ALL taps. -The type declaration can be found [here](https://github.com/datalineio/dataline/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/dataline-config/src/main/resources/json/StandardConnectionStatus.json). +The type declaration can be found [here](https://github.com/airbytehq/airbyte/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/airbyte-config/src/main/resources/json/StandardConnectionStatus.json). #### StandardDiscoveryOutput @@ -128,7 +128,7 @@ This is the output of the `discoverSchema` method. It is the same schema for ALL The schema for the `schema` field. This will get reused elsewhere. -The type declaration can be found [here](https://github.com/datalineio/dataline/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/dataline-config/src/main/resources/json/StandardDiscoveryOutput.json). +The type declaration can be found [here](https://github.com/airbytehq/airbyte/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/airbyte-config/src/main/resources/json/StandardDiscoveryOutput.json). ### Source Methods @@ -180,7 +180,7 @@ testConnection(DestinationConnectionConfiguration) => StandardConnectionStatus Configuration that is the SAME for all tap / target combinations. Describes the sync mode \(full refresh or append\) as well what part of the schema will be synced. -The type declaration can be found [here](https://github.com/datalineio/dataline/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/dataline-config/src/main/resources/json/StandardSyncConfiguration.json). +The type declaration can be found [here](https://github.com/airbytehq/airbyte/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/airbyte-config/src/main/resources/json/StandardSyncConfiguration.json). \(note: we may need to add some notion that some sources or destinations are only compatible with full\_refresh\) @@ -188,7 +188,7 @@ The type declaration can be found [here](https://github.com/datalineio/dataline/ This object tracks metadata on where the run ended. Our hope is that it can replace the State object \(see [below](configuration-data-model.md#State)\) entirely. The reason to define this type now is so that in the UI we can provide feedback to the user on where the sync has gotten to. -The type declaration can be found [here](https://github.com/datalineio/dataline/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/dataline-config/src/main/resources/json/StandardSyncSummary.json). +The type declaration can be found [here](https://github.com/airbytehq/airbyte/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/airbyte-config/src/main/resources/json/StandardSyncSummary.json). #### State @@ -198,7 +198,7 @@ This field will be treated as a json blob that will _only_ be used inside the im This object defines the schedule for a given connection. It is the same for all taps / targets. -The type declaration can be found [here](https://github.com/datalineio/dataline/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/dataline-config/src/main/resources/json/StandardSyncSchedule.json). +The type declaration can be found [here](https://github.com/airbytehq/airbyte/tree/87e9c99aef3d859a8498cbc5a1a5d0f0db43b1fb/docs/airbyte-config/src/main/resources/json/StandardSyncSchedule.json). ### Connection Methods diff --git a/docs/architecture/high-level-overview.md b/docs/architecture/high-level-overview.md index 40d141e2906..06df21c373b 100644 --- a/docs/architecture/high-level-overview.md +++ b/docs/architecture/high-level-overview.md @@ -1,10 +1,10 @@ # High Level Overview -Here is a high level view of Dataline's components: +Here is a high level view of Airbyte's components: ![3.048-Kilometer view](../.gitbook/assets/10-000-feet-view.png) -* `UI`: Acts as the control center for Dataline. From the UI you can configure new integration connections. You can also track the different syncing jobs and view logs. +* `UI`: Acts as the control center for Airbyte. From the UI you can configure new integration connections. You can also track the different syncing jobs and view logs. * `Config Store`: Stores all the connections information \(credentials, frequency...\). * `Scheduler Store`: Stores statuses and job information for the scheduler bookkeeping. * `Config API`: Allows the UI read and update connection information. diff --git a/docs/company-handbook/company-handbook/README.md b/docs/company-handbook/company-handbook/README.md index bc2de396ab3..722fc6c9451 100644 --- a/docs/company-handbook/company-handbook/README.md +++ b/docs/company-handbook/company-handbook/README.md @@ -2,7 +2,7 @@ Welcome to our company handbook. -This is where you will find all information about Dataline, its story, culture, strategy, roadmap, and how to contribute. +This is where you will find all information about Airbyte, its story, culture, strategy, roadmap, and how to contribute. Transparency is one of our core values, which is why we make this handbook public. @@ -10,7 +10,7 @@ We believe the best ideas and solutions come from a place where people trust eac We also see transparency as a way for us to involve the community in the problem we’re solving. And we hope you’ll trust us and our mission. -If you have any questions or are interested in joining us in our mission, please don’t hesitate to ping us at [hey@dataline.io](mailto:hey@dataline.io). +If you have any questions or are interested in joining us in our mission, please don’t hesitate to ping us at [hey@airbyte.io](mailto:hey@airbyte.io). This handbook will grow with us, as we’ll try to keep it up-to-date as much as possible. diff --git a/docs/company-handbook/company-handbook/business-model.md b/docs/company-handbook/company-handbook/business-model.md index 4c2e6d1933a..af18c4c328e 100644 --- a/docs/company-handbook/company-handbook/business-model.md +++ b/docs/company-handbook/company-handbook/business-model.md @@ -14,7 +14,7 @@ To achieve our vision that data integration pipelines should be a commodity, we ## **Enterprise edition** -At some point, when we feel that Dataline has become the open-source standard to move data, we will start focusing on features that will make more sense to enterprises. These features will stay **source-available** but will be sold and not open-sourced. +At some point, when we feel that Airbyte has become the open-source standard to move data, we will start focusing on features that will make more sense to enterprises. These features will stay **source-available** but will be sold and not open-sourced. The enterprise edition is essential for us, as we will need the revenues to grow our team. A larger team will help us build more features and, eventually, a better product. diff --git a/docs/company-handbook/company-handbook/future-milestones.md b/docs/company-handbook/company-handbook/future-milestones.md index e51c7affbea..ed9c0f6bbf2 100644 --- a/docs/company-handbook/company-handbook/future-milestones.md +++ b/docs/company-handbook/company-handbook/future-milestones.md @@ -1,6 +1,6 @@ # Story -Dataline was founded by Michel and John in December 2019. +Airbyte was founded by Michel and John in December 2019. Our first idea was to help companies exchange data, starting by building a customer portal for data providers so their clients can easily evaluate and pull data however and wherever they want. @@ -10,7 +10,7 @@ At the time, we were meeting with a lot of companies. As we were discussing thei There are more and more data products out there, event-based customer data pipelines a la Segment and batch data ingestion pipelines a la Fivetran. But they are cloud-based and entail moving your data out of your infrastructure. In addition to adding unnecessary costs, this poses a data privacy risk for more and more companies. In the end, engineers end up having to develop and maintain these connections themselves. -That’s why we decided to build Dataline, a new self-hosted, open-source data integration engine. +That’s why we decided to build Airbyte, a new self-hosted, open-source data integration engine. Open sourcing the core engine is a prerequisite to building a top class engine so that anyone can add their own integrations and extend the project with the features that serve their use cases. diff --git a/docs/company-handbook/company-handbook/roadmap.md b/docs/company-handbook/company-handbook/roadmap.md index 6284b049c6e..017af68269e 100644 --- a/docs/company-handbook/company-handbook/roadmap.md +++ b/docs/company-handbook/company-handbook/roadmap.md @@ -1,8 +1,8 @@ # Roadmap -You can access our short-term roadmap here on our [Github project](https://github.com/datalineio/dataline/projects/1). +You can access our short-term roadmap here on our [Github project](https://github.com/airbytehq/airbyte/projects/1). -You can also see our last release in our [changelog](https://docs.dataline.io/changelog). We try to have a weekly release cadence. +You can also see our last release in our [changelog](https://docs.airbyte.io/changelog). We try to have a weekly release cadence. We also wanted to share with you how we think about the high-level roadmap over the next few months and years. We foresee several high-level phases that we will try to share here. diff --git a/docs/company-handbook/company-handbook/strategy.md b/docs/company-handbook/company-handbook/strategy.md index 58d4fbbe7e7..db20831a366 100644 --- a/docs/company-handbook/company-handbook/strategy.md +++ b/docs/company-handbook/company-handbook/strategy.md @@ -8,7 +8,7 @@ On top of that, we will build data quality monitoring, privacy compliance \(GDPR Eventually, you should be able to build your own Fivetran platform internally, while having complete control over your data and costs \(not indexed on MTUs\). If any integration that you need is missing, we will make it super easy for you to build it and to use our orchestration and scheduling features for it. -We will stay at parity with the incumbent’s features \(Fivetran, StitchData\) at first - see our [high-level roadmap](https://docs.dataline.io/company-handbook/company-handbook/roadmap) -, as our differentiation is on: +We will stay at parity with the incumbent’s features \(Fivetran, StitchData\) at first - see our [high-level roadmap](https://docs.airbyte.io/company-handbook/company-handbook/roadmap) -, as our differentiation is on: * open source, enabling you to add your own integration very easily * data privacy and control diff --git a/docs/company-handbook/company-handbook/team.md b/docs/company-handbook/company-handbook/team.md index 8fe823307bc..fde056abab0 100644 --- a/docs/company-handbook/company-handbook/team.md +++ b/docs/company-handbook/company-handbook/team.md @@ -17,7 +17,7 @@ Shrif was a senior engineer and tech lead on LiveRamp’s Data Segmentation plat ## **Jared Rhizor** -Before joining Dataline, Jared built massive data pipelines at LiveRamp for five years, where he was the tech lead responsible for a PB-scale device graph. +Before joining Airbyte, Jared built massive data pipelines at LiveRamp for five years, where he was the tech lead responsible for a PB-scale device graph. [**LinkedIn**](https://www.linkedin.com/in/jrhizor/) **\|** [**GitHub**](https://github.com/jrhizor) **\|** [**Website**](https://jrhizor.dev) ## **Charles Giardina** diff --git a/docs/contributing/code-of-conduct.md b/docs/contributing/code-of-conduct.md index ffede0e9426..9eacce28a21 100644 --- a/docs/contributing/code-of-conduct.md +++ b/docs/contributing/code-of-conduct.md @@ -38,7 +38,7 @@ This Code of Conduct applies within all project spaces, and it also applies when ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [conduct@dataline.io](mailto:conduct@dataline.io). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [conduct@airbyte.io](mailto:conduct@airbyte.io). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership. diff --git a/docs/contributing/contributing-to-dataline/README.md b/docs/contributing/contributing-to-airbyte/README.md similarity index 63% rename from docs/contributing/contributing-to-dataline/README.md rename to docs/contributing/contributing-to-airbyte/README.md index ae72646ea75..1e6894da8fe 100644 --- a/docs/contributing/contributing-to-dataline/README.md +++ b/docs/contributing/contributing-to-airbyte/README.md @@ -1,10 +1,10 @@ --- -description: 'We love contributions to Dataline, big or small.' +description: 'We love contributions to Airbyte, big or small.' --- -# Contributing to Dataline +# Contributing to Airbyte -We hope you are enjoying Dataline and look forward to hearing your feedback. Whether you want to raise a bug report, a feature/integration request or just request a correction to something, we really value our community input. +We hope you are enjoying Airbyte and look forward to hearing your feedback. Whether you want to raise a bug report, a feature/integration request or just request a correction to something, we really value our community input. We do ask that you read this document and send us any issues or raise pull requests to make sure we understand clearly what you are asking for. This will help ensure we are making the right decisions and taking the right actions. @@ -12,7 +12,7 @@ We do ask that you read this document and send us any issues or raise pull reque **‌‌**If you are considering adding to the codebase or contributing a new integration, first a big thank you. We sincerely appreciate your help in our mission to solve the data integration problem! -Here is a list of easy [good first issues](https://github.com/datalineio/dataline/labels/good%20first%20issue) to do. +Here is a list of easy [good first issues](https://github.com/airbytehq/airbyte/labels/good%20first%20issue) to do. As soon as you are done with your development, just put up a PR. When we review we look at: @@ -38,23 +38,23 @@ You are very welcome to create new issues on this project to request new feature If you would like to suggest a new feature, we ask that you please use our issue template. This contains a few essential questions that help us understand the problem you are looking to solve and how you think your recommendation will address it. We also tag incoming issues from this template with the "**community\_new**" label. This lets our teams quickly see what has been raised and better address the community recommendations. -To see what has already been proposed by the community you can look [here](https://github.com/datalineio/dataline/labels/community_new). +To see what has already been proposed by the community you can look [here](https://github.com/airbytehq/airbyte/labels/community_new). -"Watch out for duplicates!" If you are creating a new issue, please check [existing open](https://github.com/dataline.io/dataline/issues), or [recently closed](https://github.com/datalineio/dataline/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20). Having a single voted for issue is far easier for us to prioritize +"Watch out for duplicates!" If you are creating a new issue, please check [existing open](https://github.com/airbyte.io/airbyte/issues), or [recently closed](https://github.com/airbytehq/airbyte/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20). Having a single voted for issue is far easier for us to prioritize ## **Requesting new Integrations** This is very similar to requesting new features. The template will change a bit and all integration requests will be tagged with the “**community\_new**” and “**area/integration**” labels. -To see what has already been proposed by the community you can look [here](https://github.com/datalineio/dataline/labels/area%2Fintegration). Again watch out for duplicates! +To see what has already been proposed by the community you can look [here](https://github.com/airbytehq/airbyte/labels/area%2Fintegration). Again watch out for duplicates! ## **Reporting Bugs** -**‌**Bug reports help us make Dataline better for everyone. We provide a preconfigured template for bugs to make it very clear what information we need. +**‌**Bug reports help us make Airbyte better for everyone. We provide a preconfigured template for bugs to make it very clear what information we need. -‌Please search within our [already reported bugs](https://github.com/datalineio/dataline/issues?q=is%3Aissue+is%3Aopen+label%3Atype%2Fbug) before raising a new one to make sure you're not raising a duplicate. +‌Please search within our [already reported bugs](https://github.com/airbytehq/airbyte/issues?q=is%3Aissue+is%3Aopen+label%3Atype%2Fbug) before raising a new one to make sure you're not raising a duplicate. ## **Reporting Security Issues** -Please do not create a public GitHub issue. If you've found a security issue, please email us directly at [security@dataline.io](mailto:security@dataline.io) instead of raising an issue. +Please do not create a public GitHub issue. If you've found a security issue, please email us directly at [security@airbyte.io](mailto:security@airbyte.io) instead of raising an issue. diff --git a/docs/contributing/contributing-to-dataline/code-of-conduct.md b/docs/contributing/contributing-to-airbyte/code-of-conduct.md similarity index 87% rename from docs/contributing/contributing-to-dataline/code-of-conduct.md rename to docs/contributing/contributing-to-airbyte/code-of-conduct.md index ffede0e9426..9eacce28a21 100644 --- a/docs/contributing/contributing-to-dataline/code-of-conduct.md +++ b/docs/contributing/contributing-to-airbyte/code-of-conduct.md @@ -38,7 +38,7 @@ This Code of Conduct applies within all project spaces, and it also applies when ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [conduct@dataline.io](mailto:conduct@dataline.io). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [conduct@airbyte.io](mailto:conduct@airbyte.io). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership. diff --git a/docs/contributing/contributing-to-dataline/code-style.md b/docs/contributing/contributing-to-airbyte/code-style.md similarity index 100% rename from docs/contributing/contributing-to-dataline/code-style.md rename to docs/contributing/contributing-to-airbyte/code-style.md diff --git a/docs/contributing/contributing-to-dataline/developing-locally.md b/docs/contributing/contributing-to-airbyte/developing-locally.md similarity index 68% rename from docs/contributing/contributing-to-dataline/developing-locally.md rename to docs/contributing/contributing-to-airbyte/developing-locally.md index 43755892fce..4d0bb723f86 100644 --- a/docs/contributing/contributing-to-dataline/developing-locally.md +++ b/docs/contributing/contributing-to-airbyte/developing-locally.md @@ -2,19 +2,19 @@ ## Build with `gradle` -Dataline uses `java 14` , `node 14` and `Docker` +Airbyte uses `java 14` , `node 14` and `Docker` To compile the code and run unit tests: ```bash -git clone git@github.com:datalineio/dataline.git -cd dataline +git clone git@github.com:airbytehq/airbyte.git +cd airbyte ./gradlew clean build ``` This will build all the code and run all the unit tests. -`./gradle build` creates all the necessary artifacts \(Webapp, Jars and Docker images\) so that you can run Dataline locally. +`./gradle build` creates all the necessary artifacts \(Webapp, Jars and Docker images\) so that you can run Airbyte locally. ## Run with `docker-compose` @@ -23,9 +23,9 @@ This will build all the code and run all the unit tests. VERSION=dev docker-compose up ``` -The build will take a few minutes. Once it completes, Dataline compiled at current git revision will be running in your environment. +The build will take a few minutes. Once it completes, Airbyte compiled at current git revision will be running in your environment. -Dataline by default uses docker volumes for persisting data. If you'd like all persistence to use your local filesystem do the following instead. By default all data will be persisted to `/tmp/dev_root` . +Airbyte by default uses docker volumes for persisting data. If you'd like all persistence to use your local filesystem do the following instead. By default all data will be persisted to `/tmp/dev_root` . ```bash ./gradlew build @@ -34,19 +34,19 @@ docker-compose --env-file .env.dev -f docker-compose.yaml -f docker-compose.dev. ## Run Acceptance Tests -To run acceptance \(end-to-end\) tests you must have the Dataline running locally. +To run acceptance \(end-to-end\) tests you must have the Airbyte running locally. ```bash ./gradlew build VERSION=dev docker-compose up -./gradlew :dataline-tests:acceptanceTests +./gradlew :airbyte-tests:acceptanceTests ``` ## Develop on individual applications -### Develop on `dataline-webapp` +### Develop on `airbyte-webapp` -* Spin up Dataline locally so the UI can make requests against the local API. +* Spin up Airbyte locally so the UI can make requests against the local API. ```bash docker-compose --env-file .env.dev -f docker-compose.yaml -f docker-compose.dev.yaml up -d @@ -61,16 +61,16 @@ docker-compose stop webapp * Start up the react app. ```bash -cd dataline-webapp +cd airbyte-webapp npm install npm start ``` * Happy Hacking! -### Develop on `dataline-server` \(APIs\) +### Develop on `airbyte-server` \(APIs\) -* Spin up Dataline locally. +* Spin up Airbyte locally. ```bash docker-compose --env-file .env.dev -f docker-compose.yaml -f docker-compose.dev.yaml up -d @@ -85,7 +85,7 @@ docker-compose stop server * Run the `server` with the command line. It will build and start a `server` with the current state of the code. You can also start the `server` from your IDE if you need to use a debugger. ```bash -./gradlew :dataline-server:run +./gradlew :airbyte-server:run ``` * Make sure everything is working by testing out a call to the API. @@ -100,9 +100,9 @@ curl -H "Content-Type: application/json"\ _Note: We namespace most API calls with a workspace id. For now there is only ever one workspace that is hardcoded to the id used in this example. If you ever need a workspace id, just use this one._ -### Develop on `dataline-scheduler` +### Develop on `airbyte-scheduler` -* Spin up Dataline locally. +* Spin up Airbyte locally. ```bash docker-compose --env-file .env.dev -f docker-compose.yaml -f docker-compose.dev.yaml up -d @@ -117,7 +117,7 @@ docker-compose stop scheduler * Run the `scheduler` with the command line. It will build and start a `scheduler` with the current state of the code. You can also start the `scheduler`from your IDE if you need to use a debugger. ```bash -./gradlew :dataline-scheduler:run +./gradlew :airbyte-scheduler:run ``` * Happy Hacking! diff --git a/docs/contributing/contributing-to-dataline/templates/source-doc-template.md b/docs/contributing/contributing-to-airbyte/templates/source-doc-template.md similarity index 75% rename from docs/contributing/contributing-to-dataline/templates/source-doc-template.md rename to docs/contributing/contributing-to-airbyte/templates/source-doc-template.md index 2d16c35208a..3504982dc76 100644 --- a/docs/contributing/contributing-to-dataline/templates/source-doc-template.md +++ b/docs/contributing/contributing-to-airbyte/templates/source-doc-template.md @@ -6,16 +6,16 @@ #### Output schema Is the output schema fixed (e.g: for an API like Stripe)? If so, point to the source’s schema (e.g: link to Stripe’s documentation) or include it here directly. -Describe how the source schema is mapped to Dataline concepts. An example description might be: “MagicDB tables become Dataline Streams and MagicDB columns become Dataline Fields. In addition, an extracted_at column is appended to each row being read.” +Describe how the source schema is mapped to Airbyte concepts. An example description might be: “MagicDB tables become Airbyte Streams and MagicDB columns become Airbyte Fields. In addition, an extracted_at column is appended to each row being read.” #### Data Type Mapping -This section should contain a table mapping each of the source's data types to Dataline types. At the moment, -Dataline uses the same types used by Singer. +This section should contain a table mapping each of the source's data types to Airbyte types. At the moment, +Airbyte uses the same types used by Singer. -| Source Type | Dataline Type | Notes +| Source Type | Airbyte Type | Notes |-----|-----|-----| -Currently, Dataline uses the same types as Singer: `string`, `int`, `number`, `boolean`, `object`. +Currently, Airbyte uses the same types as Singer: `string`, `int`, `number`, `boolean`, `object`. #### Features This section should contain a table with the following format: @@ -46,5 +46,5 @@ do to prevent this? (e.g: use a read-only replica, or schedule frequent syncs, e ### Setup Guide For each of the above high-level requirements as appropriate, add or point to a follow-along guide. See the Postgres source guide for an example. -For each major cloud provider we support, also add a follow-along guide for setting up Dataline to connect to that destination. +For each major cloud provider we support, also add a follow-along guide for setting up Airbyte to connect to that destination. See the Postgres destination guide for an example of what this should look like. diff --git a/docs/contributing/contributing-to-dataline/updating-documentation.md b/docs/contributing/contributing-to-airbyte/updating-documentation.md similarity index 78% rename from docs/contributing/contributing-to-dataline/updating-documentation.md rename to docs/contributing/contributing-to-airbyte/updating-documentation.md index 7f863e19fa6..5d62da5f899 100644 --- a/docs/contributing/contributing-to-dataline/updating-documentation.md +++ b/docs/contributing/contributing-to-airbyte/updating-documentation.md @@ -15,7 +15,7 @@ We recommend that method for changes limited to one file \(typos, minor updates\ ## Modify the repository ```bash -$ git clone git@github.com:datalineio/dataline.git +$ git clone git@github.com:airbytehq/airbyte.git ``` All our docs are stored in the `docs` directory. You can use other files as example. @@ -28,12 +28,12 @@ Once you're satisfied with your changes just follow the regular PR process. To update with GitBook, follow these instructions: -1. Create a [new variant](https://docs.gitbook.com/editing-content/variants#create-a-variant). This will create a new branch on [GitHub](https://github.com/datalineio/dataline) with the same name +1. Create a [new variant](https://docs.gitbook.com/editing-content/variants#create-a-variant). This will create a new branch on [GitHub](https://github.com/airbytehq/airbyte) with the same name 2. Modify the documentation in that new variant -3. Save & merge regularly. Each time you merge, your changes will propagated to your branch. It can take a couple minutes for the changes to show up in [GitHub](https://github.com/datalineio/dataline). -4. Once you're satisfied, go on [GitHub](https://github.com/datalineio/dataline) and create a PR for your variant branch +3. Save & merge regularly. Each time you merge, your changes will propagated to your branch. It can take a couple minutes for the changes to show up in [GitHub](https://github.com/airbytehq/airbyte). +4. Once you're satisfied, go on [GitHub](https://github.com/airbytehq/airbyte) and create a PR for your variant branch 5. After the PR is approved, your changes will be merged to `master` 6. Don't forget to remove the branch and the variant once your change has been merged -Just [contact us](mailto:hey@dataline.io) and we will invite you to our space. +Just [contact us](mailto:hey@airbyte.io) and we will invite you to our space. diff --git a/docs/contributing/contributing-to-dataline/updating-documentation/README.md b/docs/contributing/contributing-to-airbyte/updating-documentation/README.md similarity index 78% rename from docs/contributing/contributing-to-dataline/updating-documentation/README.md rename to docs/contributing/contributing-to-airbyte/updating-documentation/README.md index 7f863e19fa6..5d62da5f899 100644 --- a/docs/contributing/contributing-to-dataline/updating-documentation/README.md +++ b/docs/contributing/contributing-to-airbyte/updating-documentation/README.md @@ -15,7 +15,7 @@ We recommend that method for changes limited to one file \(typos, minor updates\ ## Modify the repository ```bash -$ git clone git@github.com:datalineio/dataline.git +$ git clone git@github.com:airbytehq/airbyte.git ``` All our docs are stored in the `docs` directory. You can use other files as example. @@ -28,12 +28,12 @@ Once you're satisfied with your changes just follow the regular PR process. To update with GitBook, follow these instructions: -1. Create a [new variant](https://docs.gitbook.com/editing-content/variants#create-a-variant). This will create a new branch on [GitHub](https://github.com/datalineio/dataline) with the same name +1. Create a [new variant](https://docs.gitbook.com/editing-content/variants#create-a-variant). This will create a new branch on [GitHub](https://github.com/airbytehq/airbyte) with the same name 2. Modify the documentation in that new variant -3. Save & merge regularly. Each time you merge, your changes will propagated to your branch. It can take a couple minutes for the changes to show up in [GitHub](https://github.com/datalineio/dataline). -4. Once you're satisfied, go on [GitHub](https://github.com/datalineio/dataline) and create a PR for your variant branch +3. Save & merge regularly. Each time you merge, your changes will propagated to your branch. It can take a couple minutes for the changes to show up in [GitHub](https://github.com/airbytehq/airbyte). +4. Once you're satisfied, go on [GitHub](https://github.com/airbytehq/airbyte) and create a PR for your variant branch 5. After the PR is approved, your changes will be merged to `master` 6. Don't forget to remove the branch and the variant once your change has been merged -Just [contact us](mailto:hey@dataline.io) and we will invite you to our space. +Just [contact us](mailto:hey@airbyte.io) and we will invite you to our space. diff --git a/docs/contributing/contributing-to-dataline/updating-documentation/source-documentation-template.md b/docs/contributing/contributing-to-airbyte/updating-documentation/source-documentation-template.md similarity index 72% rename from docs/contributing/contributing-to-dataline/updating-documentation/source-documentation-template.md rename to docs/contributing/contributing-to-airbyte/updating-documentation/source-documentation-template.md index 7bbf50874ed..caf8be6d7d1 100644 --- a/docs/contributing/contributing-to-dataline/updating-documentation/source-documentation-template.md +++ b/docs/contributing/contributing-to-airbyte/updating-documentation/source-documentation-template.md @@ -8,17 +8,17 @@ Is the output schema fixed \(e.g: for an API like Stripe\)? If so, point to the source’s schema \(e.g: link to Stripe’s documentation\) or include it here directly. -Describe how the source schema is mapped to Dataline concepts. An example description might be: “MagicDB tables become Dataline Streams and MagicDB columns become Dataline Fields. In addition, an extracted\_at column is appended to each row being read.” +Describe how the source schema is mapped to Airbyte concepts. An example description might be: “MagicDB tables become Airbyte Streams and MagicDB columns become Airbyte Fields. In addition, an extracted\_at column is appended to each row being read.” #### Data Type Mapping -This section should contain a table mapping each of the source's data types to Dataline types. At the moment, Dataline uses the same types used by Singer. +This section should contain a table mapping each of the source's data types to Airbyte types. At the moment, Airbyte uses the same types used by Singer. -| Source Type | Dataline Type | Notes | +| Source Type | Airbyte Type | Notes | | :--- | :--- | :--- | -Currently, Dataline uses the same types as Singer: `string`, `int`, `number`, `boolean`, `object`. +Currently, Airbyte uses the same types as Singer: `string`, `int`, `number`, `boolean`, `object`. #### Features @@ -51,5 +51,5 @@ Could this source hurt the user's data source or put too much strain on it in ce For each of the above high-level requirements as appropriate, add or point to a follow-along guide. See the Postgres source guide for an example. -For each major cloud provider we support, also add a follow-along guide for setting up Dataline to connect to that destination. See the Postgres destination guide for an example of what this should look like. +For each major cloud provider we support, also add a follow-along guide for setting up Airbyte to connect to that destination. See the Postgres destination guide for an example of what this should look like. diff --git a/docs/deployment/deploying-airbyte/README.md b/docs/deployment/deploying-airbyte/README.md new file mode 100644 index 00000000000..cf69e165b0e --- /dev/null +++ b/docs/deployment/deploying-airbyte/README.md @@ -0,0 +1,2 @@ +# Deploying Airbyte + diff --git a/docs/deployment/deploying-dataline/on-aws-ec2.md b/docs/deployment/deploying-airbyte/on-aws-ec2.md similarity index 83% rename from docs/deployment/deploying-dataline/on-aws-ec2.md rename to docs/deployment/deploying-airbyte/on-aws-ec2.md index 3aa3d6f8c4a..c1ddaadddb2 100644 --- a/docs/deployment/deploying-dataline/on-aws-ec2.md +++ b/docs/deployment/deploying-airbyte/on-aws-ec2.md @@ -52,7 +52,7 @@ This part assumes that you have access to a terminal on your workstation ```bash # In your workstation terminal -SSH_KEY=~/Downloads/dataline-key.pem # or wherever you've downloaded the key +SSH_KEY=~/Downloads/airbyte-key.pem # or wherever you've downloaded the key INSTANCE_IP=REPLACE_WITH_YOUR_INSTANCE_IP chmod 400 $SSH_KEY # or ssh will complain that the key has the wrong permissions ssh -i $SSH_KEY ec2-user@$INSTANCE_IP @@ -84,7 +84,7 @@ docker-compose --version logout ``` -## Install & Start Dataline +## Install & Start Airbyte * Connect to your instance @@ -93,19 +93,19 @@ logout ssh -i $SSH_KEY ec2-user@$INSTANCE_IP ``` -* Install Dataline +* Install Airbyte ```bash # In your ssh session on the instance terminal -mkdir dataline && cd dataline -wget https://raw.githubusercontent.com/datalineio/dataline/master/{.env,docker-compose.yaml} +mkdir airbyte && cd airbyte +wget https://raw.githubusercontent.com/airbytehq/airbyte/master/{.env,docker-compose.yaml} docker-compose up -d ``` -## Connect to Dataline +## Connect to Airbyte {% hint style="danger" %} -For security reason we strongly recommend to not expose Dataline on Internet available ports. Future versions will add support for SSL & Authentication +For security reason we strongly recommend to not expose Airbyte on Internet available ports. Future versions will add support for SSL & Authentication {% endhint %} * Create ssh tunnel @@ -120,5 +120,5 @@ ssh -i $SSH_KEY -L 8000:localhost:8000 -L 8001:localhost:8001 -N -f ec2-user@$IN ## Troubleshooting -If you encounter any issues, just connect to our [slack](https://join.slack.com/t/datalinehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! +If you encounter any issues, just connect to our [slack](https://join.slack.com/t/airbytehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! diff --git a/docs/deployment/deploying-dataline/on-gcp-compute-engine.md b/docs/deployment/deploying-airbyte/on-gcp-compute-engine.md similarity index 75% rename from docs/deployment/deploying-dataline/on-gcp-compute-engine.md rename to docs/deployment/deploying-airbyte/on-gcp-compute-engine.md index 859aa596074..ed4ea05c1c2 100644 --- a/docs/deployment/deploying-dataline/on-gcp-compute-engine.md +++ b/docs/deployment/deploying-airbyte/on-gcp-compute-engine.md @@ -27,7 +27,7 @@ This part assumes that you have access to a terminal on your workstation ```bash # In your workstation terminal PROJECT_ID=PROJECT_ID_WHERE_YOU_CREATED_YOUR_INSTANCE -INSTANCE_NAME=dataline # or anyother name that you've used +INSTANCE_NAME=airbyte # or anyother name that you've used ``` * Install `gcloud` @@ -51,14 +51,14 @@ gcloud init # Follow instructions ```bash # Verify you can see your instance gcloud --project $PROJECT_ID compute instances list -[...] # You should see the dataline instance you just created +[...] # You should see the airbyte instance you just created ``` * Connect to your instance ```bash # In your workstation terminal -gcloud --project=$PROJECT_ID beta compute ssh dataline +gcloud --project=$PROJECT_ID beta compute ssh airbyte ``` * Install `docker` @@ -91,35 +91,35 @@ docker-compose --version logout ``` -## Install & Start Dataline +## Install & Start Airbyte * Connect to your instance ```bash # In your workstation terminal -gcloud --project=$PROJECT_ID beta compute ssh dataline +gcloud --project=$PROJECT_ID beta compute ssh airbyte ``` -* Install Dataline +* Install Airbyte ```bash # In your ssh session on the instance terminal -mkdir dataline && cd dataline -wget https://raw.githubusercontent.com/datalineio/dataline/master/{.env,docker-compose.yaml} +mkdir airbyte && cd airbyte +wget https://raw.githubusercontent.com/airbytehq/airbyte/master/{.env,docker-compose.yaml} docker-compose up -d ``` -## Connect to Dataline +## Connect to Airbyte {% hint style="danger" %} -For security reason we strongly recommend to not expose Dataline on Internet available ports. Future versions will add support for SSL & Authentication +For security reason we strongly recommend to not expose Airbyte on Internet available ports. Future versions will add support for SSL & Authentication {% endhint %} * Create ssh tunnel ```bash # In your workstation terminal -gcloud --project=$PROJECT_ID beta compute ssh dataline -- -L 8000:localhost:8000 -L 8001:localhost:8001 -N -f +gcloud --project=$PROJECT_ID beta compute ssh airbyte -- -L 8000:localhost:8000 -L 8001:localhost:8001 -N -f ``` * In your browser, just visit [http://localhost:8000](http://localhost:8000) @@ -127,5 +127,5 @@ gcloud --project=$PROJECT_ID beta compute ssh dataline -- -L 8000:localhost:8000 ## Troubleshooting -If you encounter any issues, just connect to our [slack](https://join.slack.com/t/datalinehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! +If you encounter any issues, just connect to our [slack](https://join.slack.com/t/airbytehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! diff --git a/docs/deployment/deploying-dataline/with-docker.md b/docs/deployment/deploying-airbyte/with-docker.md similarity index 66% rename from docs/deployment/deploying-dataline/with-docker.md rename to docs/deployment/deploying-airbyte/with-docker.md index ecfc1a42d23..014ec4fd4d6 100644 --- a/docs/deployment/deploying-dataline/with-docker.md +++ b/docs/deployment/deploying-airbyte/with-docker.md @@ -4,15 +4,15 @@ These instructions have been tested on MacOS {% endhint %} -## Setup & Launch Dataline +## Setup & Launch Airbyte * Install docker on your workstation \(see [instructions](https://www.docker.com/products/docker-desktop)\) -* Clone dataline's repository and run `docker compose` +* Clone airbyte's repository and run `docker compose` ```bash # In your workstation terminal -git clone git@github.com:datalineio/dataline.git -cd dataline +git clone git@github.com:airbytehq/airbyte.git +cd airbyte VERSION=dev docker-compose up -d ``` @@ -21,5 +21,5 @@ VERSION=dev docker-compose up -d ## Troubleshooting -If you encounter any issues, just connect to our [slack](https://join.slack.com/t/datalinehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! +If you encounter any issues, just connect to our [slack](https://join.slack.com/t/airbytehq/shared_invite/zt-h5m88w3a-twQ_6AF9e8SnAzOIkHu2VQ). Our community will help! diff --git a/docs/deployment/deploying-dataline/README.md b/docs/deployment/deploying-dataline/README.md deleted file mode 100644 index e4a2540666b..00000000000 --- a/docs/deployment/deploying-dataline/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Deploying Dataline - diff --git a/docs/integrations/destinations/local-csv.md b/docs/integrations/destinations/local-csv.md index e94c12657af..2217dcf8258 100644 --- a/docs/integrations/destinations/local-csv.md +++ b/docs/integrations/destinations/local-csv.md @@ -2,7 +2,7 @@ ## Overview -This destination writes data to a directory on the _local_ filesystem on the host running Dataline. By default, data is written to `/tmp/dataline_local`. To change this location, modify the `LOCAL_ROOT` environment variable for Dataline. +This destination writes data to a directory on the _local_ filesystem on the host running Airbyte. By default, data is written to `/tmp/airbyte_local`. To change this location, modify the `LOCAL_ROOT` environment variable for Airbyte. ### Sync Overview #### Output schema @@ -11,7 +11,7 @@ This destination outputs files with the name of the stream and a timestamp. Each #### Data Type Mapping As the output is CSV, the only output type is `String`. All input fields with be converted to their `String` value. -| Dataline Type | Destination Type | Notes +| Airbyte Type | Destination Type | Notes | :--- | :--- | :--- | | `string` | string | | | `number` | string | | @@ -32,4 +32,4 @@ This integration will be constrained by the speed at which your filesystem accep ## Getting Started ### Requirements: -* The `destination_path` field will be appended to `LOCAL_ROOT`. e.g. If `LOCAL_ROOT = /tmp/dataline_local` and the user provides the value `cars/models`, then data will be written to `/tmp/dataline_local/cars/models`. By default `LOCAL_ROOT = /tmp/dataline_local`. +* The `destination_path` field will be appended to `LOCAL_ROOT`. e.g. If `LOCAL_ROOT = /tmp/airbyte_local` and the user provides the value `cars/models`, then data will be written to `/tmp/airbyte_local/cars/models`. By default `LOCAL_ROOT = /tmp/airbyte_local`. diff --git a/docs/integrations/sources/postgres.md b/docs/integrations/sources/postgres.md index 9b832ae6a18..7c922c210d2 100644 --- a/docs/integrations/sources/postgres.md +++ b/docs/integrations/sources/postgres.md @@ -2,7 +2,7 @@ ## Overview -The Postgres source supports Full Refresh syncs. That is, every time a sync is run, Dataline will copy all rows in the tables and columns you setup for replication into the destination in a new table. +The Postgres source supports Full Refresh syncs. That is, every time a sync is run, Airbyte will copy all rows in the tables and columns you setup for replication into the destination in a new table. This Postgres source is based on the [Singer Postgres Tap](https://github.com/singer-io/tap-postgres). @@ -67,29 +67,29 @@ Incremental sync \(copying only the data that has changed\) for this source is c ### Requirements: 1. Postgres `v9.3.x` or above -2. Allow connections from Dataline to your Postgres database \(if they exist in separate VPCs\) -3. Create a dedicated read-only Dataline user with access to all tables needed for replication +2. Allow connections from Airbyte to your Postgres database \(if they exist in separate VPCs\) +3. Create a dedicated read-only Airbyte user with access to all tables needed for replication ### Setup Guide -### 1. Make sure your database is accessible from the machine running Dataline +### 1. Make sure your database is accessible from the machine running Airbyte -This is dependent on your networking setup. The easiest way to verify if Dataline is able to connect to your Postgres instance is via the check connection tool in the UI. +This is dependent on your networking setup. The easiest way to verify if Airbyte is able to connect to your Postgres instance is via the check connection tool in the UI. ### 2. Create a dedicated read-only user with access to the relevant tables \(Recommended but optional\) -This step is optional but highly recommended to allow for better permission control and auditing. Alternatively, you can use Dataline with an existing user in your database. +This step is optional but highly recommended to allow for better permission control and auditing. Alternatively, you can use Airbyte with an existing user in your database. To create a dedicated database user, run the following commands against your database: ```sql -CREATE USER dataline PASSWORD 'your_password_here'; +CREATE USER airbyte PASSWORD 'your_password_here'; ``` Then give it access to the relevant schema: ```sql -GRANT USAGE ON SCHEMA TO dataline +GRANT USAGE ON SCHEMA TO airbyte ``` Note that to replicate data from multiple Postgres schemas, you can re-run the command above to grant access to all the relevant schemas, but you'll need to setup multiple sources connecting to the same db on multiple schemas. @@ -97,11 +97,11 @@ Note that to replicate data from multiple Postgres schemas, you can re-run the c Next, grant the user read-only access to the relevant tables. The simplest way is to grant read access to all tables in the schema as follows: ```sql -GRANT SELECT ON ALL TABLES IN SCHEMA TO dataline; +GRANT SELECT ON ALL TABLES IN SCHEMA TO airbyte; -# Allow dataline user to see tables created in the future -ALTER DEFAULT PRIVILEGES IN SCHEMA GRANT SELECT ON TABLES TO dataline; +# Allow airbyte user to see tables created in the future +ALTER DEFAULT PRIVILEGES IN SCHEMA GRANT SELECT ON TABLES TO airbyte; ``` -Your database user should now be ready for use with Dataline. +Your database user should now be ready for use with Airbyte. diff --git a/docs/license.md b/docs/license.md index e24a515891a..5c7230ff9cb 100644 --- a/docs/license.md +++ b/docs/license.md @@ -2,7 +2,7 @@ MIT License -Copyright \(c\) 2020 Dataline +Copyright \(c\) 2020 Airbyte Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files \(the "Software"\), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/settings.gradle b/settings.gradle index 84eac8dfa03..19e053f91ff 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,28 +1,28 @@ import groovy.io.FileType -rootProject.name = 'dataline' +rootProject.name = 'airbyte' -include ':dataline-analytics' -include ':dataline-api' -include ':dataline-commons' -include ':dataline-config:models' -include ':dataline-config:init' -include ':dataline-config:persistence' -include ':dataline-db' -include ':dataline-integrations' -include ':dataline-scheduler' -include ':dataline-server' -include ':dataline-singer' -include ':dataline-webapp' -include ':dataline-workers' -include ':dataline-tests' -include ':dataline-test-utils' +include ':airbyte-analytics' +include ':airbyte-api' +include ':airbyte-commons' +include ':airbyte-config:models' +include ':airbyte-config:init' +include ':airbyte-config:persistence' +include ':airbyte-db' +include ':airbyte-integrations' +include ':airbyte-scheduler' +include ':airbyte-server' +include ':airbyte-singer' +include ':airbyte-webapp' +include ':airbyte-workers' +include ':airbyte-tests' +include ':airbyte-test-utils' // include all integration subprojects -def integrationsPath = rootDir.toPath().resolve('dataline-integrations') +def integrationsPath = rootDir.toPath().resolve('airbyte-integrations') integrationsPath.eachFileRecurse(FileType.FILES) { path -> def relativizedPath = integrationsPath.relativize(path) if (path.endsWith('build.gradle') && !path.contains("build") && relativizedPath.getNameCount() > 1) { - include ":dataline-integrations:${relativizedPath.parent.join(':')}" + include ":airbyte-integrations:${relativizedPath.parent.join(':')}" } } diff --git a/tools/bin/acceptance_test.sh b/tools/bin/acceptance_test.sh index 177eebe5bec..64bf8011300 100755 --- a/tools/bin/acceptance_test.sh +++ b/tools/bin/acceptance_test.sh @@ -16,4 +16,4 @@ echo "Waiting for services to begin" sleep 10 # TODO need a better way to wait echo "Running e2e tests via gradle" -./gradlew --no-daemon :dataline-tests:acceptanceTests +./gradlew --no-daemon :airbyte-tests:acceptanceTests diff --git a/tools/bin/ci_credentials.sh b/tools/bin/ci_credentials.sh index d28e57a92b1..eb186b5a144 100755 --- a/tools/bin/ci_credentials.sh +++ b/tools/bin/ci_credentials.sh @@ -2,8 +2,8 @@ set -e -mkdir dataline-integrations/singer/bigquery/destination/config -echo "$BIGQUERY_INTEGRATION_TEST_CREDS" > dataline-integrations/singer/bigquery/destination/config/credentials.json +mkdir airbyte-integrations/singer/bigquery/destination/config +echo "$BIGQUERY_INTEGRATION_TEST_CREDS" > airbyte-integrations/singer/bigquery/destination/config/credentials.json -mkdir dataline-integrations/singer/stripe/source/config -echo "$STRIPE_INTEGRATION_TEST_CREDS" > dataline-integrations/singer/stripe/source/config/config.json +mkdir airbyte-integrations/singer/stripe/source/config +echo "$STRIPE_INTEGRATION_TEST_CREDS" > airbyte-integrations/singer/stripe/source/config/config.json diff --git a/tools/bin/gradled.sh b/tools/bin/gradled.sh index 3bd18f1803b..42542e86c19 100755 --- a/tools/bin/gradled.sh +++ b/tools/bin/gradled.sh @@ -4,7 +4,7 @@ set -e . tools/lib/lib.sh -IMG_NAME=dataline/build-project:dev +IMG_NAME=airbyte/build-project:dev TMP_VOLUME_NAME=gradlew-tmp main() { diff --git a/tools/build/README.md b/tools/build/README.md index 41aaf3fa6b3..1497abf702f 100644 --- a/tools/build/README.md +++ b/tools/build/README.md @@ -1,6 +1,6 @@ This docker image contains the build environment used to generate all our artifacts. If you need to do some changes the environment: -1. Bump up the version in the docker file (`io.dataline.version`). +1. Bump up the version in the docker file (`io.airbyte.version`). 1. Build and push the image (with the new tag). 1. Update the consumers to use the most recent build image. diff --git a/tools/gradle/pmd/rules.xml b/tools/gradle/pmd/rules.xml index 1f36683fbc7..c121d5295ff 100644 --- a/tools/gradle/pmd/rules.xml +++ b/tools/gradle/pmd/rules.xml @@ -1,10 +1,10 @@ - - PMD Rules for Dataline + PMD Rules for Airbyte .*/generated/.* diff --git a/tools/lib/lib.sh b/tools/lib/lib.sh index 2b878ae4e0d..d3031fd4b27 100644 --- a/tools/lib/lib.sh +++ b/tools/lib/lib.sh @@ -11,5 +11,5 @@ assert_root() { _get_docker_version() { local dockerfile=$1 - cat "$dockerfile" | grep io.dataline.version | cut -d = -f2 + cat "$dockerfile" | grep io.airbyte.version | cut -d = -f2 }