diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 65660baf5..24fcacd17 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -47,49 +47,47 @@ jobs: - uses: actions/checkout@v2.3.4 with: path: plugin -# TODO: uncomment once we have added support to load submodules as dependencies to -# Sandbox instance for integration tests. -# - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 -# if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' -# id: filter -# with: -# working-directory: plugin -# filters: | -# e2e-test: -# - '**/e2e-test/**' -# - name: Checkout e2e test repo -# uses: actions/checkout@v2.3.4 -# with: -# repository: cdapio/cdap-e2e-tests -# path: e2e -# - name: Cache -# uses: actions/cache@v2.1.3 -# with: -# path: ~/.m2/repository -# key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }} -# restore-keys: | -# ${{ runner.os }}-maven-${{ github.workflow }} -# - name: Run required e2e tests -# if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false' -# run: python3 e2e/src/main/scripts/run_e2e_test.py --testRunner **/${{ matrix.tests }}/**/TestRunnerRequired.java -# - name: Run all e2e tests -# if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || steps.filter.outputs.e2e-test == 'true' -# run: python3 e2e/src/main/scripts/run_e2e_test.py --testRunner **/${{ matrix.tests }}/**/TestRunner.java -# - name: Upload report -# uses: actions/upload-artifact@v2.2.4 -# if: always() -# with: -# name: Cucumber report - ${{ matrix.tests }} -# path: ./plugin/target/cucumber-reports -# - name: Upload debug files -# uses: actions/upload-artifact@v2.2.4 -# if: always() -# with: -# name: Debug files - ${{ matrix.tests }} -# path: ./**/target/e2e-debug -# - name: Upload files to GCS -# uses: google-github-actions/upload-cloud-storage@v0 -# if: always() -# with: -# path: ./plugin/target/cucumber-reports -# destination: e2e-tests-cucumber-reports/${{ github.event.repository.name }}/${{ github.ref }} + - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721 + if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' + id: filter + with: + working-directory: plugin + filters: | + e2e-test: + - '**/e2e-test/**' + - name: Checkout e2e test repo + uses: actions/checkout@v2.3.4 + with: + repository: cdapio/cdap-e2e-tests + path: e2e + - name: Cache + uses: actions/cache@v2.1.3 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven-${{ github.workflow }} + - name: Run required e2e tests + if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false' + run: python3 e2e/src/main/scripts/run_e2e_test.py --testRunner **/${{ matrix.tests }}/**/TestRunnerRequired.java + - name: Run all e2e tests + if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || steps.filter.outputs.e2e-test == 'true' + run: python3 e2e/src/main/scripts/run_e2e_test.py --testRunner **/${{ matrix.tests }}/**/TestRunner.java + - name: Upload report + uses: actions/upload-artifact@v2.2.4 + if: always() + with: + name: Cucumber report - ${{ matrix.tests }} + path: ./plugin/target/cucumber-reports + - name: Upload debug files + uses: actions/upload-artifact@v2.2.4 + if: always() + with: + name: Debug files - ${{ matrix.tests }} + path: ./**/target/e2e-debug + - name: Upload files to GCS + uses: google-github-actions/upload-cloud-storage@v0 + if: always() + with: + path: ./plugin/target/cucumber-reports + destination: e2e-tests-cucumber-reports/${{ github.event.repository.name }}/${{ github.ref }} diff --git a/google-cloud-bigquery/docs/BigQuery-connector.md b/docs/BigQuery-connector.md similarity index 100% rename from google-cloud-bigquery/docs/BigQuery-connector.md rename to docs/BigQuery-connector.md diff --git a/google-cloud-bigquery/docs/BigQueryArgumentSetter-action.md b/docs/BigQueryArgumentSetter-action.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryArgumentSetter-action.md rename to docs/BigQueryArgumentSetter-action.md diff --git a/google-cloud-bigquery/docs/BigQueryExecute-action.md b/docs/BigQueryExecute-action.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryExecute-action.md rename to docs/BigQueryExecute-action.md diff --git a/google-cloud-bigquery/docs/BigQueryMultiTable-batchsink.md b/docs/BigQueryMultiTable-batchsink.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryMultiTable-batchsink.md rename to docs/BigQueryMultiTable-batchsink.md diff --git a/google-cloud-bigquery/docs/BigQueryPushdownEngine-sqlengine.md b/docs/BigQueryPushdownEngine-sqlengine.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryPushdownEngine-sqlengine.md rename to docs/BigQueryPushdownEngine-sqlengine.md diff --git a/google-cloud-bigquery/docs/BigQueryTable-batchsink.md b/docs/BigQueryTable-batchsink.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryTable-batchsink.md rename to docs/BigQueryTable-batchsink.md diff --git a/google-cloud-bigquery/docs/BigQueryTable-batchsource.md b/docs/BigQueryTable-batchsource.md similarity index 100% rename from google-cloud-bigquery/docs/BigQueryTable-batchsource.md rename to docs/BigQueryTable-batchsource.md diff --git a/google-cloud-bigtable/docs/Bigtable-batchsink.md b/docs/Bigtable-batchsink.md similarity index 100% rename from google-cloud-bigtable/docs/Bigtable-batchsink.md rename to docs/Bigtable-batchsink.md diff --git a/google-cloud-bigtable/docs/Bigtable-batchsource.md b/docs/Bigtable-batchsource.md similarity index 100% rename from google-cloud-bigtable/docs/Bigtable-batchsource.md rename to docs/Bigtable-batchsource.md diff --git a/google-cloud-dataplex/docs/Dataplex-batchsink.md b/docs/Dataplex-batchsink.md similarity index 100% rename from google-cloud-dataplex/docs/Dataplex-batchsink.md rename to docs/Dataplex-batchsink.md diff --git a/google-cloud-dataplex/docs/Dataplex-batchsource.md b/docs/Dataplex-batchsource.md similarity index 100% rename from google-cloud-dataplex/docs/Dataplex-batchsource.md rename to docs/Dataplex-batchsource.md diff --git a/google-cloud-datastore/docs/Datastore-batchsink.md b/docs/Datastore-batchsink.md similarity index 100% rename from google-cloud-datastore/docs/Datastore-batchsink.md rename to docs/Datastore-batchsink.md diff --git a/google-cloud-datastore/docs/Datastore-batchsource.md b/docs/Datastore-batchsource.md similarity index 100% rename from google-cloud-datastore/docs/Datastore-batchsource.md rename to docs/Datastore-batchsource.md diff --git a/google-cloud-storage/docs/GCS-batchsink.md b/docs/GCS-batchsink.md similarity index 100% rename from google-cloud-storage/docs/GCS-batchsink.md rename to docs/GCS-batchsink.md diff --git a/google-cloud-storage/docs/GCS-connector.md b/docs/GCS-connector.md similarity index 100% rename from google-cloud-storage/docs/GCS-connector.md rename to docs/GCS-connector.md diff --git a/google-cloud-storage/docs/GCSArgumentSetter-action.md b/docs/GCSArgumentSetter-action.md similarity index 100% rename from google-cloud-storage/docs/GCSArgumentSetter-action.md rename to docs/GCSArgumentSetter-action.md diff --git a/google-cloud-storage/docs/GCSBucketCreate-action.md b/docs/GCSBucketCreate-action.md similarity index 100% rename from google-cloud-storage/docs/GCSBucketCreate-action.md rename to docs/GCSBucketCreate-action.md diff --git a/google-cloud-storage/docs/GCSBucketDelete-action.md b/docs/GCSBucketDelete-action.md similarity index 100% rename from google-cloud-storage/docs/GCSBucketDelete-action.md rename to docs/GCSBucketDelete-action.md diff --git a/google-cloud-storage/docs/GCSCopy-action.md b/docs/GCSCopy-action.md similarity index 100% rename from google-cloud-storage/docs/GCSCopy-action.md rename to docs/GCSCopy-action.md diff --git a/google-cloud-storage/docs/GCSDoneFileMarker-postaction.md b/docs/GCSDoneFileMarker-postaction.md similarity index 100% rename from google-cloud-storage/docs/GCSDoneFileMarker-postaction.md rename to docs/GCSDoneFileMarker-postaction.md diff --git a/google-cloud-storage/docs/GCSFile-batchsource.md b/docs/GCSFile-batchsource.md similarity index 100% rename from google-cloud-storage/docs/GCSFile-batchsource.md rename to docs/GCSFile-batchsource.md diff --git a/google-cloud-storage/docs/GCSMove-action.md b/docs/GCSMove-action.md similarity index 100% rename from google-cloud-storage/docs/GCSMove-action.md rename to docs/GCSMove-action.md diff --git a/google-cloud-storage/docs/GCSMultiFiles-batchsink.md b/docs/GCSMultiFiles-batchsink.md similarity index 100% rename from google-cloud-storage/docs/GCSMultiFiles-batchsink.md rename to docs/GCSMultiFiles-batchsink.md diff --git a/google-cloud-pubsub/docs/GooglePublisher-batchsink.md b/docs/GooglePublisher-batchsink.md similarity index 100% rename from google-cloud-pubsub/docs/GooglePublisher-batchsink.md rename to docs/GooglePublisher-batchsink.md diff --git a/google-cloud-pubsub/docs/GoogleSubscriber-streamingsource.md b/docs/GoogleSubscriber-streamingsource.md similarity index 100% rename from google-cloud-pubsub/docs/GoogleSubscriber-streamingsource.md rename to docs/GoogleSubscriber-streamingsource.md diff --git a/google-cloud-spanner/docs/Spanner-batchsink.md b/docs/Spanner-batchsink.md similarity index 100% rename from google-cloud-spanner/docs/Spanner-batchsink.md rename to docs/Spanner-batchsink.md diff --git a/google-cloud-spanner/docs/Spanner-batchsource.md b/docs/Spanner-batchsource.md similarity index 100% rename from google-cloud-spanner/docs/Spanner-batchsource.md rename to docs/Spanner-batchsource.md diff --git a/google-cloud-spanner/docs/Spanner-connector.md b/docs/Spanner-connector.md similarity index 100% rename from google-cloud-spanner/docs/Spanner-connector.md rename to docs/Spanner-connector.md diff --git a/google-cloud-speech/docs/SpeechToText-transform.md b/docs/SpeechToText-transform.md similarity index 100% rename from google-cloud-speech/docs/SpeechToText-transform.md rename to docs/SpeechToText-transform.md diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml deleted file mode 100644 index 66ff82b8b..000000000 --- a/google-cloud-bigquery/pom.xml +++ /dev/null @@ -1,498 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-bigquery - 0.21.0-SNAPSHOT - Google Cloud BigQuery Plugins - BigQuery GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - com.google.api - gax - 2.12.2 - compile - - - api-common - com.google.api - - - google-auth-library-credentials - com.google.auth - - - threetenbp - org.threeten - - - google-auth-library-oauth2-http - com.google.auth - - - jsr305 - com.google.code.findbugs - - - guava - com.google.guava - - - opencensus-api - io.opencensus - - - false - - - org.apache.avro - avro - ${avro.version} - - - io.cdap.cdap - cdap-features - ${cdap.version} - - - io.cdap.plugin - format-avro - ${cdap.plugin.version} - - - com.google.cloud.bigdataoss - bigquery-connector - ${bigquery.connector.hadoop2.version} - - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - javax.jms - jms - - - - - org.apache.avro - avro-mapred - hadoop2 - ${avro.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - org.apache.spark - spark-core_2.11 - ${spark.version} - provided - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - org.apache.hadoop - hadoop-client - - - com.esotericsoftware.reflectasm - reflectasm - - - org.apache.curator - curator-recipes - - - org.tachyonproject - tachyon-client - - - org.scala-lang - scala-compiler - - - org.eclipse.jetty.orbit - javax.servlet - - - net.java.dev.jets3t - jets3t - - - - - - - - - - - - - - - - - - - - - - - io.cdap.cdap - cdap-etl-api-spark - ${cdap.version} - provided - - - io.cdap.cdap - cdap-api-spark2_2.11 - ${cdap.version} - provided - - - com.google.cloud.spark - spark-bigquery-with-dependencies_2.12 - ${spark-bq-connector.version} - - - javax.inject - javax.inject - 1 - - - org.apache.spark - spark-sql_2.12 - ${spark3.version} - provided - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - com.google.cloud.spark.bigquery.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-bigquery/src/test/resources/credentials.json b/google-cloud-bigquery/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-bigquery/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-bigquery/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-bigquery/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml deleted file mode 100644 index 4638288ff..000000000 --- a/google-cloud-bigtable/pom.xml +++ /dev/null @@ -1,410 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-bigtable - 0.21.0-SNAPSHOT - Google Cloud BigTable Plugins - BigTable GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - org.apache.commons - commons-lang3 - 3.5 - - - com.google.cloud.bigtable - bigtable-hbase-1.x-mapreduce - ${google.cloud.bigtable.version} - - - org.apache.hbase - hbase-client - - - org.apache.hbase - hbase-server - - - - org.apache.hbase - hbase-common - - - - - - org.apache.hbase - hbase-shaded-client - ${hbase-shaded-client.version} - - - org.slf4j - slf4j-log4j12 - - - - - - org.apache.hbase - hbase-shaded-server - ${hbase-shaded-server.version} - - - org.slf4j - slf4j-log4j12 - - - - - org.apache.avro - avro-mapred - hadoop2 - ${avro.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.core.version} - - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - - - - io.cdap.cdap - hydrator-test - test - - - io.cdap.cdap - cdap-unit-test - ${cdap.version} - test - - - org.apache.hive - hive-exec - - - io.cdap.cdap - cdap-explore-jdbc - - - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.bigquery.*; - com.google.cloud.hadoop.*; - org.apache.hadoop.hbase.mapreduce.*; - org.apache.hadoop.hbase.security.token.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-bigtable/src/test/resources/credentials.json b/google-cloud-bigtable/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-bigtable/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-bigtable/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-bigtable/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-common/pom.xml b/google-cloud-common/pom.xml deleted file mode 100644 index 79565e4ff..000000000 --- a/google-cloud-common/pom.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-common - 0.21.0-SNAPSHOT - Google Cloud Plugins Common Libraries - Common classes for GCP plugins - jar - - - - true - true - true - - - - - com.google.guava - guava - - - com.google.api-client - google-api-client - ${google.api.client.version} - - - com.google.code.gson - gson - ${gson.version} - - - - org.apache.hbase - hbase-shaded-client - ${hbase-shaded-client.version} - - - org.slf4j - slf4j-log4j12 - - - - - com.google.cloud - google-cloud-bigquery - ${google.cloud.bigquery.version} - - - com.google.cloud - google-cloud-storage - ${google.cloud.storage.version} - - - com.google.cloud.bigdataoss - util-hadoop - ${gcs.connector.version} - - - com.google.cloud.bigdataoss - gcs-connector - ${gcs.connector.version} - - - com.google.cloud - google-cloud-kms - ${google.cloud.kms.version} - - - com.google.flogger - flogger-system-backend - ${flogger.system.backend.version} - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - - diff --git a/google-cloud-common/src/test/resources/credentials.json b/google-cloud-common/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-dataplex/pom.xml b/google-cloud-dataplex/pom.xml deleted file mode 100644 index bc0589d03..000000000 --- a/google-cloud-dataplex/pom.xml +++ /dev/null @@ -1,398 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-dataplex - 0.21.0-SNAPSHOT - Google Cloud Dataplex Plugins - Dataplex GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${version} - - - io.cdap.plugin - google-cloud-storage - ${project.version} - - - io.cdap.plugin - google-cloud-bigquery - ${project.version} - - - com.google.cloud.spark - spark-bigquery-with-dependencies_2.12 - - - - - - org.awaitility - awaitility - 3.1.6 - - - com.google.api - gax - 2.12.2 - compile - - - api-common - com.google.api - - - google-auth-library-credentials - com.google.auth - - - threetenbp - org.threeten - - - google-auth-library-oauth2-http - com.google.auth - - - jsr305 - com.google.code.findbugs - - - guava - com.google.guava - - - opencensus-api - io.opencensus - - - false - - - io.cdap.plugin - format-common - ${cdap.plugin.version} - - - io.cdap.plugin - format-avro - ${cdap.plugin.version} - - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - com.google.cloud - google-cloud-dataplex - 0.2.0 - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-dataplex/src/test/resources/credentials.json b/google-cloud-dataplex/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-dataplex/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-dataplex/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-dataplex/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml deleted file mode 100644 index 5c65c7c9f..000000000 --- a/google-cloud-datastore/pom.xml +++ /dev/null @@ -1,332 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-datastore - 0.21.0-SNAPSHOT - Google Cloud Datastore Plugins - Datastore GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - com.google.guava - guava - - - com.google.cloud - google-cloud-datastore - ${google.cloud.datastore.version} - - - com.google.protobuf - protobuf-java - ${google.protobuf.java.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-datastore/src/test/resources/credentials.json b/google-cloud-datastore/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-datastore/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-datastore/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-datastore/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-e2e-tests/pom.xml b/google-cloud-e2e-tests/pom.xml deleted file mode 100644 index 614a43ea4..000000000 --- a/google-cloud-e2e-tests/pom.xml +++ /dev/null @@ -1,249 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-e2e-tests - 0.21.0-SNAPSHOT - E2E tests - E2E tests for GCP plugins - jar - - - - true - true - true - - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - io.cdap.plugin - google-cloud-storage - ${project.version} - - - io.cdap.plugin - google-cloud-bigquery - ${project.version} - - - io.cdap.plugin - google-cloud-spanner - ${project.version} - - - io.cdap.plugin - google-cloud-pubsub - ${project.version} - - - - - ${testSourceLocation} - - - maven-dependency-plugin - 3.1.2 - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - - - - e2e-tests - - ${project.basedir}/src/e2e-test/java - TestRunner.java - - - - - src/e2e-test/resources - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M5 - - ${testSourceLocation} - - ${TEST_RUNNER} - - - classes - 2 - 2 - true - - - - ${GOOGLE_APPLICATION_CREDENTIALS} - - - ${SERVICE_ACCOUNT_TYPE} - - - ${SERVICE_ACCOUNT_FILE_PATH} - - - ${SERVICE_ACCOUNT_JSON} - - - - - - - integration-test - - - - - - - net.masterthought - maven-cucumber-reporting - 5.5.0 - - - - execution - verify - - generate - - - Cucumber Reports - target/cucumber-reports/advanced-reports - 1 - false - ${project.build.directory}/cucumber-reports - - **/*.json - - ${project.build.directory}/cucumber-reports - true - - - - - - - - - - io.cdap.tests.e2e - cdap-e2e-framework - 0.0.1-SNAPSHOT - test - - - ch.qos.logback - logback-classic - 1.2.8 - runtime - - - - - - - diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSink.feature b/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSink.feature deleted file mode 100644 index 7ef2e3c45..000000000 --- a/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSink.feature +++ /dev/null @@ -1,178 +0,0 @@ -@GCS_Sink -Feature: GCS sink - Verification of GCS Sink plugin - - @CMEK @GCS_SINK_TEST @BQ_SOURCE_TEST - Scenario: To verify data is getting transferred successfully from BigQuery to GCS - Given Open Datafusion Project to configure pipeline - When Source is BigQuery - When Sink is GCS - Then Connect source as "BigQuery" and sink as "GCS" to establish connection - Then Open BigQuery source properties - Then Override Service account details if set in environment variables - Then Enter the BigQuery source mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Open GCS sink properties - Then Enter GCS property projectId and reference name - Then Override Service account details if set in environment variables - Then Enter GCS sink property path - Then Select GCS property format "csv" - Then Enter GCS property encryption key name "cmekGCS" if cmek is enabled - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save the pipeline - Then Preview and run the pipeline - Then Wait till pipeline preview is in running state - Then Open and capture pipeline preview logs - Then Verify the preview run status of pipeline in the logs is "succeeded" - Then Close the pipeline logs - Then Close the preview - Then Deploy the pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket - Then Validate the cmek key "cmekGCS" of target GCS bucket if cmek is enabled - - @GCS_SINK_TEST @BQ_SOURCE_TEST - Scenario Outline: To verify data is getting transferred successfully from BigQuery to GCS for different formats - Given Open Datafusion Project to configure pipeline - When Source is BigQuery - When Sink is GCS - Then Connect source as "BigQuery" and sink as "GCS" to establish connection - Then Open BigQuery source properties - Then Enter the BigQuery source mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Open GCS sink properties - Then Enter GCS property projectId and reference name - Then Enter GCS sink property path - Then Select GCS property format "" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket - Examples: - | FileFormat | - | csv | - | tsv | - | avro | - | json | - | orc | - | parquet | - - @GCS_SINK_TEST @BQ_SOURCE_TEST - Scenario Outline: To verify data is getting transferred successfully from BigQuery to GCS with combinations of contenttype - Given Open Datafusion Project to configure pipeline - When Source is BigQuery - When Sink is GCS - Then Connect source as "BigQuery" and sink as "GCS" to establish connection - Then Open BigQuery source properties - Then Enter the BigQuery source mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Open GCS sink properties - Then Enter GCS property projectId and reference name - Then Enter GCS sink property path - Then Select GCS property format "" - Then Select GCS sink property contentType "" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket with file format "" - Examples: - | FileFormat | contentType | - | avro | application/avro | - | parquet | application/octet-stream | - | orc | application/octet-stream | - @PLUGIN-808 - Examples: - | FileFormat | contentType | - | csv | application/csv | - | tsv | text/tab-separated-values | - | json | application/json | - - @GCS_SINK_TEST @BQ_SOURCE_TEST - Scenario: To verify data is getting transferred successfully from BigQuery to GCS using output file prefix - Given Open Datafusion Project to configure pipeline - When Source is BigQuery - When Sink is GCS - Then Connect source as "BigQuery" and sink as "GCS" to establish connection - Then Open BigQuery source properties - Then Enter the BigQuery source mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Open GCS sink properties - Then Enter GCS property projectId and reference name - Then Enter GCS sink property path - Then Select GCS property format "csv" - Then Enter GCS sink property output file prefix "gcsOutputFilePrefix" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket with fileName prefix "gcsOutputFilePrefix" - - @GCS_SINK_TEST @BQ_SOURCE_TEST - Scenario: To verify data is getting transferred successfully from BigQuery to GCS using path suffix field - Given Open Datafusion Project to configure pipeline - When Source is BigQuery - When Sink is GCS - Then Connect source as "BigQuery" and sink as "GCS" to establish connection - Then Open BigQuery source properties - Then Enter the BigQuery source mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Open GCS sink properties - Then Enter GCS property projectId and reference name - Then Enter GCS sink property path - Then Select GCS property format "csv" - Then Enter GCS sink property path suffix "gcsPathSuffix" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket with path suffix "gcsPathSuffix" - - @GCS_DATATYPE_TEST @GCS_SINK_TEST - Scenario: To verify data is getting transferred from GCS to GCS with supported DataTypes - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is GCS - Then Connect source as "GCS" and sink as "GCS" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsDataTypeTestFile" - Then Select GCS property format "csv" - Then Toggle GCS source property skip header to true - Then Click on the Get Schema button - Then Change datatype of fields in output schema with : "gcsDatatypeChange" - Then Validate "GCS" plugin properties - Then Verify the Output Schema matches the Expected Schema: "gcsDataTypeTestFileSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open GCS sink properties - Then Enter the GCS sink mandatory properties - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Verify data is transferred to target GCS bucket diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature b/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature deleted file mode 100644 index 20ec16a67..000000000 --- a/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature +++ /dev/null @@ -1,210 +0,0 @@ -@GCS_Source -Feature: GCS source - Verification of GCS to BQ successful data transfer - - @BQ_SINK_TEST @GCS_READ_RECURSIVE_TEST - Scenario: To verify data is getting transferred from GCS to BigQuery using read file recursive functionality - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsReadRecursivePath" - Then Select GCS property format "csv" - Then Toggle GCS source property skip header to true - Then Select GCS source property read file recursive as "true" - Then Validate output schema with expectedSchema "gcsReadRecursivePathSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save the pipeline - Then Preview and run the pipeline - Then Verify the preview of pipeline is "success" - Then Click on preview data for BigQuery sink - Then Verify preview output schema matches the outputSchema captured in properties - Then Close the preview data - Then Deploy the pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - - @BQ_SINK_TEST @GCS_DATATYPE_TEST - Scenario: To verify data is getting transferred from GCS to BigQuery with supported DataTypes - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsDataTypeTestFile" - Then Select GCS property format "csv" - Then Toggle GCS source property skip header to true - Then Click on the Get Schema button - Then Change datatype of fields in output schema with : "gcsDatatypeChange" - Then Validate "GCS" plugin properties - Then Verify the Output Schema matches the Expected Schema: "gcsDataTypeTestFileSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - - @BQ_SINK_TEST @GCS_DATATYPE_2_TEST - Scenario: To verify data is getting transferred from GCS to BigQuery with special cases of float DataTypes - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsDataTypeTest2File" - Then Select GCS property format "csv" - Then Toggle GCS source property skip header to true - Then Validate output schema with expectedSchema "gcsDataTypeTest2FileSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - - @GCS_OUTPUT_FIELD_TEST @BQ_SINK_TEST - Scenario: To verify successful data transfer from GCS to BigQuery with outputField and path filename only - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsOutputFieldTestFile" - Then Select GCS property format "csv" - Then Enter GCS source property path field "gcsPathField" - Then Select GCS source property path filename only as "true" - Then Toggle GCS source property skip header to true - Then Validate output schema with expectedSchema "gcsOutputFieldTestFileSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - Then Verify output field "gcsPathField" in target BigQuery table contains filename of the source GcsBucket "gcsOutputFieldTestFile" - - @GCS_DELIMITED_TEST @BQ_SINK_TEST - Scenario: To verify data is getting transferred from GCS to BigQuery with File system properties - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsDelimitedFile" - Then Select GCS property format "text" - Then Enter GCS File system properties field "gcsFileSysProperty" - Then Click on Tidy in GCS File system properties - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - - @GCS_CSV_TEST @BQ_SINK_TEST - Scenario Outline: To verify data is getting transferred from GCS to BigQuery with different encoding types - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsCsvFile" - Then Select GCS property format "csv" - Then Toggle GCS source property skip header to true - Then Select GCS source property file encoding type "" - Then Validate output schema with expectedSchema "gcsCsvFileSchema" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save and Deploy Pipeline - Then Run the Pipeline in Runtime - Then Wait till pipeline is in running state - Then Open and capture logs - Then Verify the pipeline status is "Succeeded" - Then Get count of no of records transferred to target BigQuery Table - Examples: - | EncodingType | - | IBM00858 | - | Windows-1250 | - | ISO-8859-1 | - @PLUGIN-823 - Examples: - | EncodingType | - | UTF-32 | - - @BQ_SINK_TEST @GCS_DATATYPE_1_TEST - Scenario Outline: To verify GCS Source output schema validation for various combinations of Datatype override - Given Open Datafusion Project to configure pipeline - When Source is GCS - When Sink is BigQuery - Then Connect source as "GCS" and sink as "BigQuery" to establish connection - Then Open GCS source properties - Then Enter GCS property projectId and reference name - Then Enter GCS source property path "gcsDataTypeTest1File" - Then Select GCS property format "csv" - Then Enter GCS source property override field "" and data type "" - Then Toggle GCS source property skip header to true - Then Validate output schema with expectedSchema "" - Then Validate "GCS" plugin properties - Then Close the GCS properties - Then Open BigQuery sink properties - Then Enter the BigQuery sink mandatory properties - Then Validate "BigQuery" plugin properties - Then Close the BigQuery properties - Then Save the pipeline - Then Preview and run the pipeline - Then Verify the preview of pipeline is "success" - Examples: - | Column | DataType | ExpectedSchema | - | gcsOverrideField | gcsOverrideFloatDataType | gcsOverrideInt_FloatSchema | - | gcsOverrideField2 | gcsOverrideLongDataType | gcsOverrideInt_LongSchema | - | gcsOverrideField4 | gcsOverrideFloatDataType | gcsOverrideString_FloatSchema | - | gcsOverrideField6 | gcsOverrideDoubleDataType | gcsOverrideString_DoubleSchema | - | gcsOverrideField7 | gcsOverrideFloatDataType | gcsOverrideDouble_FloatSchema | - @PLUGIN-1113 - Examples: - | Column | DataType | ExpectedSchema | - | gcsOverrideField3 | gcsOverrideTimestampDataType | gcsOverrideString_TimestampSchema | - | gcsOverrideField5 | gcsOverrideDateDataType | gcsOverrideString_DateSchema | diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml deleted file mode 100644 index bbf912d0f..000000000 --- a/google-cloud-pubsub/pom.xml +++ /dev/null @@ -1,405 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-pubsub - 0.21.0-SNAPSHOT - Google Cloud Pubsub Plugins - Pubsub GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - - com.google.api - gax - 2.12.2 - compile - - - api-common - com.google.api - - - google-auth-library-credentials - com.google.auth - - - threetenbp - org.threeten - - - google-auth-library-oauth2-http - com.google.auth - - - jsr305 - com.google.code.findbugs - - - guava - com.google.guava - - - opencensus-api - io.opencensus - - - false - - - - org.apache.avro - avro - ${avro.version} - - - io.cdap.cdap - cdap-etl-api - ${cdap.version} - provided - - - io.cdap.plugin - format-avro - ${cdap.plugin.version} - - - com.google.protobuf - protobuf-java - ${google.protobuf.java.version} - - - com.google.cloud - google-cloud-pubsub - ${google.cloud.pubsub.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - org.apache.spark - spark-streaming_2.11 - ${spark.version} - provided - - - - org.apache.bahir - spark-streaming-pubsub_2.11 - 2.4.0 - - - - - - - io.cdap.cdap - cdap-etl-api-spark - ${cdap.version} - provided - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-pubsub/src/test/resources/credentials.json b/google-cloud-pubsub/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-pubsub/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-pubsub/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-pubsub/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml deleted file mode 100644 index c18249755..000000000 --- a/google-cloud-spanner/pom.xml +++ /dev/null @@ -1,369 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-spanner - 0.21.0-SNAPSHOT - Google Cloud Spanner Plugins - Spanner GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - - com.google.api - gax - 2.12.2 - compile - - - api-common - com.google.api - - - google-auth-library-credentials - com.google.auth - - - threetenbp - org.threeten - - - google-auth-library-oauth2-http - com.google.auth - - - jsr305 - com.google.code.findbugs - - - guava - com.google.guava - - - opencensus-api - io.opencensus - - - false - - - - com.google.cloud - google-cloud-spanner - ${google.cloud.spanner.version} - - - com.google.protobuf - protobuf-java - ${google.protobuf.java.version} - - - org.apache.commons - commons-lang3 - 3.5 - - - - - io.cdap.cdap - hydrator-test - test - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-spanner/src/test/resources/credentials.json b/google-cloud-spanner/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-spanner/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-spanner/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-spanner/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml deleted file mode 100644 index 0ab5a19a4..000000000 --- a/google-cloud-speech/pom.xml +++ /dev/null @@ -1,318 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-speech - 0.21.0-SNAPSHOT - Google Cloud Speech Plugins - Speech GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - com.google.cloud - google-cloud-speech - ${google.cloud.speech.version} - - - com.google.protobuf - protobuf-java - ${google.protobuf.java.version} - - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-speech/src/test/resources/credentials.json b/google-cloud-speech/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-speech/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-speech/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-speech/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml deleted file mode 100644 index 14a3e7397..000000000 --- a/google-cloud-storage/pom.xml +++ /dev/null @@ -1,354 +0,0 @@ - - - - 4.0.0 - - io.cdap.plugin - google-cloud - 0.21.0-SNAPSHOT - - - io.cdap.plugin - google-cloud-storage - 0.21.0-SNAPSHOT - Google Cloud GCS Plugins - GCS GCP Plugins - - - - io.cdap.plugin - google-cloud-common - ${project.version} - - - io.cdap.plugin - format-common - ${cdap.plugin.version} - - - com.google.crypto.tink - tink - ${google.tink.version} - - - com.google.crypto.tink - tink-gcpkms - ${google.tink.version} - - - com.google.cloud - google-cloud-storage - ${google.cloud.storage.version} - - - com.fasterxml.jackson.core - jackson-databind - - - - io.cdap.cdap - hydrator-test - test - - - io.cdap.cdap - cdap-unit-test - ${cdap.version} - test - - - org.apache.hive - hive-exec - - - io.cdap.cdap - cdap-explore-jdbc - - - - - junit - junit - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito2 - test - - - - - - ${testSourceLocation} - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - validate - process-test-classes - - checkstyle.xml - suppressions.xml - UTF-8 - true - true - true - - src/test/java - src/e2e-test/java - - - - check - - - - - - com.puppycrawl.tools - checkstyle - 6.19 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.14.1 - - -Xmx512m - - ${project.build.directory} - - - **/*TestSuite.java - **/Test*.java - **/*Test.java - **/*TestCase.java - - - - - - org.apache.felix - maven-bundle-plugin - 3.5.1 - true - - - *;inline=false;scope=compile - true - lib - - <_exportcontents> - io.cdap.plugin.gcp.*; - com.google.cloud.hadoop.*; - - - - - - package - - bundle - - - - - - - io.cdap - cdap-maven-plugin - 1.1.0 - - - system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) - - - - - create-artifact-config - prepare-package - - create-plugin-json - - - - - - - - - - - release - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - package - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - http://download.oracle.com/javase/${jee.version}/docs/api/ - - ${project.name} ${project.version} - - CDAP Licensed under the Apache License, Version 2.0.]]> - - - - - attach-javadoc - package - - jar - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - attach-artifacts - package - - attach-artifact - - - - - target/${project.artifactId}-${project.version}.json - json - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - v${releaseVersion} - v@{project.version} - true - - releases - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - https://oss.sonatype.org - sonatype.release - - - - - - - cloudBuild - - cloudBuild - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - false - - - - - - - diff --git a/google-cloud-storage/src/test/resources/credentials.json b/google-cloud-storage/src/test/resources/credentials.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/google-cloud-storage/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/google-cloud-storage/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker deleted file mode 100644 index ca6ee9cea..000000000 --- a/google-cloud-storage/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker +++ /dev/null @@ -1 +0,0 @@ -mock-maker-inline \ No newline at end of file diff --git a/google-cloud-bigquery/icons/BigQueryArgumentSetter-action.png b/icons/BigQueryArgumentSetter-action.png similarity index 100% rename from google-cloud-bigquery/icons/BigQueryArgumentSetter-action.png rename to icons/BigQueryArgumentSetter-action.png diff --git a/google-cloud-bigquery/icons/BigQueryExecute-action.png b/icons/BigQueryExecute-action.png similarity index 100% rename from google-cloud-bigquery/icons/BigQueryExecute-action.png rename to icons/BigQueryExecute-action.png diff --git a/google-cloud-bigquery/icons/BigQueryMultiTable-batchsink.png b/icons/BigQueryMultiTable-batchsink.png similarity index 100% rename from google-cloud-bigquery/icons/BigQueryMultiTable-batchsink.png rename to icons/BigQueryMultiTable-batchsink.png diff --git a/google-cloud-bigquery/icons/BigQueryTable-batchsink.png b/icons/BigQueryTable-batchsink.png similarity index 100% rename from google-cloud-bigquery/icons/BigQueryTable-batchsink.png rename to icons/BigQueryTable-batchsink.png diff --git a/google-cloud-bigquery/icons/BigQueryTable-batchsource.png b/icons/BigQueryTable-batchsource.png similarity index 100% rename from google-cloud-bigquery/icons/BigQueryTable-batchsource.png rename to icons/BigQueryTable-batchsource.png diff --git a/google-cloud-bigtable/icons/Bigtable-batchsink.png b/icons/Bigtable-batchsink.png similarity index 100% rename from google-cloud-bigtable/icons/Bigtable-batchsink.png rename to icons/Bigtable-batchsink.png diff --git a/google-cloud-bigtable/icons/Bigtable-batchsource.png b/icons/Bigtable-batchsource.png similarity index 100% rename from google-cloud-bigtable/icons/Bigtable-batchsource.png rename to icons/Bigtable-batchsource.png diff --git a/google-cloud-dataplex/icons/Dataplex-batchsink.png b/icons/Dataplex-batchsink.png similarity index 100% rename from google-cloud-dataplex/icons/Dataplex-batchsink.png rename to icons/Dataplex-batchsink.png diff --git a/google-cloud-dataplex/icons/Dataplex-batchsource.png b/icons/Dataplex-batchsource.png similarity index 100% rename from google-cloud-dataplex/icons/Dataplex-batchsource.png rename to icons/Dataplex-batchsource.png diff --git a/google-cloud-datastore/icons/Datastore-batchsink.png b/icons/Datastore-batchsink.png similarity index 100% rename from google-cloud-datastore/icons/Datastore-batchsink.png rename to icons/Datastore-batchsink.png diff --git a/google-cloud-datastore/icons/Datastore-batchsource.png b/icons/Datastore-batchsource.png similarity index 100% rename from google-cloud-datastore/icons/Datastore-batchsource.png rename to icons/Datastore-batchsource.png diff --git a/google-cloud-storage/icons/GCS-batchsink.png b/icons/GCS-batchsink.png similarity index 100% rename from google-cloud-storage/icons/GCS-batchsink.png rename to icons/GCS-batchsink.png diff --git a/google-cloud-storage/icons/GCS-connector.png b/icons/GCS-connector.png similarity index 100% rename from google-cloud-storage/icons/GCS-connector.png rename to icons/GCS-connector.png diff --git a/google-cloud-storage/icons/GCSArgumentSetter-action.png b/icons/GCSArgumentSetter-action.png similarity index 100% rename from google-cloud-storage/icons/GCSArgumentSetter-action.png rename to icons/GCSArgumentSetter-action.png diff --git a/google-cloud-storage/icons/GCSBucketCreate-action.png b/icons/GCSBucketCreate-action.png similarity index 100% rename from google-cloud-storage/icons/GCSBucketCreate-action.png rename to icons/GCSBucketCreate-action.png diff --git a/google-cloud-storage/icons/GCSBucketDelete-action.png b/icons/GCSBucketDelete-action.png similarity index 100% rename from google-cloud-storage/icons/GCSBucketDelete-action.png rename to icons/GCSBucketDelete-action.png diff --git a/google-cloud-storage/icons/GCSCopy-action.png b/icons/GCSCopy-action.png similarity index 100% rename from google-cloud-storage/icons/GCSCopy-action.png rename to icons/GCSCopy-action.png diff --git a/google-cloud-storage/icons/GCSDoneFileMarker-postaction.png b/icons/GCSDoneFileMarker-postaction.png similarity index 100% rename from google-cloud-storage/icons/GCSDoneFileMarker-postaction.png rename to icons/GCSDoneFileMarker-postaction.png diff --git a/google-cloud-storage/icons/GCSFile-batchsource.png b/icons/GCSFile-batchsource.png similarity index 100% rename from google-cloud-storage/icons/GCSFile-batchsource.png rename to icons/GCSFile-batchsource.png diff --git a/google-cloud-storage/icons/GCSMove-action.png b/icons/GCSMove-action.png similarity index 100% rename from google-cloud-storage/icons/GCSMove-action.png rename to icons/GCSMove-action.png diff --git a/google-cloud-storage/icons/GCSMultiFiles-batchsink.png b/icons/GCSMultiFiles-batchsink.png similarity index 100% rename from google-cloud-storage/icons/GCSMultiFiles-batchsink.png rename to icons/GCSMultiFiles-batchsink.png diff --git a/google-cloud-pubsub/icons/GooglePublisher-batchsink.png b/icons/GooglePublisher-batchsink.png similarity index 100% rename from google-cloud-pubsub/icons/GooglePublisher-batchsink.png rename to icons/GooglePublisher-batchsink.png diff --git a/google-cloud-pubsub/icons/GoogleSubscriber-streamingsource.png b/icons/GoogleSubscriber-streamingsource.png similarity index 100% rename from google-cloud-pubsub/icons/GoogleSubscriber-streamingsource.png rename to icons/GoogleSubscriber-streamingsource.png diff --git a/google-cloud-spanner/icons/Spanner-batchsink.png b/icons/Spanner-batchsink.png similarity index 100% rename from google-cloud-spanner/icons/Spanner-batchsink.png rename to icons/Spanner-batchsink.png diff --git a/google-cloud-spanner/icons/Spanner-batchsource.png b/icons/Spanner-batchsource.png similarity index 100% rename from google-cloud-spanner/icons/Spanner-batchsource.png rename to icons/Spanner-batchsource.png diff --git a/google-cloud-speech/icons/SpeechToText-transform.png b/icons/SpeechToText-transform.png similarity index 100% rename from google-cloud-speech/icons/SpeechToText-transform.png rename to icons/SpeechToText-transform.png diff --git a/pom.xml b/pom.xml index 25d8d9f75..82f35ba77 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + + + org.awaitility + awaitility + 3.1.6 + + + com.google.api + gax + 2.12.2 + compile + + + api-common + com.google.api + + + google-auth-library-credentials + com.google.auth + + + threetenbp + org.threeten + + + google-auth-library-oauth2-http + com.google.auth + + + jsr305 + com.google.code.findbugs + + + guava + com.google.guava + + + opencensus-api + io.opencensus + + + false + + + com.google.api + gax-grpc + 2.12.2 + compile + + + gax + com.google.api + + + api-common + com.google.api + + + proto-google-common-protos + com.google.api.grpc + + + google-auth-library-credentials + com.google.auth + + + guava + com.google.guava + + + grpc-api + io.grpc + + + threetenbp + org.threeten + + + google-auth-library-oauth2-http + com.google.auth + + + jsr305 + com.google.code.findbugs + + + grpc-auth + io.grpc + + + grpc-netty-shaded + io.grpc + + + grpc-protobuf + io.grpc + + + grpc-stub + io.grpc + + + grpc-xds + io.grpc + + + false + + + + commons-lang + commons-lang + 2.6 + + + org.apache.avro + avro + ${avro.version} + + + io.cdap.cdap + cdap-formats + ${cdap.version} + + + org.apache.avro + avro + + + + + io.cdap.cdap + cdap-features + ${cdap.version} + io.cdap.cdap cdap-api + ${cdap.version} provided io.cdap.cdap cdap-etl-api + ${cdap.version} + provided + + + io.cdap.cdap + cdap-etl-proto + ${cdap.version} + provided + + + io.cdap.cdap + cdap-etl-batch + ${cdap.version} provided - - + + io.cdap.plugin + format-common + ${cdap.plugin.version} + + + io.cdap.plugin + format-avro + ${cdap.plugin.version} + io.cdap.plugin hydrator-common ${cdap.plugin.version} - - + + com.google.guava + guava + ${guava.version} + + + com.google.cloud.bigdataoss + bigquery-connector + ${bigquery.connector.hadoop2.version} + + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + com.google.cloud.bigtable + bigtable-hbase-1.x-mapreduce + ${google.cloud.bigtable.version} + + + org.apache.hbase + hbase-client + + + org.apache.hbase + hbase-server + + + + org.apache.hbase + hbase-common + + + + + + org.apache.hbase + hbase-shaded-client + ${hbase-shaded-client.version} + + + org.slf4j + slf4j-log4j12 + + + + + + org.apache.hbase + hbase-shaded-server + ${hbase-shaded-server.version} + + + org.slf4j + slf4j-log4j12 + + + + + io.dropwizard.metrics + metrics-core + ${dropwizard.metrics-core.version} + + + com.google.cloud + google-cloud-bigquery + ${google.cloud.bigquery.version} + + + com.google.crypto.tink + tink + ${google.tink.version} + + + com.google.crypto.tink + tink-gcpkms + ${google.tink.version} + + + com.google.cloud + google-cloud-spanner + ${google.cloud.spanner.version} + + + com.google.cloud + google-cloud-datastore + ${google.cloud.datastore.version} + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + provided + + + com.google.protobuf + protobuf-java + + + commons-logging + commons-logging + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.apache.avro + avro + + + org.apache.zookeeper + zookeeper + + + guava + com.google.guava + + + jersey-core + com.sun.jersey + + + jersey-json + com.sun.jersey + + + jersey-server + com.sun.jersey + + + servlet-api + javax.servlet + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + jasper-compiler + tomcat + + + jasper-runtime + tomcat + + + jsp-api + javax.servlet.jsp + + + slf4j-api + org.slf4j + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + provided + + + com.google.protobuf + protobuf-java + + + org.slf4j + slf4j-log4j12 + + + org.apache.avro + avro + + + + + com.google.cloud + google-cloud-speech + ${google.cloud.speech.version} + + + com.google.cloud + google-cloud-storage + ${google.cloud.storage.version} + + + com.google.cloud.bigdataoss + util-hadoop + ${gcs.connector.version} + + + com.google.cloud.bigdataoss + gcs-connector + ${gcs.connector.version} + + + com.google.cloud + google-cloud-kms + ${google.cloud.kms.version} + + + com.google.protobuf + protobuf-java + ${google.protobuf.java.version} + + + com.google.cloud + google-cloud-pubsub + ${google.cloud.pubsub.version} + + + org.apache.avro + avro-mapred + hadoop2 + ${avro.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.core.version} + org.slf4j slf4j-api + ${slf4j.version} + provided org.slf4j jcl-over-slf4j + ${slf4j.version} - - + + io.cdap.cdap + hydrator-test + ${cdap.version} + test + + + io.cdap.cdap + cdap-unit-test + ${cdap.version} + test + + + org.apache.hive + hive-exec + + + io.cdap.cdap + cdap-explore-jdbc + + + + + + junit + junit + ${junit.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito2 + ${powermock.version} + test + + + + org.apache.spark + spark-streaming_2.11 + ${spark.version} + provided + + + org.apache.spark + spark-core_2.11 + ${spark.version} + provided + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + org.apache.hadoop + hadoop-client + + + com.esotericsoftware.reflectasm + reflectasm + + + org.apache.curator + curator-recipes + + + org.tachyonproject + tachyon-client + + + org.scala-lang + scala-compiler + + + org.eclipse.jetty.orbit + javax.servlet + + + net.java.dev.jets3t + jets3t + + + + + org.xerial.snappy + snappy-java + 1.1.7.2 + + + + org.apache.bahir + spark-streaming-pubsub_2.11 + 2.4.0 + + - - - sonatype - https://oss.sonatype.org/content/groups/public - - true - - - false - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - + + + commons-codec + commons-codec + ${commons.codec.version} + + + com.google.flogger + flogger-system-backend + ${flogger.system.backend.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + io.cdap.cdap + cdap-etl-api-spark + ${cdap.version} + provided + + + io.cdap.cdap + cdap-api-spark2_2.11 + ${cdap.version} + provided + + + com.google.cloud.spark + spark-bigquery-with-dependencies_2.12 + ${spark-bq-connector.version} + + + javax.inject + javax.inject + 1 + + + org.apache.spark + spark-sql_2.12 + ${spark3.version} + provided + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + + com.google.cloud + google-cloud-dataplex + 0.2.0 + + + ${testSourceLocation} @@ -302,17 +811,183 @@ + + + org.apache.felix + maven-bundle-plugin + 3.5.1 + true + + + *;inline=false;scope=compile + true + lib + + <_exportcontents> + io.cdap.plugin.gcp.*; + com.google.cloud.hadoop.*; + org.apache.spark.streaming.pubsub*; + org.apache.hadoop.hbase.mapreduce.*; + org.apache.hadoop.hbase.security.token.*; + com.google.cloud.spark.bigquery.*; + + + + + + package + + bundle + + + + + + + io.cdap + cdap-maven-plugin + 1.1.0 + + + system:cdap-data-pipeline[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-streams[6.7.1-SNAPSHOT,7.0.0-SNAPSHOT) + + + + + create-artifact-config + prepare-package + + create-plugin-json + + + + + + release + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + true + + + + attach-sources + package + + jar-no-fork + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + -Xdoclint:none + + http://download.oracle.com/javase/${jee.version}/docs/api/ + + ${project.name} ${project.version} + + CDAP Licensed under the Apache License, Version 2.0.]]> + + + + + attach-javadoc + package + + jar + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + attach-artifacts + package + + attach-artifact + + + + + target/${project.artifactId}-${project.version}.json + json + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + ${gpg.passphrase} + ${gpg.useagent} + + + + + sign + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + v${releaseVersion} + v@{project.version} + true + + releases + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.2 + true + + https://oss.sonatype.org + sonatype.release + + + + + cloudBuild - - cloudBuild - + cloudBuild @@ -349,6 +1024,72 @@ true + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + + + ${TEST_RUNNER} + + + classes + 2 + 2 + true + + + + ${GOOGLE_APPLICATION_CREDENTIALS} + + + ${SERVICE_ACCOUNT_TYPE} + + + ${SERVICE_ACCOUNT_FILE_PATH} + + + ${SERVICE_ACCOUNT_JSON} + + + + + + + integration-test + + + + + + + net.masterthought + maven-cucumber-reporting + 5.5.0 + + + + execution + verify + + generate + + + Cucumber Reports + target/cucumber-reports/advanced-reports + 1 + false + ${project.build.directory}/cucumber-reports + + **/*.json + + ${project.build.directory}/cucumber-reports + true + + + + diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/BigQuerySinkError.feature b/src/e2e-test/features/bigquery/sink/BigQuerySinkError.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/BigQuerySinkError.feature rename to src/e2e-test/features/bigquery/sink/BigQuerySinkError.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/GCSToBigQuery.feature b/src/e2e-test/features/bigquery/sink/GCSToBigQuery.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/GCSToBigQuery.feature rename to src/e2e-test/features/bigquery/sink/GCSToBigQuery.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/GCSToBigQuery_WithMacro.feature b/src/e2e-test/features/bigquery/sink/GCSToBigQuery_WithMacro.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/sink/GCSToBigQuery_WithMacro.feature rename to src/e2e-test/features/bigquery/sink/GCSToBigQuery_WithMacro.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQuerySourceError.feature b/src/e2e-test/features/bigquery/source/BigQuerySourceError.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQuerySourceError.feature rename to src/e2e-test/features/bigquery/source/BigQuerySourceError.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToBigQuery.feature b/src/e2e-test/features/bigquery/source/BigQueryToBigQuery.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToBigQuery.feature rename to src/e2e-test/features/bigquery/source/BigQueryToBigQuery.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToBigQuery_withConnections.feature b/src/e2e-test/features/bigquery/source/BigQueryToBigQuery_withConnections.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToBigQuery_withConnections.feature rename to src/e2e-test/features/bigquery/source/BigQueryToBigQuery_withConnections.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToGCS.feature b/src/e2e-test/features/bigquery/source/BigQueryToGCS.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToGCS.feature rename to src/e2e-test/features/bigquery/source/BigQueryToGCS.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToGCS_WithMacro.feature b/src/e2e-test/features/bigquery/source/BigQueryToGCS_WithMacro.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToGCS_WithMacro.feature rename to src/e2e-test/features/bigquery/source/BigQueryToGCS_WithMacro.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToMultipleSinks.feature b/src/e2e-test/features/bigquery/source/BigQueryToMultipleSinks.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/bigquery/source/BigQueryToMultipleSinks.feature rename to src/e2e-test/features/bigquery/source/BigQueryToMultipleSinks.feature diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSink.feature b/src/e2e-test/features/gcs/sink/GCSSink.feature similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSink.feature rename to src/e2e-test/features/gcs/sink/GCSSink.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSinkError.feature b/src/e2e-test/features/gcs/sink/GCSSinkError.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcs/sink/GCSSinkError.feature rename to src/e2e-test/features/gcs/sink/GCSSinkError.feature diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceError.feature b/src/e2e-test/features/gcs/source/GCSSourceError.feature similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceError.feature rename to src/e2e-test/features/gcs/source/GCSSourceError.feature diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQuery.feature b/src/e2e-test/features/gcs/source/GCSSourceToBigQuery.feature similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQuery.feature rename to src/e2e-test/features/gcs/source/GCSSourceToBigQuery.feature diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature b/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature rename to src/e2e-test/features/gcs/source/GCSSourceToBigQueryAdditionalTests.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSToGCS_withConnections.feature b/src/e2e-test/features/gcs/source/GCSToGCS_withConnections.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSToGCS_withConnections.feature rename to src/e2e-test/features/gcs/source/GCSToGCS_withConnections.feature diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSourceSchema.feature b/src/e2e-test/features/gcs/source/GCSourceSchema.feature similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/features/gcs/source/GCSourceSchema.feature rename to src/e2e-test/features/gcs/source/GCSourceSchema.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcsdelete/GCSDelete.feature b/src/e2e-test/features/gcsdelete/GCSDelete.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcsdelete/GCSDelete.feature rename to src/e2e-test/features/gcsdelete/GCSDelete.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcsdelete/GCSDelete_WithMacro.feature b/src/e2e-test/features/gcsdelete/GCSDelete_WithMacro.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcsdelete/GCSDelete_WithMacro.feature rename to src/e2e-test/features/gcsdelete/GCSDelete_WithMacro.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMove.feature b/src/e2e-test/features/gcsmove/GCSMove.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMove.feature rename to src/e2e-test/features/gcsmove/GCSMove.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMoveErrorScenarios.feature b/src/e2e-test/features/gcsmove/GCSMoveErrorScenarios.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMoveErrorScenarios.feature rename to src/e2e-test/features/gcsmove/GCSMoveErrorScenarios.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMove_WithMacro.feature b/src/e2e-test/features/gcsmove/GCSMove_WithMacro.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/gcsmove/GCSMove_WithMacro.feature rename to src/e2e-test/features/gcsmove/GCSMove_WithMacro.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/BQToPubSub.feature b/src/e2e-test/features/pubsub/sink/BQToPubSub.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/BQToPubSub.feature rename to src/e2e-test/features/pubsub/sink/BQToPubSub.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/GCSToPubSub.feature b/src/e2e-test/features/pubsub/sink/GCSToPubSub.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/GCSToPubSub.feature rename to src/e2e-test/features/pubsub/sink/GCSToPubSub.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/GCSToPubSub_WithMacro.feature b/src/e2e-test/features/pubsub/sink/GCSToPubSub_WithMacro.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/GCSToPubSub_WithMacro.feature rename to src/e2e-test/features/pubsub/sink/GCSToPubSub_WithMacro.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/PubSubSinkErrorScnerios.feature b/src/e2e-test/features/pubsub/sink/PubSubSinkErrorScnerios.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/pubsub/sink/PubSubSinkErrorScnerios.feature rename to src/e2e-test/features/pubsub/sink/PubSubSinkErrorScnerios.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/BQToSpanner.feature b/src/e2e-test/features/spanner/sink/BQToSpanner.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/BQToSpanner.feature rename to src/e2e-test/features/spanner/sink/BQToSpanner.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/GCSToSpanner.feature b/src/e2e-test/features/spanner/sink/GCSToSpanner.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/GCSToSpanner.feature rename to src/e2e-test/features/spanner/sink/GCSToSpanner.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/SpannerSinkErrorScenarios.feature b/src/e2e-test/features/spanner/sink/SpannerSinkErrorScenarios.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/sink/SpannerSinkErrorScenarios.feature rename to src/e2e-test/features/spanner/sink/SpannerSinkErrorScenarios.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannerSourceErrorScenarios.feature b/src/e2e-test/features/spanner/source/SpannerSourceErrorScenarios.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannerSourceErrorScenarios.feature rename to src/e2e-test/features/spanner/source/SpannerSourceErrorScenarios.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannerToSpanner_withConnections.feature b/src/e2e-test/features/spanner/source/SpannerToSpanner_withConnections.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannerToSpanner_withConnections.feature rename to src/e2e-test/features/spanner/source/SpannerToSpanner_withConnections.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannertoBQ.feature b/src/e2e-test/features/spanner/source/SpannertoBQ.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannertoBQ.feature rename to src/e2e-test/features/spanner/source/SpannertoBQ.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannertoGCS.feature b/src/e2e-test/features/spanner/source/SpannertoGCS.feature similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/features/spanner/source/SpannertoGCS.feature rename to src/e2e-test/features/spanner/source/SpannertoGCS.feature diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sinkrunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/runners/sourcerunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQueryBase.java b/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQueryBase.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQueryBase.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQueryBase.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySink.java b/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySink.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySink.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySink.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySource.java b/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySource.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySource.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySource.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/common/runners/cmekrunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/common/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/common/runners/common/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/common/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/common/runners/common/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/common/package-info.java b/src/e2e-test/java/io/cdap/plugin/common/runners/common/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/runners/common/package-info.java rename to src/e2e-test/java/io/cdap/plugin/common/runners/common/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java b/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java rename to src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/common/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcs/runners/sinkrunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcs/runners/sourcerunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSBase.java b/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSBase.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSBase.java rename to src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSBase.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSink.java b/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSink.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSink.java rename to src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSink.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSource.java b/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSource.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSource.java rename to src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/GCSSource.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcs/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/GCSDeleteActions.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/GCSDeleteActions.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/GCSDeleteActions.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/GCSDeleteActions.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/actions/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/GCSDeleteLocators.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/GCSDeleteLocators.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/GCSDeleteLocators.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/GCSDeleteLocators.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/locators/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/runners/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/GCSDelete.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/GCSDelete.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/GCSDelete.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/GCSDelete.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsdelete/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/GCSMoveActions.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/GCSMoveActions.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/GCSMoveActions.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/actions/GCSMoveActions.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/actions/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/actions/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/GCSMoveLocators.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/GCSMoveLocators.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/GCSMoveLocators.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/locators/GCSMoveLocators.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/locators/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/locators/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/runners/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/runners/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/runners/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/GCSMove.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/GCSMove.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/GCSMove.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/GCSMove.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/gcsmove/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/actions/PubSubActions.java b/src/e2e-test/java/io/cdap/plugin/pubsub/actions/PubSubActions.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/actions/PubSubActions.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/actions/PubSubActions.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/actions/package-info.java b/src/e2e-test/java/io/cdap/plugin/pubsub/actions/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/actions/package-info.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/actions/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/locators/PubSubLocators.java b/src/e2e-test/java/io/cdap/plugin/pubsub/locators/PubSubLocators.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/locators/PubSubLocators.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/locators/PubSubLocators.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/locators/package-info.java b/src/e2e-test/java/io/cdap/plugin/pubsub/locators/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/locators/package-info.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/locators/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/runners/sinkrunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubBase.java b/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubBase.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubBase.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubBase.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSink.java b/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSink.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSink.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSink.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSource.java b/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSource.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSource.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/PubSubSource.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/pubsub/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/actions/SpannerActions.java b/src/e2e-test/java/io/cdap/plugin/spanner/actions/SpannerActions.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/actions/SpannerActions.java rename to src/e2e-test/java/io/cdap/plugin/spanner/actions/SpannerActions.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/actions/package-info.java b/src/e2e-test/java/io/cdap/plugin/spanner/actions/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/actions/package-info.java rename to src/e2e-test/java/io/cdap/plugin/spanner/actions/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/locators/SpannerLocators.java b/src/e2e-test/java/io/cdap/plugin/spanner/locators/SpannerLocators.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/locators/SpannerLocators.java rename to src/e2e-test/java/io/cdap/plugin/spanner/locators/SpannerLocators.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/locators/package-info.java b/src/e2e-test/java/io/cdap/plugin/spanner/locators/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/locators/package-info.java rename to src/e2e-test/java/io/cdap/plugin/spanner/locators/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/spanner/runners/sinkrunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunner.java b/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunner.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunner.java rename to src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunner.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunnerRequired.java b/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunnerRequired.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunnerRequired.java rename to src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/TestRunnerRequired.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/package-info.java b/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/package-info.java rename to src/e2e-test/java/io/cdap/plugin/spanner/runners/sourcerunner/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerBase.java b/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerBase.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerBase.java rename to src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerBase.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSink.java b/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSink.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSink.java rename to src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSink.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSource.java b/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSource.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSource.java rename to src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/SpannerSource.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/package-info.java b/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/package-info.java rename to src/e2e-test/java/io/cdap/plugin/spanner/stepsdesign/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java b/src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java similarity index 98% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java rename to src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java index 4ee4e3d4d..dbb7add2e 100644 --- a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java +++ b/src/e2e-test/java/io/cdap/plugin/utils/CdfPluginPropertyLocator.java @@ -1,6 +1,6 @@ package io.cdap.plugin.utils; -import com.google.common.collect.ImmutableMap; +import org.sparkproject.guava.collect.ImmutableMap; import java.util.Map; import javax.annotation.Nullable; diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/E2EHelper.java b/src/e2e-test/java/io/cdap/plugin/utils/E2EHelper.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/E2EHelper.java rename to src/e2e-test/java/io/cdap/plugin/utils/E2EHelper.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/E2ETestConstants.java b/src/e2e-test/java/io/cdap/plugin/utils/E2ETestConstants.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/E2ETestConstants.java rename to src/e2e-test/java/io/cdap/plugin/utils/E2ETestConstants.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/PubSubClient.java b/src/e2e-test/java/io/cdap/plugin/utils/PubSubClient.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/PubSubClient.java rename to src/e2e-test/java/io/cdap/plugin/utils/PubSubClient.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/SpannerClient.java b/src/e2e-test/java/io/cdap/plugin/utils/SpannerClient.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/SpannerClient.java rename to src/e2e-test/java/io/cdap/plugin/utils/SpannerClient.java diff --git a/google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/package-info.java b/src/e2e-test/java/io/cdap/plugin/utils/package-info.java similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/java/io/cdap/plugin/utils/package-info.java rename to src/e2e-test/java/io/cdap/plugin/utils/package-info.java diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/cmek-config.properties b/src/e2e-test/resources/cmek-config.properties similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/cmek-config.properties rename to src/e2e-test/resources/cmek-config.properties diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/errorMessage.properties b/src/e2e-test/resources/errorMessage.properties similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/errorMessage.properties rename to src/e2e-test/resources/errorMessage.properties diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/logback-test.xml b/src/e2e-test/resources/logback-test.xml similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/logback-test.xml rename to src/e2e-test/resources/logback-test.xml diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/pluginDataCyAttributes.properties b/src/e2e-test/resources/pluginDataCyAttributes.properties similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/pluginDataCyAttributes.properties rename to src/e2e-test/resources/pluginDataCyAttributes.properties diff --git a/google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/resources/pluginParameters.properties b/src/e2e-test/resources/pluginParameters.properties similarity index 100% rename from google-cloud-e2e-tests/google-cloud-e2e-tests/src/e2e-test/resources/pluginParameters.properties rename to src/e2e-test/resources/pluginParameters.properties diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateTableQuery.txt b/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateTableQuery.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateTableQuery.txt rename to src/e2e-test/resources/testdata/BigQuery/BigQueryCreateTableQuery.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateViewQuery.txt b/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateViewQuery.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryCreateViewQuery.txt rename to src/e2e-test/resources/testdata/BigQuery/BigQueryCreateViewQuery.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryInsertDataQuery.txt b/src/e2e-test/resources/testdata/BigQuery/BigQueryInsertDataQuery.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/BigQuery/BigQueryInsertDataQuery.txt rename to src/e2e-test/resources/testdata/BigQuery/BigQueryInsertDataQuery.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_AVRO_TEST.avro b/src/e2e-test/resources/testdata/GCS_AVRO_TEST.avro similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_AVRO_TEST.avro rename to src/e2e-test/resources/testdata/GCS_AVRO_TEST.avro diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_BLOB_TEST.zip b/src/e2e-test/resources/testdata/GCS_BLOB_TEST.zip similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_BLOB_TEST.zip rename to src/e2e-test/resources/testdata/GCS_BLOB_TEST.zip diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_CSV_RANGE_TEST.csv b/src/e2e-test/resources/testdata/GCS_CSV_RANGE_TEST.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_CSV_RANGE_TEST.csv rename to src/e2e-test/resources/testdata/GCS_CSV_RANGE_TEST.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_CSV_TEST.csv b/src/e2e-test/resources/testdata/GCS_CSV_TEST.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_CSV_TEST.csv rename to src/e2e-test/resources/testdata/GCS_CSV_TEST.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST.csv b/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST.csv rename to src/e2e-test/resources/testdata/GCS_DATATYPE_TEST.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_1.csv b/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_1.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_1.csv rename to src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_1.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_2.csv b/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_2.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_2.csv rename to src/e2e-test/resources/testdata/GCS_DATATYPE_TEST_2.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DELIMITED_TEST.txt b/src/e2e-test/resources/testdata/GCS_DELIMITED_TEST.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_DELIMITED_TEST.txt rename to src/e2e-test/resources/testdata/GCS_DELIMITED_TEST.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_OUTPUTFIELD_TEST.csv b/src/e2e-test/resources/testdata/GCS_OUTPUTFIELD_TEST.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_OUTPUTFIELD_TEST.csv rename to src/e2e-test/resources/testdata/GCS_OUTPUTFIELD_TEST.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_PARQUET_TEST.parquet b/src/e2e-test/resources/testdata/GCS_PARQUET_TEST.parquet similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_PARQUET_TEST.parquet rename to src/e2e-test/resources/testdata/GCS_PARQUET_TEST.parquet diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile1.csv b/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile1.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile1.csv rename to src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile1.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile2.csv b/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile2.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile2.csv rename to src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile2.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile3.csv b/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile3.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile3.csv rename to src/e2e-test/resources/testdata/GCS_RECURSIVE_TEST/recursiveFile3.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_TEXT_TEST.txt b/src/e2e-test/resources/testdata/GCS_TEXT_TEST.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_TEXT_TEST.txt rename to src/e2e-test/resources/testdata/GCS_TEXT_TEST.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_TSV_TEST.tsv b/src/e2e-test/resources/testdata/GCS_TSV_TEST.tsv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_TSV_TEST.tsv rename to src/e2e-test/resources/testdata/GCS_TSV_TEST.tsv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/test/wildcardFile1.csv b/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/test/wildcardFile1.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/test/wildcardFile1.csv rename to src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/test/wildcardFile1.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile2.csv b/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile2.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile2.csv rename to src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile2.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile3.csv b/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile3.csv similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile3.csv rename to src/e2e-test/resources/testdata/GCS_WILDCARD_TEST/wildcardFile3.csv diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerCreateTableQueries.txt b/src/e2e-test/resources/testdata/SpannerCreateTableQueries.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerCreateTableQueries.txt rename to src/e2e-test/resources/testdata/SpannerCreateTableQueries.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerInsertDataQueries.txt b/src/e2e-test/resources/testdata/SpannerInsertDataQueries.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerInsertDataQueries.txt rename to src/e2e-test/resources/testdata/SpannerInsertDataQueries.txt diff --git a/google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerInsertEmployeeBasicDataQueries.txt b/src/e2e-test/resources/testdata/SpannerInsertEmployeeBasicDataQueries.txt similarity index 100% rename from google-cloud-e2e-tests/src/e2e-test/resources/testdata/SpannerInsertEmployeeBasicDataQueries.txt rename to src/e2e-test/resources/testdata/SpannerInsertEmployeeBasicDataQueries.txt diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryAction.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryAction.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryAction.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryAction.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryActionConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryActionConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryActionConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/action/AbstractBigQueryActionConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java b/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java similarity index 99% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java index 839fbbe28..10b3426e7 100644 --- a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java +++ b/src/main/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecute.java @@ -17,8 +17,10 @@ package io.cdap.plugin.gcp.bigquery.action; import com.google.auth.Credentials; +import com.google.cloud.ServiceOptions; import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQueryException; +import com.google.cloud.bigquery.Dataset; import com.google.cloud.bigquery.DatasetId; import com.google.cloud.bigquery.EncryptionConfiguration; import com.google.cloud.bigquery.Field; @@ -40,6 +42,7 @@ import io.cdap.cdap.etl.api.FailureCollector; import io.cdap.cdap.etl.api.action.Action; import io.cdap.cdap.etl.api.action.ActionContext; +import io.cdap.plugin.common.ConfigUtil; import io.cdap.plugin.gcp.bigquery.sink.BigQuerySinkUtils; import io.cdap.plugin.gcp.bigquery.util.BigQueryUtil; import io.cdap.plugin.gcp.common.CmekUtils; diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/common/BigQueryBaseConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/common/BigQueryBaseConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/common/BigQueryBaseConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/common/BigQueryBaseConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnector.java b/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnector.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnector.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnector.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorSpecificConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorSpecificConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorSpecificConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorSpecificConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPath.java b/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPath.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPath.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPath.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelation.java b/src/main/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelation.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelation.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelation.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpression.java b/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpression.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpression.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpression.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpressionFactory.java b/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpressionFactory.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpressionFactory.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/relational/SQLExpressionFactory.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySink.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySinkConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySinkConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/AbstractBigQuerySinkConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroOutputFormat.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroOutputFormat.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroRecordWriter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroRecordWriter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroRecordWriter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/AvroRecordWriter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryAvroConverter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryAvroConverter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryAvroConverter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryAvroConverter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryJsonConverter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryJsonConverter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryJsonConverter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryJsonConverter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSink.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSink.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSink.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSink.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSinkConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryMultiSinkConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormat.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormat.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatProvider.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatProvider.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordToJson.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordWriter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordWriter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordWriter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryRecordWriter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySink.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySink.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySink.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySink.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java similarity index 99% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java index 18ac9350f..0fd8cf283 100644 --- a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java +++ b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkConfig.java @@ -40,6 +40,7 @@ import java.io.IOException; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtils.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormat.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormat.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormatProvider.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputFormatProvider.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkRecordWriter.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkRecordWriter.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkRecordWriter.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkRecordWriter.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/MultiSinkOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/MultiSinkOutputFormatProvider.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/MultiSinkOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/MultiSinkOutputFormatProvider.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/Operation.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/Operation.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/Operation.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/Operation.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/PartitionType.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sink/PartitionType.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sink/PartitionType.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sink/PartitionType.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryAvroToStructuredTransformer.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryAvroToStructuredTransformer.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryAvroToStructuredTransformer.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryAvroToStructuredTransformer.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryFactoryWithScopes.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryFactoryWithScopes.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryFactoryWithScopes.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryFactoryWithScopes.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryInputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryInputFormatProvider.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryInputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQueryInputFormatProvider.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java similarity index 99% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java index 7e72da1f4..42e0edac8 100644 --- a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java +++ b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySource.java @@ -28,6 +28,7 @@ import com.google.cloud.bigquery.TimePartitioning; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.storage.Storage; +import com.google.common.base.Strings; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Metadata; import io.cdap.cdap.api.annotation.MetadataProperty; diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtils.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormat.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormat.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryJobType.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryJobType.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryJobType.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryJobType.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPullDataset.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPullDataset.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPullDataset.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPullDataset.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPushDataset.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPushDataset.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPushDataset.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryPushDataset.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLDataset.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLDataset.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLDataset.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLDataset.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java similarity index 99% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java index 642c555fa..6c32c4b58 100644 --- a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java +++ b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java @@ -26,6 +26,7 @@ import com.google.cloud.storage.Storage; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; +import io.cdap.cdap.api.RuntimeContext; import io.cdap.cdap.api.SQLEngineContext; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Metadata; diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfig.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfig.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfig.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySelectDataset.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySelectDataset.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySelectDataset.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySelectDataset.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySparkDatasetProducer.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySparkDatasetProducer.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySparkDatasetProducer.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySparkDatasetProducer.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryWrite.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryWrite.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryWrite.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQueryWrite.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryBaseSQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryBaseSQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryBaseSQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryBaseSQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilder.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilder.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilder.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilder.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PullTransform.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PullTransform.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PullTransform.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PullTransform.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PushTransform.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PushTransform.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PushTransform.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/PushTransform.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformer.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformer.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformer.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformer.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtils.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtils.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtils.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtils.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidation.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidation.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidation.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidation.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryConstants.java b/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryConstants.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryConstants.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryConstants.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParser.java b/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParser.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParser.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParser.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryTypeSize.java b/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryTypeSize.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryTypeSize.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryTypeSize.java diff --git a/google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java b/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java similarity index 100% rename from google-cloud-bigquery/src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java rename to src/main/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtil.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/common/HBaseColumn.java b/src/main/java/io/cdap/plugin/gcp/bigtable/common/HBaseColumn.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/common/HBaseColumn.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/common/HBaseColumn.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableOutputFormat.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableOutputFormat.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java b/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java similarity index 99% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java index 90ecf5d13..6a57bd6bc 100644 --- a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java +++ b/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSink.java @@ -22,6 +22,7 @@ import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Name; import io.cdap.cdap.api.annotation.Plugin; +import io.cdap.cdap.api.annotation.Requirements; import io.cdap.cdap.api.data.batch.Output; import io.cdap.cdap.api.data.format.StructuredRecord; import io.cdap.cdap.api.data.schema.Schema; diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfig.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfig.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformer.java b/src/main/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformer.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformer.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformer.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableInputFormat.java b/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableInputFormat.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableInputFormat.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableInputFormat.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSource.java b/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSource.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSource.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSource.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfig.java b/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfig.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfig.java diff --git a/google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformer.java b/src/main/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformer.java similarity index 100% rename from google-cloud-bigtable/src/main/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformer.java rename to src/main/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformer.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java b/src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java similarity index 98% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java rename to src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java index 590b67aa0..ed8ecc1af 100644 --- a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java +++ b/src/main/java/io/cdap/plugin/gcp/common/CmekUtils.java @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Cask Data, Inc. + * Copyright © 2021 Cask Data, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -28,6 +28,8 @@ import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageException; import com.google.common.base.Strings; +import io.cdap.cdap.api.plugin.PluginConfig; +import io.cdap.cdap.etl.api.Arguments; import io.cdap.cdap.etl.api.FailureCollector; import io.cdap.plugin.gcp.gcs.GCSPath; diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/ErrorHandling.java b/src/main/java/io/cdap/plugin/gcp/common/ErrorHandling.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/ErrorHandling.java rename to src/main/java/io/cdap/plugin/gcp/common/ErrorHandling.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/FileSetUtil.java b/src/main/java/io/cdap/plugin/gcp/common/FileSetUtil.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/FileSetUtil.java rename to src/main/java/io/cdap/plugin/gcp/common/FileSetUtil.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPConfig.java b/src/main/java/io/cdap/plugin/gcp/common/GCPConfig.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPConfig.java rename to src/main/java/io/cdap/plugin/gcp/common/GCPConfig.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPConnectorConfig.java b/src/main/java/io/cdap/plugin/gcp/common/GCPConnectorConfig.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPConnectorConfig.java rename to src/main/java/io/cdap/plugin/gcp/common/GCPConnectorConfig.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSinkConfig.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSinkConfig.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSourceConfig.java b/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSourceConfig.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/common/GCPReferenceSourceConfig.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java b/src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java similarity index 99% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java rename to src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java index 5bebe772c..ba5fd0a9c 100644 --- a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java +++ b/src/main/java/io/cdap/plugin/gcp/common/GCPUtils.java @@ -20,6 +20,7 @@ import com.google.auth.oauth2.ExternalAccountCredentials; import com.google.auth.oauth2.GoogleCredentials; import com.google.auth.oauth2.ServiceAccountCredentials; +import com.google.bigtable.repackaged.com.google.gson.Gson; import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.BigQueryOptions; import com.google.cloud.hadoop.fs.gcs.GoogleHadoopFS; @@ -31,7 +32,6 @@ import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageException; import com.google.cloud.storage.StorageOptions; -import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import io.cdap.plugin.gcp.gcs.GCSPath; import io.cdap.plugin.gcp.gcs.ServiceAccountAccessTokenProvider; diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/MappingException.java b/src/main/java/io/cdap/plugin/gcp/common/MappingException.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/MappingException.java rename to src/main/java/io/cdap/plugin/gcp/common/MappingException.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/Schemas.java b/src/main/java/io/cdap/plugin/gcp/common/Schemas.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/Schemas.java rename to src/main/java/io/cdap/plugin/gcp/common/Schemas.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/SourceOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/common/SourceOutputFormatProvider.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/common/SourceOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/common/SourceOutputFormatProvider.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/Decryptor.java b/src/main/java/io/cdap/plugin/gcp/crypto/Decryptor.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/Decryptor.java rename to src/main/java/io/cdap/plugin/gcp/crypto/Decryptor.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/EncryptedFileSystem.java b/src/main/java/io/cdap/plugin/gcp/crypto/EncryptedFileSystem.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/EncryptedFileSystem.java rename to src/main/java/io/cdap/plugin/gcp/crypto/EncryptedFileSystem.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/FSInputSeekableByteChannel.java b/src/main/java/io/cdap/plugin/gcp/crypto/FSInputSeekableByteChannel.java similarity index 100% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/crypto/FSInputSeekableByteChannel.java rename to src/main/java/io/cdap/plugin/gcp/crypto/FSInputSeekableByteChannel.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/config/DataplexBaseConfig.java b/src/main/java/io/cdap/plugin/gcp/dataplex/common/config/DataplexBaseConfig.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/config/DataplexBaseConfig.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/common/config/DataplexBaseConfig.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexConstants.java b/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexConstants.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexConstants.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexConstants.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java b/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java similarity index 99% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java index c0f8c01a9..405e85d3a 100644 --- a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java +++ b/src/main/java/io/cdap/plugin/gcp/dataplex/common/util/DataplexUtil.java @@ -18,6 +18,7 @@ import com.google.api.gax.core.FixedCredentialsProvider; import com.google.auth.oauth2.GoogleCredentials; +import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.dataplex.v1.DataplexServiceClient; import com.google.cloud.dataplex.v1.DataplexServiceSettings; import com.google.cloud.dataplex.v1.Job; diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexBatchSink.java b/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexBatchSink.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexBatchSink.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexBatchSink.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputCommitter.java b/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputCommitter.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputCommitter.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputCommitter.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputFormatProvider.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/sink/DataplexOutputFormatProvider.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfig.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfig.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSource.java b/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSource.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSource.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSource.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexInputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexInputFormatProvider.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexInputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/source/DataplexInputFormatProvider.java diff --git a/google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfig.java b/src/main/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfig.java similarity index 100% rename from google-cloud-dataplex/src/main/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfig.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreExecutionException.java b/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreExecutionException.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreExecutionException.java rename to src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreExecutionException.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreInitializationException.java b/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreInitializationException.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreInitializationException.java rename to src/main/java/io/cdap/plugin/gcp/datastore/exception/DatastoreInitializationException.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormat.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormat.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormatProvider.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreOutputFormatProvider.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreRecordWriter.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreRecordWriter.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreRecordWriter.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreRecordWriter.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSink.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSink.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSink.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSink.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfig.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfig.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformer.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformer.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformer.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformer.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/DatastoreSinkConstants.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/DatastoreSinkConstants.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/DatastoreSinkConstants.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/util/DatastoreSinkConstants.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/IndexStrategy.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/IndexStrategy.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/IndexStrategy.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/util/IndexStrategy.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/SinkKeyType.java b/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/SinkKeyType.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/sink/util/SinkKeyType.java rename to src/main/java/io/cdap/plugin/gcp/datastore/sink/util/SinkKeyType.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormat.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormat.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormat.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormat.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormatProvider.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreInputFormatProvider.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreRecordReader.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreRecordReader.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreRecordReader.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreRecordReader.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSource.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSource.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSource.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSource.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfig.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfig.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfig.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformer.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformer.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformer.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformer.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/QueryInputSplit.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/QueryInputSplit.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/QueryInputSplit.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/QueryInputSplit.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/util/DatastoreSourceConstants.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/util/DatastoreSourceConstants.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/util/DatastoreSourceConstants.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/util/DatastoreSourceConstants.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/util/SourceKeyType.java b/src/main/java/io/cdap/plugin/gcp/datastore/source/util/SourceKeyType.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/source/util/SourceKeyType.java rename to src/main/java/io/cdap/plugin/gcp/datastore/source/util/SourceKeyType.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastorePropertyUtil.java b/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastorePropertyUtil.java similarity index 100% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastorePropertyUtil.java rename to src/main/java/io/cdap/plugin/gcp/datastore/util/DatastorePropertyUtil.java diff --git a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java b/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java similarity index 98% rename from google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java rename to src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java index 8353c59ed..2e9e83f7e 100644 --- a/google-cloud-datastore/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java +++ b/src/main/java/io/cdap/plugin/gcp/datastore/util/DatastoreUtil.java @@ -44,6 +44,7 @@ public class DatastoreUtil { * @param isServiceAccountFilePath indicator if provided service account if file path or JSON * @param projectId Google Cloud project ID * @return Datastore service + * @throws DatastoreInitializationException when unable to connect to Datastore */ public static Datastore getDatastoreV1(@Nullable String serviceAccount, @Nullable Boolean isServiceAccountFilePath, diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/Formats.java b/src/main/java/io/cdap/plugin/gcp/gcs/Formats.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/Formats.java rename to src/main/java/io/cdap/plugin/gcp/gcs/Formats.java diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java b/src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java similarity index 98% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java rename to src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java index f113226a6..cb024793c 100644 --- a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/GCSPath.java @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Cask Data, Inc. + * Copyright © 2019 Cask Data, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -54,7 +54,7 @@ public String getName() { return name; } - public boolean isBucket() { + boolean isBucket() { return name.isEmpty(); } diff --git a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java b/src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java similarity index 99% rename from google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java rename to src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java index 83b565002..78f7c128c 100644 --- a/google-cloud-common/src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java @@ -14,6 +14,7 @@ * the License. */ + package io.cdap.plugin.gcp.gcs; import com.google.auth.oauth2.GoogleCredentials; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/StorageClient.java b/src/main/java/io/cdap/plugin/gcp/gcs/StorageClient.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/StorageClient.java rename to src/main/java/io/cdap/plugin/gcp/gcs/StorageClient.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetter.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetter.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetter.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetter.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetterConfig.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetterConfig.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetterConfig.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSArgumentSetterConfig.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java similarity index 97% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java index a0f8741b3..d89086b95 100644 --- a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketCreate.java @@ -16,15 +16,20 @@ package io.cdap.plugin.gcp.gcs.actions; +import com.google.api.pathtemplate.ValidationException; import com.google.auth.Credentials; +import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.storage.Bucket; import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageException; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Macro; import io.cdap.cdap.api.annotation.Name; import io.cdap.cdap.api.annotation.Plugin; +import io.cdap.cdap.etl.api.Arguments; import io.cdap.cdap.etl.api.FailureCollector; import io.cdap.cdap.etl.api.PipelineConfigurer; import io.cdap.cdap.etl.api.action.Action; @@ -33,6 +38,7 @@ import io.cdap.plugin.gcp.common.GCPConfig; import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.gcs.GCSPath; +import io.cdap.plugin.gcp.gcs.sink.GCSBatchSink; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketDelete.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketDelete.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketDelete.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSBucketDelete.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java similarity index 92% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java index 9c27ed090..2ac255b2a 100644 --- a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSCopy.java @@ -17,6 +17,10 @@ package io.cdap.plugin.gcp.gcs.actions; import com.google.cloud.kms.v1.CryptoKeyName; +import com.google.cloud.storage.Bucket; +import com.google.cloud.storage.Storage; +import com.google.cloud.storage.StorageException; +import com.google.common.base.Strings; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Macro; import io.cdap.cdap.api.annotation.Name; @@ -26,10 +30,12 @@ import io.cdap.cdap.etl.api.action.Action; import io.cdap.cdap.etl.api.action.ActionContext; import io.cdap.plugin.gcp.common.CmekUtils; +import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.gcs.GCSPath; import io.cdap.plugin.gcp.gcs.StorageClient; import java.io.IOException; +import java.util.Collections; import javax.annotation.Nullable; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarker.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarker.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarker.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarker.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java similarity index 92% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java index 69ae5a840..f9f75a521 100644 --- a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/actions/GCSMove.java @@ -17,6 +17,10 @@ package io.cdap.plugin.gcp.gcs.actions; import com.google.cloud.kms.v1.CryptoKeyName; +import com.google.cloud.storage.Bucket; +import com.google.cloud.storage.Storage; +import com.google.cloud.storage.StorageException; +import com.google.common.base.Strings; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Macro; import io.cdap.cdap.api.annotation.Name; @@ -26,10 +30,12 @@ import io.cdap.cdap.etl.api.action.Action; import io.cdap.cdap.etl.api.action.ActionContext; import io.cdap.plugin.gcp.common.CmekUtils; +import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.gcs.GCSPath; import io.cdap.plugin.gcp.gcs.StorageClient; import java.io.IOException; +import java.util.Collections; import javax.annotation.Nullable; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java b/src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java similarity index 96% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java rename to src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java index 3dca6c22d..4c5bafb5a 100644 --- a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/actions/SourceDestConfig.java @@ -16,8 +16,13 @@ package io.cdap.plugin.gcp.gcs.actions; +import com.google.api.pathtemplate.ValidationException; +import com.google.auth.Credentials; import com.google.cloud.kms.v1.CryptoKeyName; +import com.google.cloud.storage.Bucket; import com.google.cloud.storage.Storage; +import com.google.cloud.storage.StorageException; +import com.google.common.base.Strings; import io.cdap.cdap.api.annotation.Description; import io.cdap.cdap.api.annotation.Macro; import io.cdap.cdap.api.annotation.Name; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnector.java b/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnector.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnector.java rename to src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnector.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorConfig.java b/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorConfig.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorConfig.java rename to src/main/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorConfig.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputCommitter.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputCommitter.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputCommitter.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputCommitter.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputFormat.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputFormat.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputUtils.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputUtils.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputUtils.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSOutputUtils.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSRecordWriter.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSRecordWriter.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSRecordWriter.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/DelegatingGCSRecordWriter.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSink.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSink.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSink.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSink.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSMultiBatchSink.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSMultiBatchSink.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSMultiBatchSink.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSMultiBatchSink.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputCommitter.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputCommitter.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputCommitter.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputCommitter.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputFormatProvider.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputFormatProvider.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputFormatProvider.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputFormatProvider.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/RecordFilterOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/gcs/sink/RecordFilterOutputFormat.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/sink/RecordFilterOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/gcs/sink/RecordFilterOutputFormat.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSRegexPathFilter.java b/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSRegexPathFilter.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSRegexPathFilter.java rename to src/main/java/io/cdap/plugin/gcp/gcs/source/GCSRegexPathFilter.java diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java b/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java similarity index 96% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java rename to src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java index b135d69c0..343794dfb 100644 --- a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java +++ b/src/main/java/io/cdap/plugin/gcp/gcs/source/GCSSource.java @@ -25,13 +25,19 @@ import io.cdap.cdap.api.annotation.MetadataProperty; import io.cdap.cdap.api.annotation.Name; import io.cdap.cdap.api.annotation.Plugin; +import io.cdap.cdap.api.data.schema.Schema; +import io.cdap.cdap.api.plugin.PluginConfig; import io.cdap.cdap.etl.api.FailureCollector; import io.cdap.cdap.etl.api.PipelineConfigurer; import io.cdap.cdap.etl.api.batch.BatchSource; import io.cdap.cdap.etl.api.batch.BatchSourceContext; import io.cdap.cdap.etl.api.connector.Connector; import io.cdap.plugin.common.ConfigUtil; +import io.cdap.plugin.common.Constants; +import io.cdap.plugin.common.IdUtils; import io.cdap.plugin.common.LineageRecorder; +import io.cdap.plugin.format.FileFormat; +import io.cdap.plugin.format.charset.fixedlength.FixedLengthCharset; import io.cdap.plugin.format.input.PathTrackingInputFormat; import io.cdap.plugin.format.plugin.AbstractFileSource; import io.cdap.plugin.format.plugin.AbstractFileSourceConfig; @@ -39,6 +45,7 @@ import io.cdap.plugin.gcp.common.GCPConnectorConfig; import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.crypto.EncryptedFileSystem; +import io.cdap.plugin.gcp.gcs.Formats; import io.cdap.plugin.gcp.gcs.GCSPath; import io.cdap.plugin.gcp.gcs.connector.GCSConnector; diff --git a/google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/TinkDecryptor.java b/src/main/java/io/cdap/plugin/gcp/gcs/source/TinkDecryptor.java similarity index 100% rename from google-cloud-storage/src/main/java/io/cdap/plugin/gcp/gcs/source/TinkDecryptor.java rename to src/main/java/io/cdap/plugin/gcp/gcs/source/TinkDecryptor.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java b/src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java similarity index 99% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java rename to src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java index 6bce80c2a..b3f85090a 100644 --- a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java +++ b/src/main/java/io/cdap/plugin/gcp/publisher/GooglePublisher.java @@ -38,6 +38,7 @@ import io.cdap.cdap.etl.api.PipelineConfigurer; import io.cdap.cdap.etl.api.batch.BatchSink; import io.cdap.cdap.etl.api.batch.BatchSinkContext; +import io.cdap.cdap.format.StructuredRecordStringConverter; import io.cdap.plugin.common.LineageRecorder; import io.cdap.plugin.common.batch.sink.SinkOutputFormatProvider; import io.cdap.plugin.gcp.common.CmekUtils; @@ -45,6 +46,7 @@ import io.cdap.plugin.gcp.common.GCPUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; +import org.apache.hadoop.io.Text; import java.io.IOException; import java.util.Map; diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/PubSubConstants.java b/src/main/java/io/cdap/plugin/gcp/publisher/PubSubConstants.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/PubSubConstants.java rename to src/main/java/io/cdap/plugin/gcp/publisher/PubSubConstants.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java similarity index 98% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java index a5bdce86f..851540593 100644 --- a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java +++ b/src/main/java/io/cdap/plugin/gcp/publisher/PubSubOutputFormat.java @@ -27,8 +27,11 @@ import com.google.pubsub.v1.PubsubMessage; import io.cdap.cdap.api.data.format.StructuredRecord; import io.cdap.cdap.format.StructuredRecordStringConverter; +import io.cdap.cdap.format.io.StructuredRecordDatumWriter; import io.cdap.plugin.format.avro.StructuredToAvroTransformer; +import io.cdap.plugin.gcp.bigtable.sink.BigtableSinkConfig; import io.cdap.plugin.gcp.common.GCPUtils; +import io.cdap.plugin.gcp.gcs.actions.GCSBucketCreate; import org.apache.avro.generic.GenericDatumWriter; import org.apache.avro.generic.GenericRecord; import org.apache.avro.io.BinaryEncoder; @@ -36,6 +39,7 @@ import org.apache.avro.io.EncoderFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.NullWritable; +import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/GCPCredentialsProvider.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/GCPCredentialsProvider.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/GCPCredentialsProvider.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/GCPCredentialsProvider.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/GoogleSubscriber.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/GoogleSubscriber.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/GoogleSubscriber.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/GoogleSubscriber.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubInputDStream.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubInputDStream.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubInputDStream.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubInputDStream.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubMessage.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubMessage.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubMessage.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubMessage.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiver.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiver.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiver.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiver.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriber.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriber.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriber.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriber.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberConfig.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberConfig.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberConfig.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberConfig.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberUtil.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberUtil.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberUtil.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/PubSubSubscriberUtil.java diff --git a/google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/SerializableFunction.java b/src/main/java/io/cdap/plugin/gcp/publisher/source/SerializableFunction.java similarity index 100% rename from google-cloud-pubsub/src/main/java/io/cdap/plugin/gcp/publisher/source/SerializableFunction.java rename to src/main/java/io/cdap/plugin/gcp/publisher/source/SerializableFunction.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/SpannerArrayConstants.java b/src/main/java/io/cdap/plugin/gcp/spanner/SpannerArrayConstants.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/SpannerArrayConstants.java rename to src/main/java/io/cdap/plugin/gcp/spanner/SpannerArrayConstants.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/SpannerConstants.java b/src/main/java/io/cdap/plugin/gcp/spanner/SpannerConstants.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/SpannerConstants.java rename to src/main/java/io/cdap/plugin/gcp/spanner/SpannerConstants.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/common/BytesCounter.java b/src/main/java/io/cdap/plugin/gcp/spanner/common/BytesCounter.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/common/BytesCounter.java rename to src/main/java/io/cdap/plugin/gcp/spanner/common/BytesCounter.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/common/SpannerUtil.java b/src/main/java/io/cdap/plugin/gcp/spanner/common/SpannerUtil.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/common/SpannerUtil.java rename to src/main/java/io/cdap/plugin/gcp/spanner/common/SpannerUtil.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnector.java b/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnector.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnector.java rename to src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnector.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerPath.java b/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerPath.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerPath.java rename to src/main/java/io/cdap/plugin/gcp/spanner/connector/SpannerPath.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformer.java b/src/main/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformer.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformer.java rename to src/main/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformer.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerOutputFormat.java b/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerOutputFormat.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerOutputFormat.java rename to src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerOutputFormat.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSink.java b/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSink.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSink.java rename to src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSink.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfig.java b/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfig.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfig.java rename to src/main/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfig.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/PartitionInputSplit.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/PartitionInputSplit.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/PartitionInputSplit.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/PartitionInputSplit.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformer.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformer.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformer.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformer.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerInputFormat.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerInputFormat.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerInputFormat.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerInputFormat.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerRecordReader.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerRecordReader.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerRecordReader.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerRecordReader.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSource.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSource.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSource.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSource.java diff --git a/google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSourceConfig.java b/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSourceConfig.java similarity index 100% rename from google-cloud-spanner/src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSourceConfig.java rename to src/main/java/io/cdap/plugin/gcp/spanner/source/SpannerSourceConfig.java diff --git a/google-cloud-speech/src/main/java/io/cdap/plugin/gcp/speech/SpeechToTextTransform.java b/src/main/java/io/cdap/plugin/gcp/speech/SpeechToTextTransform.java similarity index 100% rename from google-cloud-speech/src/main/java/io/cdap/plugin/gcp/speech/SpeechToTextTransform.java rename to src/main/java/io/cdap/plugin/gcp/speech/SpeechToTextTransform.java diff --git a/google-cloud-pubsub/src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java b/src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java similarity index 96% rename from google-cloud-pubsub/src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java rename to src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java index 8d66dc231..62aafd280 100644 --- a/google-cloud-pubsub/src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java +++ b/src/main/java/org/apache/spark/streaming/pubsub/SparkGCPCredentials.java @@ -1,5 +1,5 @@ /* - * Copyright © 2022 Cask Data, Inc. + * Copyright © 2019 Cask Data, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/AvroToStructuredRecordTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/AvroToStructuredRecordTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/AvroToStructuredRecordTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/AvroToStructuredRecordTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/BigQueryRecordToJsonTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfigTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryArgumentSetterConfigTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteCmekKeyTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteCmekKeyTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteConfigTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/action/BigQueryExecuteConfigTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryConnectorTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPathTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPathTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPathTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/connector/BigQueryPathTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelationTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelationTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelationTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/relational/BigQueryRelationTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQueryOutputFormatTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkCmekKeyTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkCmekKeyTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java similarity index 95% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java index 156ade9ba..a239cfbc8 100644 --- a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java +++ b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkTest.java @@ -1,17 +1,17 @@ /* - * Copyright © 2022 Cask Data, Inc. + * Copyright © 2018 Cask Data, Inc. * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. */ package io.cdap.plugin.gcp.bigquery.sink; @@ -33,6 +33,7 @@ import io.cdap.cdap.etl.api.validation.ValidationFailure; import io.cdap.cdap.etl.mock.common.MockStageMetrics; import io.cdap.cdap.etl.mock.validation.MockFailureCollector; +import io.cdap.cdap.etl.spark.batch.SparkBatchSinkContext; import io.cdap.plugin.gcp.bigquery.util.BigQueryTypeSize; import org.junit.Assert; import org.junit.Test; @@ -44,7 +45,6 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; @@ -168,8 +168,8 @@ private static void setBigQuery(BigQuerySink sink, BigQuery bigQuery) throws NoS } private BatchSinkContext getContextWithMetrics(MockStageMetrics mockStageMetrics) throws NoSuchFieldException { - BatchSinkContext context = mock(BatchSinkContext.class); - doReturn(mockStageMetrics).when(context).getMetrics(); + BatchSinkContext context = mock(SparkBatchSinkContext.class); + Mockito.doReturn(mockStageMetrics).when(context).getMetrics(); return context; } diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtilsTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtilsTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtilsTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sink/BigQuerySinkUtilsTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitterTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitterTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitterTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sink/DelegatingMultiSinkOutputCommitterTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java similarity index 99% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java index b63120ac5..3e7a1f986 100644 --- a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java +++ b/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceCmekKeyTest.java @@ -34,6 +34,7 @@ import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.gcs.GCSPath; import org.junit.After; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfigTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceConfigTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java similarity index 98% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java index 373d60823..ad9236061 100644 --- a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java +++ b/src/test/java/io/cdap/plugin/gcp/bigquery/source/BigQuerySourceUtilsTest.java @@ -25,6 +25,7 @@ import org.mockito.Mockito; import java.io.IOException; +import java.lang.reflect.Field; public class BigQuerySourceUtilsTest { diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java similarity index 99% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java index 7724581c9..229b7443d 100644 --- a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java +++ b/src/test/java/io/cdap/plugin/gcp/bigquery/source/PartitionedBigQueryInputFormatTest.java @@ -27,6 +27,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.Objects; + /** * Unit Tests for generateQuery methods */ diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java similarity index 99% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java index 10957619a..0198288aa 100644 --- a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java +++ b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineCmekKeyTest.java @@ -24,6 +24,7 @@ import io.cdap.cdap.etl.api.validation.ValidationFailure; import io.cdap.cdap.etl.mock.validation.MockFailureCollector; import io.cdap.plugin.gcp.bigquery.sink.BigQuerySinkUtils; +import io.cdap.plugin.gcp.common.GCPConfig; import io.cdap.plugin.gcp.common.GCPUtils; import io.cdap.plugin.gcp.gcs.GCSPath; import org.junit.Assert; diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfigTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineConfigTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngineTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilderTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilderTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilderTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryDeduplicateSQLBuilderTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilderTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilderTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilderTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryGroupBySQLBuilderTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilderTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilderTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilderTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryJoinSQLBuilderTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilderTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilderTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilderTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQueryNestedSelectSQLBuilderTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilderTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilderTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilderTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/builder/BigQuerySelectSQLBuilderTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformerTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/transform/SQLEngineAvroToStructuredTransformerTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtilsTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtilsTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtilsTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySQLEngineUtilsTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidationTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidationTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidationTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/sqlengine/util/BigQuerySchemaValidationTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParserTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParserTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParserTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryDataParserTest.java diff --git a/google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtilTest.java b/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtilTest.java similarity index 100% rename from google-cloud-bigquery/src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtilTest.java rename to src/test/java/io/cdap/plugin/gcp/bigquery/util/BigQueryUtilTest.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigBuilder.java b/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigBuilder.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigBuilder.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigBuilder.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigTest.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/sink/BigtableSinkConfigTest.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformerTest.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/sink/RecordToHBaseMutationTransformerTest.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigBuilder.java b/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigBuilder.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigBuilder.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigBuilder.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigTest.java b/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigTest.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/source/BigtableSourceConfigTest.java diff --git a/google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformerTest.java similarity index 100% rename from google-cloud-bigtable/src/test/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/bigtable/source/HBaseResultToRecordTransformerTest.java diff --git a/google-cloud-common/src/test/java/io/cdap/plugin/gcp/common/CmekUtilsTest.java b/src/test/java/io/cdap/plugin/gcp/common/CmekUtilsTest.java similarity index 100% rename from google-cloud-common/src/test/java/io/cdap/plugin/gcp/common/CmekUtilsTest.java rename to src/test/java/io/cdap/plugin/gcp/common/CmekUtilsTest.java diff --git a/google-cloud-common/src/test/java/io/cdap/plugin/gcp/common/GCPConfigTest.java b/src/test/java/io/cdap/plugin/gcp/common/GCPConfigTest.java similarity index 100% rename from google-cloud-common/src/test/java/io/cdap/plugin/gcp/common/GCPConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/common/GCPConfigTest.java diff --git a/google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/sink/DataPlexOutputFormatProviderTest.java b/src/test/java/io/cdap/plugin/gcp/dataplex/sink/DataPlexOutputFormatProviderTest.java similarity index 100% rename from google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/sink/DataPlexOutputFormatProviderTest.java rename to src/test/java/io/cdap/plugin/gcp/dataplex/sink/DataPlexOutputFormatProviderTest.java diff --git a/google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfigTest.java b/src/test/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfigTest.java similarity index 100% rename from google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/dataplex/sink/config/DataplexBatchSinkConfigTest.java diff --git a/google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSourceTest.java b/src/test/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSourceTest.java similarity index 100% rename from google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSourceTest.java rename to src/test/java/io/cdap/plugin/gcp/dataplex/source/DataplexBatchSourceTest.java diff --git a/google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfigTest.java b/src/test/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfigTest.java similarity index 100% rename from google-cloud-dataplex/src/test/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/dataplex/source/config/DataplexBatchSourceConfigTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigHelper.java b/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigHelper.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigHelper.java rename to src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigHelper.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/sink/DatastoreSinkConfigTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformerTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/sink/RecordToEntityTransformerTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigHelper.java b/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigHelper.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigHelper.java rename to src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigHelper.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceConfigTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/source/DatastoreSourceTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformerTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/source/EntityToRecordTransformerTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralExceptionTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralExceptionTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralExceptionTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralExceptionTest.java diff --git a/google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralPositiveTest.java b/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralPositiveTest.java similarity index 100% rename from google-cloud-datastore/src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralPositiveTest.java rename to src/test/java/io/cdap/plugin/gcp/datastore/util/ParseKeyLiteralPositiveTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/FormatsTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/FormatsTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/FormatsTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/FormatsTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/GCSPathTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/GCSPathTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/GCSPathTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/GCSPathTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/StorageClientTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/StorageClientTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/StorageClientTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/StorageClientTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSActionsCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSActionsCmekKeyTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSActionsCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSActionsCmekKeyTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarkerTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarkerTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarkerTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/actions/GCSDoneFileMarkerTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/connector/GCSConnectorTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java similarity index 99% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java index 3d9a6a390..ef1c139a9 100644 --- a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java +++ b/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkCmekKeyTest.java @@ -17,6 +17,7 @@ package io.cdap.plugin.gcp.gcs.sink; import com.google.auth.Credentials; +import com.google.cloud.kms.v1.CryptoKeyName; import com.google.cloud.storage.Storage; import io.cdap.cdap.etl.api.validation.CauseAttributes; import io.cdap.cdap.etl.api.validation.ValidationFailure; diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSBatchSinkTest.java diff --git a/google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputformatProviderTest.java b/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputformatProviderTest.java similarity index 100% rename from google-cloud-storage/src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputformatProviderTest.java rename to src/test/java/io/cdap/plugin/gcp/gcs/sink/GCSOutputformatProviderTest.java diff --git a/google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubMessageTest.java b/src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubMessageTest.java similarity index 100% rename from google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubMessageTest.java rename to src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubMessageTest.java diff --git a/google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubReceiverMessagePullingTest.java b/src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiverMessagePullingTest.java similarity index 100% rename from google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubReceiverMessagePullingTest.java rename to src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiverMessagePullingTest.java diff --git a/google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubReceiverSubscriptionTest.java b/src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiverSubscriptionTest.java similarity index 100% rename from google-cloud-pubsub/src/test/java/io/cdap/plugin/gcp/source/PubSubReceiverSubscriptionTest.java rename to src/test/java/io/cdap/plugin/gcp/publisher/source/PubSubReceiverSubscriptionTest.java diff --git a/google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/SpannerUtilTest.java b/src/test/java/io/cdap/plugin/gcp/spanner/SpannerUtilTest.java similarity index 100% rename from google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/SpannerUtilTest.java rename to src/test/java/io/cdap/plugin/gcp/spanner/SpannerUtilTest.java diff --git a/google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnectorTest.java b/src/test/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnectorTest.java similarity index 100% rename from google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnectorTest.java rename to src/test/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnectorTest.java diff --git a/google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformerTest.java similarity index 100% rename from google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/spanner/sink/RecordToMutationTransformerTest.java diff --git a/google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfigTest.java b/src/test/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfigTest.java similarity index 100% rename from google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfigTest.java rename to src/test/java/io/cdap/plugin/gcp/spanner/sink/SpannerSinkConfigTest.java diff --git a/google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformerTest.java b/src/test/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformerTest.java similarity index 100% rename from google-cloud-spanner/src/test/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformerTest.java rename to src/test/java/io/cdap/plugin/gcp/spanner/source/ResultSetToRecordTransformerTest.java diff --git a/google-cloud-bigquery/widgets/BigQuery-connector.json b/widgets/BigQuery-connector.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQuery-connector.json rename to widgets/BigQuery-connector.json diff --git a/google-cloud-bigquery/widgets/BigQueryArgumentSetter-action.json b/widgets/BigQueryArgumentSetter-action.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryArgumentSetter-action.json rename to widgets/BigQueryArgumentSetter-action.json diff --git a/google-cloud-bigquery/widgets/BigQueryExecute-action.json b/widgets/BigQueryExecute-action.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryExecute-action.json rename to widgets/BigQueryExecute-action.json diff --git a/google-cloud-bigquery/widgets/BigQueryMultiTable-batchsink.json b/widgets/BigQueryMultiTable-batchsink.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryMultiTable-batchsink.json rename to widgets/BigQueryMultiTable-batchsink.json diff --git a/google-cloud-bigquery/widgets/BigQueryPushdownEngine-sqlengine.json b/widgets/BigQueryPushdownEngine-sqlengine.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryPushdownEngine-sqlengine.json rename to widgets/BigQueryPushdownEngine-sqlengine.json diff --git a/google-cloud-bigquery/widgets/BigQueryTable-batchsink.json b/widgets/BigQueryTable-batchsink.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryTable-batchsink.json rename to widgets/BigQueryTable-batchsink.json diff --git a/google-cloud-bigquery/widgets/BigQueryTable-batchsource.json b/widgets/BigQueryTable-batchsource.json similarity index 100% rename from google-cloud-bigquery/widgets/BigQueryTable-batchsource.json rename to widgets/BigQueryTable-batchsource.json diff --git a/google-cloud-bigtable/widgets/Bigtable-batchsink.json b/widgets/Bigtable-batchsink.json similarity index 100% rename from google-cloud-bigtable/widgets/Bigtable-batchsink.json rename to widgets/Bigtable-batchsink.json diff --git a/google-cloud-bigtable/widgets/Bigtable-batchsource.json b/widgets/Bigtable-batchsource.json similarity index 100% rename from google-cloud-bigtable/widgets/Bigtable-batchsource.json rename to widgets/Bigtable-batchsource.json diff --git a/google-cloud-dataplex/widgets/Dataplex-batchsink.json b/widgets/Dataplex-batchsink.json similarity index 100% rename from google-cloud-dataplex/widgets/Dataplex-batchsink.json rename to widgets/Dataplex-batchsink.json diff --git a/google-cloud-dataplex/widgets/Dataplex-batchsource.json b/widgets/Dataplex-batchsource.json similarity index 100% rename from google-cloud-dataplex/widgets/Dataplex-batchsource.json rename to widgets/Dataplex-batchsource.json diff --git a/google-cloud-datastore/widgets/Datastore-batchsink.json b/widgets/Datastore-batchsink.json similarity index 100% rename from google-cloud-datastore/widgets/Datastore-batchsink.json rename to widgets/Datastore-batchsink.json diff --git a/google-cloud-datastore/widgets/Datastore-batchsource.json b/widgets/Datastore-batchsource.json similarity index 100% rename from google-cloud-datastore/widgets/Datastore-batchsource.json rename to widgets/Datastore-batchsource.json diff --git a/google-cloud-storage/widgets/GCS-batchsink.json b/widgets/GCS-batchsink.json similarity index 100% rename from google-cloud-storage/widgets/GCS-batchsink.json rename to widgets/GCS-batchsink.json diff --git a/google-cloud-storage/widgets/GCS-connector.json b/widgets/GCS-connector.json similarity index 100% rename from google-cloud-storage/widgets/GCS-connector.json rename to widgets/GCS-connector.json diff --git a/google-cloud-storage/widgets/GCSArgumentSetter-action.json b/widgets/GCSArgumentSetter-action.json similarity index 100% rename from google-cloud-storage/widgets/GCSArgumentSetter-action.json rename to widgets/GCSArgumentSetter-action.json diff --git a/google-cloud-storage/widgets/GCSBucketCreate-action.json b/widgets/GCSBucketCreate-action.json similarity index 100% rename from google-cloud-storage/widgets/GCSBucketCreate-action.json rename to widgets/GCSBucketCreate-action.json diff --git a/google-cloud-storage/widgets/GCSBucketDelete-action.json b/widgets/GCSBucketDelete-action.json similarity index 100% rename from google-cloud-storage/widgets/GCSBucketDelete-action.json rename to widgets/GCSBucketDelete-action.json diff --git a/google-cloud-storage/widgets/GCSCopy-action.json b/widgets/GCSCopy-action.json similarity index 100% rename from google-cloud-storage/widgets/GCSCopy-action.json rename to widgets/GCSCopy-action.json diff --git a/google-cloud-storage/widgets/GCSDoneFileMarker-postaction.json b/widgets/GCSDoneFileMarker-postaction.json similarity index 100% rename from google-cloud-storage/widgets/GCSDoneFileMarker-postaction.json rename to widgets/GCSDoneFileMarker-postaction.json diff --git a/google-cloud-storage/widgets/GCSFile-batchsource.json b/widgets/GCSFile-batchsource.json similarity index 100% rename from google-cloud-storage/widgets/GCSFile-batchsource.json rename to widgets/GCSFile-batchsource.json diff --git a/google-cloud-storage/widgets/GCSMove-action.json b/widgets/GCSMove-action.json similarity index 100% rename from google-cloud-storage/widgets/GCSMove-action.json rename to widgets/GCSMove-action.json diff --git a/google-cloud-storage/widgets/GCSMultiFiles-batchsink.json b/widgets/GCSMultiFiles-batchsink.json similarity index 100% rename from google-cloud-storage/widgets/GCSMultiFiles-batchsink.json rename to widgets/GCSMultiFiles-batchsink.json diff --git a/google-cloud-pubsub/widgets/GooglePublisher-batchsink.json b/widgets/GooglePublisher-batchsink.json similarity index 100% rename from google-cloud-pubsub/widgets/GooglePublisher-batchsink.json rename to widgets/GooglePublisher-batchsink.json diff --git a/google-cloud-pubsub/widgets/GoogleSubscriber-streamingsource.json b/widgets/GoogleSubscriber-streamingsource.json similarity index 100% rename from google-cloud-pubsub/widgets/GoogleSubscriber-streamingsource.json rename to widgets/GoogleSubscriber-streamingsource.json diff --git a/google-cloud-spanner/widgets/Spanner-batchsink.json b/widgets/Spanner-batchsink.json similarity index 100% rename from google-cloud-spanner/widgets/Spanner-batchsink.json rename to widgets/Spanner-batchsink.json diff --git a/google-cloud-spanner/widgets/Spanner-batchsource.json b/widgets/Spanner-batchsource.json similarity index 100% rename from google-cloud-spanner/widgets/Spanner-batchsource.json rename to widgets/Spanner-batchsource.json diff --git a/google-cloud-spanner/widgets/Spanner-connector.json b/widgets/Spanner-connector.json similarity index 100% rename from google-cloud-spanner/widgets/Spanner-connector.json rename to widgets/Spanner-connector.json diff --git a/google-cloud-speech/widgets/SpeechToText-transform.json b/widgets/SpeechToText-transform.json similarity index 100% rename from google-cloud-speech/widgets/SpeechToText-transform.json rename to widgets/SpeechToText-transform.json