From 76f1194f354641ea550268f4cc2470451f04f51d Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 10 Nov 2023 11:16:12 -0500 Subject: [PATCH 01/11] [maven-release-plugin] prepare release 4.1.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a570dd2..4cfd0496 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ datastax.cdm cassandra-data-migrator - 4.1.9-SNAPSHOT + 4.1.9 jar @@ -189,7 +189,7 @@ scm:git:git@github.com:datastax/cassandra-data-migrator.git scm:git:git@github.com:datastax/cassandra-data-migrator.git https://github.com/datastax/cassandra-data-migrator - 4.1.8 + 4.1.9 From 91ed28949084710271374606d53384388cff6e2b Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Fri, 10 Nov 2023 11:16:14 -0500 Subject: [PATCH 02/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4cfd0496..b9802b97 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ datastax.cdm cassandra-data-migrator - 4.1.9 + 4.1.10-SNAPSHOT jar @@ -189,7 +189,7 @@ scm:git:git@github.com:datastax/cassandra-data-migrator.git scm:git:git@github.com:datastax/cassandra-data-migrator.git https://github.com/datastax/cassandra-data-migrator - 4.1.9 + 4.1.8 From 093b5968428fafcba22675048ad9dda6cacf0cf4 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Mon, 13 Nov 2023 13:14:42 -0500 Subject: [PATCH 03/11] Update docs --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 66d088d8..857bb61f 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ tar -xvzf spark-3.4.1-bin-hadoop3-scala2.13.tgz 3. Run the below job using `spark-submit` command as shown below: ``` -./spark-submit --properties-file cdm.properties / ---conf spark.cdm.schema.origin.keyspaceTable="." / ---master "local[*]" --driver-memory 25G --executor-memory 25G / +./spark-submit --properties-file cdm.properties \ +--conf spark.cdm.schema.origin.keyspaceTable="." \ +--master "local[*]" --driver-memory 25G --executor-memory 25G \ --class com.datastax.cdm.job.Migrate cassandra-data-migrator-4.x.x.jar &> logfile_name_$(date +%Y%m%d_%H_%M).txt ``` From af68d32d5b5a9cdc37d67f50233a6726ce5d783c Mon Sep 17 00:00:00 2001 From: Madhavan Date: Tue, 14 Nov 2023 13:54:33 -0500 Subject: [PATCH 04/11] Update docs (#217) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 857bb61f..1a94fc46 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ Note: - To run the job in Data validation mode, use class option `--class com.datastax.cdm.job.DiffData` as shown below ``` -./spark-submit --properties-file cdm.properties / ---conf spark.cdm.schema.origin.keyspaceTable="." / ---master "local[*]" --driver-memory 25G --executor-memory 25G / +./spark-submit --properties-file cdm.properties \ +--conf spark.cdm.schema.origin.keyspaceTable="." \ +--master "local[*]" --driver-memory 25G --executor-memory 25G \ --class com.datastax.cdm.job.DiffData cassandra-data-migrator-4.x.x.jar &> logfile_name_$(date +%Y%m%d_%H_%M).txt ``` From 7d600c165d9125cc34f8d7045bc4265ecbd0ebe0 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Tue, 14 Nov 2023 13:57:52 -0500 Subject: [PATCH 05/11] doc updates --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1a94fc46..d450d653 100644 --- a/README.md +++ b/README.md @@ -89,10 +89,10 @@ Note: Each line above represents a partition-range (`min,max`). Alternatively, you can also pass the partition-file via command-line param as shown below ``` -./spark-submit --properties-file cdm.properties / - --conf spark.cdm.schema.origin.keyspaceTable="." / - --conf spark.cdm.tokenRange.partitionFile="//" / ---master "local[*]" --driver-memory 25G --executor-memory 25G / +./spark-submit --properties-file cdm.properties \ + --conf spark.cdm.schema.origin.keyspaceTable="." \ + --conf spark.cdm.tokenRange.partitionFile="//" \ +--master "local[*]" --driver-memory 25G --executor-memory 25G \ --class com.datastax.cdm.job. cassandra-data-migrator-4.x.x.jar &> logfile_name_$(date +%Y%m%d_%H_%M).txt ``` This mode is specifically useful to processes a subset of partition-ranges that may have failed during a previous run. @@ -103,10 +103,10 @@ This mode is specifically useful to processes a subset of partition-ranges that # Perform large-field Guardrail violation checks - The tool can be used to identify large fields from a table that may break you cluster guardrails (e.g. AstraDB has a 10MB limit for a single large field) `--class com.datastax.cdm.job.GuardrailCheck` as shown below ``` -./spark-submit --properties-file cdm.properties / ---conf spark.cdm.schema.origin.keyspaceTable="." / ---conf spark.cdm.feature.guardrail.colSizeInKB=10000 / ---master "local[*]" --driver-memory 25G --executor-memory 25G / +./spark-submit --properties-file cdm.properties \ +--conf spark.cdm.schema.origin.keyspaceTable="." \ +--conf spark.cdm.feature.guardrail.colSizeInKB=10000 \ +--master "local[*]" --driver-memory 25G --executor-memory 25G \ --class com.datastax.cdm.job.GuardrailCheck cassandra-data-migrator-4.x.x.jar &> logfile_name_$(date +%Y%m%d_%H_%M).txt ``` From 73f242441a0186021e3db9ecc5b176f067c22b47 Mon Sep 17 00:00:00 2001 From: Madhavan Sridharan Date: Wed, 15 Nov 2023 09:22:55 -0500 Subject: [PATCH 06/11] Update INT tests to run on PR submission via forks --- .github/workflows/cdm-integrationtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml index cbf8b830..a9291ad2 100644 --- a/.github/workflows/cdm-integrationtest.yml +++ b/.github/workflows/cdm-integrationtest.yml @@ -1,5 +1,5 @@ name: Build and test jar with integration tests -on: [push] +on: [push, pull_request] jobs: CDM-Integration-Test: runs-on: ubuntu-latest From 248b867b63ef64d19851a6922646a4b81ae42226 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:40:07 -0500 Subject: [PATCH 07/11] docs: add Jeremya as a contributor for code (#221) * docs: update CONTRIBUTING.md [skip ci] * docs: update .all-contributorsrc [skip ci] --------- Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com> --- .all-contributorsrc | 12 +++++++++++- CONTRIBUTING.md | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 33130a4b..1882e09c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -139,6 +139,16 @@ "contributions": [ "review" ] + }, + { + "login": "Jeremya", + "name": "Jeremy", + "avatar_url": "https://avatars.githubusercontent.com/u/576519?v=4", + "profile": "https://github.com/Jeremya", + "contributions": [ + "code" + ] } - ] + ], + "commitType": "docs" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9c1757e5..78a9863b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -149,6 +149,7 @@ For recognizing contributions, please follow [this documentation](https://allcon Vaishakh Baragur Narasimhareddy
Vaishakh Baragur Narasimhareddy

💻 ⚠️ Phil Miesle
Phil Miesle

💻 mfmaher2
mfmaher2

👀 + Jeremy
Jeremy

💻 From 6c695a223ec81943ab0d106f81c2a6412695e54d Mon Sep 17 00:00:00 2001 From: Madhavan Date: Fri, 1 Dec 2023 14:26:28 -0500 Subject: [PATCH 08/11] Readme improvements with prereqs (#223) --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index d450d653..f1271744 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ wget https://archive.apache.org/dist/spark/spark-3.4.1/spark-3.4.1-bin-hadoop3-s tar -xvzf spark-3.4.1-bin-hadoop3-scala2.13.tgz ``` +> :warning: If the above Spark and Scala version is not properly installed, you'll then see a similar exception like below when running the CDM jobs, +``` +Exception in thread "main" java.lang.NoSuchMethodError: scala.runtime.Statics.releaseFence()V +``` + # Steps for Data-Migration: > :warning: Note that Version 4 of the tool is not backward-compatible with .properties files created in previous versions, and that package names have changed. From 83ac69d326e5bb74617ad0dddcb15707cf515cd3 Mon Sep 17 00:00:00 2001 From: Madhavan Date: Fri, 1 Dec 2023 14:37:53 -0500 Subject: [PATCH 09/11] CI Improvements + Add RAT checks to the project (#222) * Restrict to 1 job per ref. For pushes, only run on main * rat inclusion --- .github/workflows/cdm-integrationtest.yml | 18 ++++++++++--- .github/workflows/maven.yml | 19 +++++++++++--- .settings/org.eclipse.core.resources.prefs | 5 ---- .settings/org.eclipse.jdt.core.prefs | 8 ------ .settings/org.eclipse.m2e.core.prefs | 4 --- pom.xml | 16 ++++++++++++ rat-excludes.txt | 25 +++++++++++++++++++ scripts/bump_minor_version | 14 +++++++++++ scripts/get-latest-maven-version.sh | 14 +++++++++++ .../com/datastax/cdm/cql/EnhancedSession.java | 15 +++++++++++ .../cdm/cql/codec/AbstractBaseCodec.java | 15 +++++++++++ .../cdm/cql/codec/BIGINT_StringCodec.java | 15 +++++++++++ .../datastax/cdm/cql/codec/CodecFactory.java | 15 +++++++++++ .../com/datastax/cdm/cql/codec/Codecset.java | 15 +++++++++++ .../cdm/cql/codec/DECIMAL_StringCodec.java | 15 +++++++++++ .../cdm/cql/codec/DOUBLE_StringCodec.java | 15 +++++++++++ .../cdm/cql/codec/INT_StringCodec.java | 15 +++++++++++ .../cql/codec/TEXTFormat_InstantCodec.java | 15 +++++++++++ .../cql/codec/TEXTMillis_InstantCodec.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_BigDecimalCodec.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_DoubleCodec.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_IntegerCodec.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_LongCodec.java | 15 +++++++++++ .../codec/TIMESTAMP_StringFormatCodec.java | 15 +++++++++++ .../codec/TIMESTAMP_StringMillisCodec.java | 15 +++++++++++ .../cdm/cql/statement/BaseCdmStatement.java | 15 +++++++++++ .../statement/OriginSelectByPKStatement.java | 15 +++++++++++ ...OriginSelectByPartitionRangeStatement.java | 15 +++++++++++ .../cql/statement/OriginSelectStatement.java | 15 +++++++++++ .../cql/statement/TargetInsertStatement.java | 15 +++++++++++ .../statement/TargetSelectByPKStatement.java | 15 +++++++++++ .../cql/statement/TargetUpdateStatement.java | 15 +++++++++++ .../cql/statement/TargetUpsertStatement.java | 15 +++++++++++ .../com/datastax/cdm/data/CqlConversion.java | 15 +++++++++++ .../java/com/datastax/cdm/data/CqlData.java | 15 +++++++++++ .../com/datastax/cdm/data/DataUtility.java | 15 +++++++++++ .../com/datastax/cdm/data/EnhancedPK.java | 15 +++++++++++ .../java/com/datastax/cdm/data/PKFactory.java | 15 +++++++++++ .../java/com/datastax/cdm/data/Record.java | 15 +++++++++++ .../datastax/cdm/feature/AbstractFeature.java | 15 +++++++++++ .../datastax/cdm/feature/ConstantColumns.java | 15 +++++++++++ .../com/datastax/cdm/feature/ExplodeMap.java | 15 +++++++++++ .../com/datastax/cdm/feature/Feature.java | 15 +++++++++++ .../datastax/cdm/feature/FeatureFactory.java | 15 +++++++++++ .../com/datastax/cdm/feature/Featureset.java | 15 +++++++++++ .../com/datastax/cdm/feature/Guardrail.java | 15 +++++++++++ .../cdm/feature/OriginFilterCondition.java | 15 +++++++++++ .../datastax/cdm/feature/WritetimeTTL.java | 15 +++++++++++ .../datastax/cdm/job/AbstractJobSession.java | 15 +++++++++++ .../com/datastax/cdm/job/BaseJobSession.java | 15 +++++++++++ .../com/datastax/cdm/job/CopyJobSession.java | 15 +++++++++++ .../cdm/job/CopyJobSessionFactory.java | 15 +++++++++++ .../datastax/cdm/job/CopyPKJobSession.java | 15 +++++++++++ .../cdm/job/CopyPKJobSessionFactory.java | 15 +++++++++++ .../com/datastax/cdm/job/DiffJobSession.java | 15 +++++++++++ .../cdm/job/DiffJobSessionFactory.java | 15 +++++++++++ .../cdm/job/GuardrailCheckJobSession.java | 15 +++++++++++ .../job/GuardrailCheckJobSessionFactory.java | 15 +++++++++++ .../datastax/cdm/job/IJobSessionFactory.java | 15 +++++++++++ .../java/com/datastax/cdm/job/JobCounter.java | 15 +++++++++++ .../com/datastax/cdm/job/SplitPartitions.java | 15 +++++++++++ .../cdm/properties/IPropertyHelper.java | 15 +++++++++++ .../cdm/properties/KnownProperties.java | 15 +++++++++++ .../cdm/properties/PropertyHelper.java | 15 +++++++++++ .../com/datastax/cdm/schema/BaseTable.java | 15 +++++++++++ .../com/datastax/cdm/schema/CqlTable.java | 15 +++++++++++ .../java/com/datastax/cdm/schema/Table.java | 15 +++++++++++ .../scala/com/datastax/cdm/job/BaseJob.scala | 15 +++++++++++ .../com/datastax/cdm/job/BasePKJob.scala | 15 +++++++++++ .../datastax/cdm/job/BasePartitionJob.scala | 15 +++++++++++ .../datastax/cdm/job/ConnectionDetails.scala | 15 +++++++++++ .../datastax/cdm/job/ConnectionFetcher.scala | 15 +++++++++++ .../scala/com/datastax/cdm/job/DiffData.scala | 15 +++++++++++ .../com/datastax/cdm/job/GuardrailCheck.scala | 15 +++++++++++ .../scala/com/datastax/cdm/job/Migrate.scala | 15 +++++++++++ .../cdm/job/MigrateRowsFromFile.scala | 15 +++++++++++ src/resources/cdm-detailed.properties | 15 +++++++++++ src/resources/cdm.properties | 15 +++++++++++ src/resources/log4j.properties | 15 +++++++++++ src/resources/migrate_data.sh | 15 +++++++++++ .../com/datastax/cdm/cql/CommonMocks.java | 15 +++++++++++ .../cdm/cql/codec/BIGINT_StringCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/CodecFactoryTest.java | 15 +++++++++++ .../cdm/cql/codec/CodecTestHelper.java | 15 +++++++++++ .../cql/codec/DATERANGETYPE_CodecTest.java | 15 +++++++++++ .../cql/codec/DECIMAL_StringCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/DOUBLE_StringCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/INT_StringCodecTest.java | 15 +++++++++++ .../cql/codec/LINESTRINGTYPE_CodecTest.java | 15 +++++++++++ .../cdm/cql/codec/POINTTYPE_CodecTest.java | 15 +++++++++++ .../cdm/cql/codec/POLYGONTYPE_CodecTest.java | 15 +++++++++++ .../codec/TEXTFormat_InstantCodecTest.java | 15 +++++++++++ .../codec/TEXTMillis_InstantCodecTest.java | 15 +++++++++++ .../cql/codec/TEXT_BigDecimalCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_DoubleCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_IntegerCodecTest.java | 15 +++++++++++ .../cdm/cql/codec/TEXT_LongCodecTest.java | 15 +++++++++++ .../TIMESTAMP_StringFormatCodecTest.java | 15 +++++++++++ .../TIMESTAMP_StringMillisCodecTest.java | 15 +++++++++++ .../cql/statement/BaseCdmStatementTest.java | 15 +++++++++++ .../cql/statement/Feature_CounterTest.java | 15 +++++++++++ .../OriginSelectByPKStatementTest.java | 15 +++++++++++ ...inSelectByPartitionRangeStatementTest.java | 15 +++++++++++ .../statement/OriginSelectStatementTest.java | 15 +++++++++++ .../statement/TargetInsertStatementTest.java | 15 +++++++++++ .../TargetSelectByPKStatementTest.java | 15 +++++++++++ .../statement/TargetUpdateStatementTest.java | 15 +++++++++++ .../statement/TargetUpsertStatementTest.java | 15 +++++++++++ .../datastax/cdm/data/CqlConversionTest.java | 15 +++++++++++ .../datastax/cdm/data/DataUtilityTest.java | 15 +++++++++++ .../datastax/cdm/data/MockitoExtension.java | 15 +++++++++++ .../cdm/feature/AbstractFeatureTest.java | 15 +++++++++++ .../cdm/feature/ConstantColumnsTest.java | 15 +++++++++++ .../datastax/cdm/feature/ExplodeMapTest.java | 15 +++++++++++ .../cdm/feature/FeatureFactoryTest.java | 15 +++++++++++ .../datastax/cdm/feature/GuardrailTest.java | 15 +++++++++++ .../feature/OriginFilterConditionTest.java | 15 +++++++++++ .../cdm/feature/TTLAndWritetimeTest.java | 15 +++++++++++ .../com/datastax/cdm/job/JobCounterTest.java | 15 +++++++++++ .../cdm/properties/KnownPropertiesTest.java | 15 +++++++++++ .../cdm/properties/PropertyHelperTest.java | 15 +++++++++++ ...L_ColumnRenameWithConstantsAndExplode.java | 15 +++++++++++ .../datastax/cdm/schema/BaseTableTest.java | 15 +++++++++++ 123 files changed, 1810 insertions(+), 23 deletions(-) delete mode 100644 .settings/org.eclipse.core.resources.prefs delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 rat-excludes.txt diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml index a9291ad2..0d180724 100644 --- a/.github/workflows/cdm-integrationtest.yml +++ b/.github/workflows/cdm-integrationtest.yml @@ -1,14 +1,26 @@ name: Build and test jar with integration tests -on: [push, pull_request] +on: + workflow_dispatch: + pull_request: + push: + branches: + - main jobs: CDM-Integration-Test: - runs-on: ubuntu-latest + concurrency: + group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }} + cancel-in-progress: true + strategy: + matrix: + jdk: [ 8 ] + os: [ ubuntu-latest ] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - name: Set up JDK 8 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: ${{ matrix.jdk }} distribution: 'temurin' cache: maven - name: Test SIT with cdm diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4121e4d7..615bd276 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,19 +8,32 @@ name: Java CI with Maven -on: [push, pull_request] +on: + workflow_dispatch: + pull_request: + push: + branches: + - main jobs: build: + concurrency: + group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }} + cancel-in-progress: true - runs-on: ubuntu-latest + strategy: + matrix: + jdk: [ 8 ] + os: [ ubuntu-latest ] + + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - name: Set up JDK 8 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: ${{ matrix.jdk }} distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index bf68d430..00000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2f5cc74c..00000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1..00000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/pom.xml b/pom.xml index b9802b97..a2481775 100644 --- a/pom.xml +++ b/pom.xml @@ -341,6 +341,22 @@ + + org.apache.rat + apache-rat-plugin + 0.15 + + rat-excludes.txt + + + + verify + + check + + + +
diff --git a/rat-excludes.txt b/rat-excludes.txt new file mode 100644 index 00000000..1569fde9 --- /dev/null +++ b/rat-excludes.txt @@ -0,0 +1,25 @@ +.github/pull_request_template.md +.github/workflows/cdm-integrationtest.yml +.github/workflows/docker-publish.yml +.github/workflows/docker-push-sha-commit.yml +.github/workflows/maven-publish.yml +.github/workflows/maven.yml +.github/workflows/snyk-cli-scan.yml +.github/workflows/snyk-pr-cleanup.yml +README.md +rat-excludes.txt +pom.xml +CODEOWNERS +CODE_OF_CONDUCT.md +CONTRIBUTING.md +RELEASE.md +LICENSE.md +Dockerfile +PERF/* +SIT/* +scripts/* +test-backup/feature/* +src/resources/partitions.csv +src/resources/primary_key_rows.csv +src/resources/log4j.xml + diff --git a/scripts/bump_minor_version b/scripts/bump_minor_version index 7a116b01..b9156a3f 100755 --- a/scripts/bump_minor_version +++ b/scripts/bump_minor_version @@ -1,3 +1,17 @@ +# +# 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 +# +# 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. +# + #!/bin/bash set -x CURRENT_VERSION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout) diff --git a/scripts/get-latest-maven-version.sh b/scripts/get-latest-maven-version.sh index 488e8912..729167a8 100644 --- a/scripts/get-latest-maven-version.sh +++ b/scripts/get-latest-maven-version.sh @@ -1,3 +1,17 @@ +# +# 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 +# +# 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. +# + #!/bin/bash MAVEN_BASE_VERSION=3.9 diff --git a/src/main/java/com/datastax/cdm/cql/EnhancedSession.java b/src/main/java/com/datastax/cdm/cql/EnhancedSession.java index 5bec580e..66f81e66 100644 --- a/src/main/java/com/datastax/cdm/cql/EnhancedSession.java +++ b/src/main/java/com/datastax/cdm/cql/EnhancedSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql; import com.datastax.cdm.cql.statement.*; diff --git a/src/main/java/com/datastax/cdm/cql/codec/AbstractBaseCodec.java b/src/main/java/com/datastax/cdm/cql/codec/AbstractBaseCodec.java index 27e837f5..71a93013 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/AbstractBaseCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/AbstractBaseCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.PropertyHelper; diff --git a/src/main/java/com/datastax/cdm/cql/codec/BIGINT_StringCodec.java b/src/main/java/com/datastax/cdm/cql/codec/BIGINT_StringCodec.java index 6d8a9ed0..450eb2ab 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/BIGINT_StringCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/BIGINT_StringCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/CodecFactory.java b/src/main/java/com/datastax/cdm/cql/codec/CodecFactory.java index 24a71104..3c7cf506 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/CodecFactory.java +++ b/src/main/java/com/datastax/cdm/cql/codec/CodecFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.PropertyHelper; diff --git a/src/main/java/com/datastax/cdm/cql/codec/Codecset.java b/src/main/java/com/datastax/cdm/cql/codec/Codecset.java index d5ad2ee6..ea9851e8 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/Codecset.java +++ b/src/main/java/com/datastax/cdm/cql/codec/Codecset.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; public enum Codecset { diff --git a/src/main/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodec.java b/src/main/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodec.java index d0eed20e..f0cae498 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.PropertyHelper; diff --git a/src/main/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodec.java b/src/main/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodec.java index 78477359..f9b38139 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.PropertyHelper; diff --git a/src/main/java/com/datastax/cdm/cql/codec/INT_StringCodec.java b/src/main/java/com/datastax/cdm/cql/codec/INT_StringCodec.java index 76dca39a..093d7448 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/INT_StringCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/INT_StringCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.PropertyHelper; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodec.java index 7a854530..942a8488 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodec.java index ed153aa1..d985b1a4 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodec.java index 5056ac03..b5f94769 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodec.java index ce566dc0..393cfd72 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodec.java index fb16678d..e1d15798 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TEXT_LongCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TEXT_LongCodec.java index 88b0fcf2..293704bc 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TEXT_LongCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TEXT_LongCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodec.java index d77001ac..2e133770 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.properties.KnownProperties; diff --git a/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodec.java b/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodec.java index 7db456a4..2690ec4e 100644 --- a/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodec.java +++ b/src/main/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodec.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.oss.driver.api.core.ProtocolVersion; diff --git a/src/main/java/com/datastax/cdm/cql/statement/BaseCdmStatement.java b/src/main/java/com/datastax/cdm/cql/statement/BaseCdmStatement.java index 9a5973df..f0c74c5d 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/BaseCdmStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/BaseCdmStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatement.java b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatement.java index 1775bff1..35b1e63a 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatement.java b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatement.java index 69d8b73b..3b0e7d0e 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectStatement.java b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectStatement.java index f95ac7d9..1e073045 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/OriginSelectStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/OriginSelectStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/TargetInsertStatement.java b/src/main/java/com/datastax/cdm/cql/statement/TargetInsertStatement.java index cd6022c7..b520bd02 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/TargetInsertStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/TargetInsertStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatement.java b/src/main/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatement.java index 29133c54..2152ac37 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/TargetUpdateStatement.java b/src/main/java/com/datastax/cdm/cql/statement/TargetUpdateStatement.java index bc2aa267..b0eff4d6 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/TargetUpdateStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/TargetUpdateStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertStatement.java b/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertStatement.java index cc127a74..bbd99be6 100644 --- a/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertStatement.java +++ b/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertStatement.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/data/CqlConversion.java b/src/main/java/com/datastax/cdm/data/CqlConversion.java index fb78ade9..1e278200 100644 --- a/src/main/java/com/datastax/cdm/data/CqlConversion.java +++ b/src/main/java/com/datastax/cdm/data/CqlConversion.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.cdm.schema.CqlTable; diff --git a/src/main/java/com/datastax/cdm/data/CqlData.java b/src/main/java/com/datastax/cdm/data/CqlData.java index 3141ef09..1e650e6b 100644 --- a/src/main/java/com/datastax/cdm/data/CqlData.java +++ b/src/main/java/com/datastax/cdm/data/CqlData.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.dse.driver.api.core.type.DseDataTypes; diff --git a/src/main/java/com/datastax/cdm/data/DataUtility.java b/src/main/java/com/datastax/cdm/data/DataUtility.java index 7e424e3f..e8a27ba6 100644 --- a/src/main/java/com/datastax/cdm/data/DataUtility.java +++ b/src/main/java/com/datastax/cdm/data/DataUtility.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.cdm.schema.CqlTable; diff --git a/src/main/java/com/datastax/cdm/data/EnhancedPK.java b/src/main/java/com/datastax/cdm/data/EnhancedPK.java index 7e531628..26b4628f 100644 --- a/src/main/java/com/datastax/cdm/data/EnhancedPK.java +++ b/src/main/java/com/datastax/cdm/data/EnhancedPK.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.cdm.feature.ExplodeMap; import com.datastax.cdm.properties.KnownProperties; diff --git a/src/main/java/com/datastax/cdm/data/PKFactory.java b/src/main/java/com/datastax/cdm/data/PKFactory.java index 81a2e3f8..e2d9f85b 100644 --- a/src/main/java/com/datastax/cdm/data/PKFactory.java +++ b/src/main/java/com/datastax/cdm/data/PKFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.cdm.feature.*; diff --git a/src/main/java/com/datastax/cdm/data/Record.java b/src/main/java/com/datastax/cdm/data/Record.java index b0c171cc..95ca6445 100644 --- a/src/main/java/com/datastax/cdm/data/Record.java +++ b/src/main/java/com/datastax/cdm/data/Record.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.oss.driver.api.core.cql.AsyncResultSet; diff --git a/src/main/java/com/datastax/cdm/feature/AbstractFeature.java b/src/main/java/com/datastax/cdm/feature/AbstractFeature.java index 72b7d218..8cf85b57 100644 --- a/src/main/java/com/datastax/cdm/feature/AbstractFeature.java +++ b/src/main/java/com/datastax/cdm/feature/AbstractFeature.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.schema.CqlTable; diff --git a/src/main/java/com/datastax/cdm/feature/ConstantColumns.java b/src/main/java/com/datastax/cdm/feature/ConstantColumns.java index b94ab15a..9a4df00d 100644 --- a/src/main/java/com/datastax/cdm/feature/ConstantColumns.java +++ b/src/main/java/com/datastax/cdm/feature/ConstantColumns.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.properties.IPropertyHelper; diff --git a/src/main/java/com/datastax/cdm/feature/ExplodeMap.java b/src/main/java/com/datastax/cdm/feature/ExplodeMap.java index aa138116..338b8003 100644 --- a/src/main/java/com/datastax/cdm/feature/ExplodeMap.java +++ b/src/main/java/com/datastax/cdm/feature/ExplodeMap.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.data.CqlConversion; diff --git a/src/main/java/com/datastax/cdm/feature/Feature.java b/src/main/java/com/datastax/cdm/feature/Feature.java index 52953583..3f0153e0 100644 --- a/src/main/java/com/datastax/cdm/feature/Feature.java +++ b/src/main/java/com/datastax/cdm/feature/Feature.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.properties.IPropertyHelper; diff --git a/src/main/java/com/datastax/cdm/feature/FeatureFactory.java b/src/main/java/com/datastax/cdm/feature/FeatureFactory.java index e07edfe1..7e0d9fe1 100644 --- a/src/main/java/com/datastax/cdm/feature/FeatureFactory.java +++ b/src/main/java/com/datastax/cdm/feature/FeatureFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; public class FeatureFactory { diff --git a/src/main/java/com/datastax/cdm/feature/Featureset.java b/src/main/java/com/datastax/cdm/feature/Featureset.java index 33481168..0d8d7766 100644 --- a/src/main/java/com/datastax/cdm/feature/Featureset.java +++ b/src/main/java/com/datastax/cdm/feature/Featureset.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; public enum Featureset { diff --git a/src/main/java/com/datastax/cdm/feature/Guardrail.java b/src/main/java/com/datastax/cdm/feature/Guardrail.java index 4d822be8..e4988f06 100644 --- a/src/main/java/com/datastax/cdm/feature/Guardrail.java +++ b/src/main/java/com/datastax/cdm/feature/Guardrail.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.data.Record; diff --git a/src/main/java/com/datastax/cdm/feature/OriginFilterCondition.java b/src/main/java/com/datastax/cdm/feature/OriginFilterCondition.java index da0a5e22..27112c78 100644 --- a/src/main/java/com/datastax/cdm/feature/OriginFilterCondition.java +++ b/src/main/java/com/datastax/cdm/feature/OriginFilterCondition.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.properties.IPropertyHelper; diff --git a/src/main/java/com/datastax/cdm/feature/WritetimeTTL.java b/src/main/java/com/datastax/cdm/feature/WritetimeTTL.java index eaffb9f2..75ec9526 100644 --- a/src/main/java/com/datastax/cdm/feature/WritetimeTTL.java +++ b/src/main/java/com/datastax/cdm/feature/WritetimeTTL.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.oss.driver.api.core.cql.Row; diff --git a/src/main/java/com/datastax/cdm/job/AbstractJobSession.java b/src/main/java/com/datastax/cdm/job/AbstractJobSession.java index 4830b68d..28a1a25d 100644 --- a/src/main/java/com/datastax/cdm/job/AbstractJobSession.java +++ b/src/main/java/com/datastax/cdm/job/AbstractJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/main/java/com/datastax/cdm/job/BaseJobSession.java b/src/main/java/com/datastax/cdm/job/BaseJobSession.java index 3853821a..962a564c 100644 --- a/src/main/java/com/datastax/cdm/job/BaseJobSession.java +++ b/src/main/java/com/datastax/cdm/job/BaseJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.feature.Feature; diff --git a/src/main/java/com/datastax/cdm/job/CopyJobSession.java b/src/main/java/com/datastax/cdm/job/CopyJobSession.java index f60c6b16..4a94b804 100644 --- a/src/main/java/com/datastax/cdm/job/CopyJobSession.java +++ b/src/main/java/com/datastax/cdm/job/CopyJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.cql.statement.OriginSelectByPartitionRangeStatement; diff --git a/src/main/java/com/datastax/cdm/job/CopyJobSessionFactory.java b/src/main/java/com/datastax/cdm/job/CopyJobSessionFactory.java index 82274fb9..97d9ee0e 100644 --- a/src/main/java/com/datastax/cdm/job/CopyJobSessionFactory.java +++ b/src/main/java/com/datastax/cdm/job/CopyJobSessionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.oss.driver.api.core.CqlSession; diff --git a/src/main/java/com/datastax/cdm/job/CopyPKJobSession.java b/src/main/java/com/datastax/cdm/job/CopyPKJobSession.java index eff0c107..cbee4ac9 100644 --- a/src/main/java/com/datastax/cdm/job/CopyPKJobSession.java +++ b/src/main/java/com/datastax/cdm/job/CopyPKJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.cql.statement.OriginSelectByPKStatement; diff --git a/src/main/java/com/datastax/cdm/job/CopyPKJobSessionFactory.java b/src/main/java/com/datastax/cdm/job/CopyPKJobSessionFactory.java index c79fa974..2ed017bf 100644 --- a/src/main/java/com/datastax/cdm/job/CopyPKJobSessionFactory.java +++ b/src/main/java/com/datastax/cdm/job/CopyPKJobSessionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.oss.driver.api.core.CqlSession; diff --git a/src/main/java/com/datastax/cdm/job/DiffJobSession.java b/src/main/java/com/datastax/cdm/job/DiffJobSession.java index e0fb1f3a..77801998 100644 --- a/src/main/java/com/datastax/cdm/job/DiffJobSession.java +++ b/src/main/java/com/datastax/cdm/job/DiffJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.cql.statement.OriginSelectByPartitionRangeStatement; diff --git a/src/main/java/com/datastax/cdm/job/DiffJobSessionFactory.java b/src/main/java/com/datastax/cdm/job/DiffJobSessionFactory.java index 8b933502..68370a50 100644 --- a/src/main/java/com/datastax/cdm/job/DiffJobSessionFactory.java +++ b/src/main/java/com/datastax/cdm/job/DiffJobSessionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.oss.driver.api.core.CqlSession; diff --git a/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSession.java b/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSession.java index 665ef149..20370ac9 100644 --- a/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSession.java +++ b/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSession.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.cql.statement.OriginSelectByPartitionRangeStatement; diff --git a/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSessionFactory.java b/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSessionFactory.java index bb8b9e50..19898793 100644 --- a/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSessionFactory.java +++ b/src/main/java/com/datastax/cdm/job/GuardrailCheckJobSessionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.oss.driver.api.core.CqlSession; diff --git a/src/main/java/com/datastax/cdm/job/IJobSessionFactory.java b/src/main/java/com/datastax/cdm/job/IJobSessionFactory.java index ef4e960c..b3bc25ab 100644 --- a/src/main/java/com/datastax/cdm/job/IJobSessionFactory.java +++ b/src/main/java/com/datastax/cdm/job/IJobSessionFactory.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.oss.driver.api.core.CqlSession; diff --git a/src/main/java/com/datastax/cdm/job/JobCounter.java b/src/main/java/com/datastax/cdm/job/JobCounter.java index 92e29bb9..042b5100 100644 --- a/src/main/java/com/datastax/cdm/job/JobCounter.java +++ b/src/main/java/com/datastax/cdm/job/JobCounter.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import java.util.HashMap; diff --git a/src/main/java/com/datastax/cdm/job/SplitPartitions.java b/src/main/java/com/datastax/cdm/job/SplitPartitions.java index 6a4cf1e6..25d8e8df 100644 --- a/src/main/java/com/datastax/cdm/job/SplitPartitions.java +++ b/src/main/java/com/datastax/cdm/job/SplitPartitions.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import com.datastax.cdm.properties.KnownProperties; diff --git a/src/main/java/com/datastax/cdm/properties/IPropertyHelper.java b/src/main/java/com/datastax/cdm/properties/IPropertyHelper.java index 1270d13e..02d49d11 100644 --- a/src/main/java/com/datastax/cdm/properties/IPropertyHelper.java +++ b/src/main/java/com/datastax/cdm/properties/IPropertyHelper.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.properties; import org.apache.spark.SparkConf; diff --git a/src/main/java/com/datastax/cdm/properties/KnownProperties.java b/src/main/java/com/datastax/cdm/properties/KnownProperties.java index 4aaa3f90..b027c5a2 100644 --- a/src/main/java/com/datastax/cdm/properties/KnownProperties.java +++ b/src/main/java/com/datastax/cdm/properties/KnownProperties.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.properties; import java.util.*; diff --git a/src/main/java/com/datastax/cdm/properties/PropertyHelper.java b/src/main/java/com/datastax/cdm/properties/PropertyHelper.java index 7b382aed..6daf2f69 100644 --- a/src/main/java/com/datastax/cdm/properties/PropertyHelper.java +++ b/src/main/java/com/datastax/cdm/properties/PropertyHelper.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.properties; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/datastax/cdm/schema/BaseTable.java b/src/main/java/com/datastax/cdm/schema/BaseTable.java index ea83ade6..b5cfa4f5 100644 --- a/src/main/java/com/datastax/cdm/schema/BaseTable.java +++ b/src/main/java/com/datastax/cdm/schema/BaseTable.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.schema; import com.datastax.cdm.data.CqlConversion; diff --git a/src/main/java/com/datastax/cdm/schema/CqlTable.java b/src/main/java/com/datastax/cdm/schema/CqlTable.java index 5551493e..3b12cfe7 100644 --- a/src/main/java/com/datastax/cdm/schema/CqlTable.java +++ b/src/main/java/com/datastax/cdm/schema/CqlTable.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.schema; import com.datastax.cdm.feature.Feature; diff --git a/src/main/java/com/datastax/cdm/schema/Table.java b/src/main/java/com/datastax/cdm/schema/Table.java index 95931f62..ba6df211 100644 --- a/src/main/java/com/datastax/cdm/schema/Table.java +++ b/src/main/java/com/datastax/cdm/schema/Table.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.schema; import com.datastax.oss.driver.api.core.type.DataType; diff --git a/src/main/scala/com/datastax/cdm/job/BaseJob.scala b/src/main/scala/com/datastax/cdm/job/BaseJob.scala index 20804869..9c72b9c1 100644 --- a/src/main/scala/com/datastax/cdm/job/BaseJob.scala +++ b/src/main/scala/com/datastax/cdm/job/BaseJob.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job import com.datastax.cdm.job.SplitPartitions.getPartitionFile diff --git a/src/main/scala/com/datastax/cdm/job/BasePKJob.scala b/src/main/scala/com/datastax/cdm/job/BasePKJob.scala index eedd6026..7d03b99e 100644 --- a/src/main/scala/com/datastax/cdm/job/BasePKJob.scala +++ b/src/main/scala/com/datastax/cdm/job/BasePKJob.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job import java.util diff --git a/src/main/scala/com/datastax/cdm/job/BasePartitionJob.scala b/src/main/scala/com/datastax/cdm/job/BasePartitionJob.scala index 62c3f378..5329bd04 100644 --- a/src/main/scala/com/datastax/cdm/job/BasePartitionJob.scala +++ b/src/main/scala/com/datastax/cdm/job/BasePartitionJob.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job import java.util diff --git a/src/main/scala/com/datastax/cdm/job/ConnectionDetails.scala b/src/main/scala/com/datastax/cdm/job/ConnectionDetails.scala index a5107c23..3d987b7d 100644 --- a/src/main/scala/com/datastax/cdm/job/ConnectionDetails.scala +++ b/src/main/scala/com/datastax/cdm/job/ConnectionDetails.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job case class ConnectionDetails( diff --git a/src/main/scala/com/datastax/cdm/job/ConnectionFetcher.scala b/src/main/scala/com/datastax/cdm/job/ConnectionFetcher.scala index a74b7621..9a17b100 100644 --- a/src/main/scala/com/datastax/cdm/job/ConnectionFetcher.scala +++ b/src/main/scala/com/datastax/cdm/job/ConnectionFetcher.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job import com.datastax.cdm.properties.{KnownProperties, PropertyHelper} diff --git a/src/main/scala/com/datastax/cdm/job/DiffData.scala b/src/main/scala/com/datastax/cdm/job/DiffData.scala index 21ad6e1c..6a8a877d 100644 --- a/src/main/scala/com/datastax/cdm/job/DiffData.scala +++ b/src/main/scala/com/datastax/cdm/job/DiffData.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job object DiffData extends BasePartitionJob { diff --git a/src/main/scala/com/datastax/cdm/job/GuardrailCheck.scala b/src/main/scala/com/datastax/cdm/job/GuardrailCheck.scala index c0ceccdf..77d016d0 100644 --- a/src/main/scala/com/datastax/cdm/job/GuardrailCheck.scala +++ b/src/main/scala/com/datastax/cdm/job/GuardrailCheck.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job object GuardrailCheck extends BasePartitionJob { diff --git a/src/main/scala/com/datastax/cdm/job/Migrate.scala b/src/main/scala/com/datastax/cdm/job/Migrate.scala index a38a01af..4b2d802a 100644 --- a/src/main/scala/com/datastax/cdm/job/Migrate.scala +++ b/src/main/scala/com/datastax/cdm/job/Migrate.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job object Migrate extends BasePartitionJob { diff --git a/src/main/scala/com/datastax/cdm/job/MigrateRowsFromFile.scala b/src/main/scala/com/datastax/cdm/job/MigrateRowsFromFile.scala index b5518149..46884fb8 100644 --- a/src/main/scala/com/datastax/cdm/job/MigrateRowsFromFile.scala +++ b/src/main/scala/com/datastax/cdm/job/MigrateRowsFromFile.scala @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job object MigrateRowsFromFile extends BasePKJob { diff --git a/src/resources/cdm-detailed.properties b/src/resources/cdm-detailed.properties index 109e7435..b9b0cda1 100644 --- a/src/resources/cdm-detailed.properties +++ b/src/resources/cdm-detailed.properties @@ -1,3 +1,18 @@ +# Copyright DataStax, 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 +# +# 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. +# + #********************************************************************************************************** #********************************************************************************************************** # diff --git a/src/resources/cdm.properties b/src/resources/cdm.properties index 0a4c2070..1af7805e 100644 --- a/src/resources/cdm.properties +++ b/src/resources/cdm.properties @@ -1,3 +1,18 @@ +# Copyright DataStax, 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 +# +# 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. +# + #********************************************************************************************************** #********************************************************************************************************** # diff --git a/src/resources/log4j.properties b/src/resources/log4j.properties index b6a8fc9c..3d2af4ff 100644 --- a/src/resources/log4j.properties +++ b/src/resources/log4j.properties @@ -1,3 +1,18 @@ +# Copyright DataStax, 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 +# +# 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. +# + # Root logger option log4j.rootLogger=INFO, stdout # Direct log messages to stdout diff --git a/src/resources/migrate_data.sh b/src/resources/migrate_data.sh index 39bbd193..75aa7ba6 100644 --- a/src/resources/migrate_data.sh +++ b/src/resources/migrate_data.sh @@ -1,3 +1,18 @@ +# Copyright DataStax, 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 +# +# 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. +# + #! /bin/bash ########################################################################################################################### diff --git a/src/test/java/com/datastax/cdm/cql/CommonMocks.java b/src/test/java/com/datastax/cdm/cql/CommonMocks.java index 45c1e94b..afd3a0b5 100644 --- a/src/test/java/com/datastax/cdm/cql/CommonMocks.java +++ b/src/test/java/com/datastax/cdm/cql/CommonMocks.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql; import com.datastax.cdm.data.*; diff --git a/src/test/java/com/datastax/cdm/cql/codec/BIGINT_StringCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/BIGINT_StringCodecTest.java index 9aaee4d2..8c14d0e0 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/BIGINT_StringCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/BIGINT_StringCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/CodecFactoryTest.java b/src/test/java/com/datastax/cdm/cql/codec/CodecFactoryTest.java index 45ec4838..7a92ac65 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/CodecFactoryTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/CodecFactoryTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.MockitoExtension; diff --git a/src/test/java/com/datastax/cdm/cql/codec/CodecTestHelper.java b/src/test/java/com/datastax/cdm/cql/codec/CodecTestHelper.java index 39713845..f7c4c029 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/CodecTestHelper.java +++ b/src/test/java/com/datastax/cdm/cql/codec/CodecTestHelper.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/com/datastax/cdm/cql/codec/DATERANGETYPE_CodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/DATERANGETYPE_CodecTest.java index 45c9f366..3c6f1faa 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/DATERANGETYPE_CodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/DATERANGETYPE_CodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.dse.driver.api.core.data.time.DateRange; diff --git a/src/test/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodecTest.java index c2735283..f9b44060 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/DECIMAL_StringCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodecTest.java index 7d933073..ed52829c 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/DOUBLE_StringCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/INT_StringCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/INT_StringCodecTest.java index a46c4158..41ba9ce0 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/INT_StringCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/INT_StringCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/LINESTRINGTYPE_CodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/LINESTRINGTYPE_CodecTest.java index 490f79c5..73270df9 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/LINESTRINGTYPE_CodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/LINESTRINGTYPE_CodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/POINTTYPE_CodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/POINTTYPE_CodecTest.java index f9bfc767..f049ae69 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/POINTTYPE_CodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/POINTTYPE_CodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/POLYGONTYPE_CodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/POLYGONTYPE_CodecTest.java index 22ca2723..5736461f 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/POLYGONTYPE_CodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/POLYGONTYPE_CodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodecTest.java index 515b754a..9933abfe 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXTFormat_InstantCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodecTest.java index 58d0abea..3a4c3470 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXTMillis_InstantCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodecTest.java index 48094098..abde75c8 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXT_BigDecimalCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodecTest.java index 48e9455c..2009d513 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXT_DoubleCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodecTest.java index 53e176ad..d3280d89 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXT_IntegerCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TEXT_LongCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TEXT_LongCodecTest.java index 5f006b3d..c2fb88e1 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TEXT_LongCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TEXT_LongCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodecTest.java index bb5c6fbe..b85a6d59 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringFormatCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodecTest.java b/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodecTest.java index 72fc9bcd..a34f15f7 100644 --- a/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodecTest.java +++ b/src/test/java/com/datastax/cdm/cql/codec/TIMESTAMP_StringMillisCodecTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.codec; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/cql/statement/BaseCdmStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/BaseCdmStatementTest.java index 3b7f3208..4f16c1eb 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/BaseCdmStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/BaseCdmStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/test/java/com/datastax/cdm/cql/statement/Feature_CounterTest.java b/src/test/java/com/datastax/cdm/cql/statement/Feature_CounterTest.java index 76406f37..d3e02a0a 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/Feature_CounterTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/Feature_CounterTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.data.CqlData; diff --git a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatementTest.java index d65df1b6..2db91ea3 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPKStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.data.EnhancedPK; diff --git a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatementTest.java index 70c7f3d4..aa6b0298 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectByPartitionRangeStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectStatementTest.java index 9ab64f42..8498d4a1 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/OriginSelectStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/OriginSelectStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.EnhancedSession; diff --git a/src/test/java/com/datastax/cdm/cql/statement/TargetInsertStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/TargetInsertStatementTest.java index e08f6ecb..9c4330f1 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/TargetInsertStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/TargetInsertStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatementTest.java index 908e3905..0bea8325 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/TargetSelectByPKStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.data.EnhancedPK; diff --git a/src/test/java/com/datastax/cdm/cql/statement/TargetUpdateStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/TargetUpdateStatementTest.java index 43eb0fd8..a1aecaa9 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/TargetUpdateStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/TargetUpdateStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.oss.driver.api.core.cql.BoundStatement; diff --git a/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertStatementTest.java index 04bceab6..14fd20dc 100644 --- a/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertStatementTest.java +++ b/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertStatementTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.cql.statement; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/data/CqlConversionTest.java b/src/test/java/com/datastax/cdm/data/CqlConversionTest.java index 67850ba8..4d732a3c 100644 --- a/src/test/java/com/datastax/cdm/data/CqlConversionTest.java +++ b/src/test/java/com/datastax/cdm/data/CqlConversionTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.oss.driver.api.core.type.DataType; diff --git a/src/test/java/com/datastax/cdm/data/DataUtilityTest.java b/src/test/java/com/datastax/cdm/data/DataUtilityTest.java index 275590ab..c4484641 100644 --- a/src/test/java/com/datastax/cdm/data/DataUtilityTest.java +++ b/src/test/java/com/datastax/cdm/data/DataUtilityTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/data/MockitoExtension.java b/src/test/java/com/datastax/cdm/data/MockitoExtension.java index 06c4b253..5a673ac5 100644 --- a/src/test/java/com/datastax/cdm/data/MockitoExtension.java +++ b/src/test/java/com/datastax/cdm/data/MockitoExtension.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.data; import org.junit.jupiter.api.extension.Extension; diff --git a/src/test/java/com/datastax/cdm/feature/AbstractFeatureTest.java b/src/test/java/com/datastax/cdm/feature/AbstractFeatureTest.java index 4e30e984..9c08e265 100644 --- a/src/test/java/com/datastax/cdm/feature/AbstractFeatureTest.java +++ b/src/test/java/com/datastax/cdm/feature/AbstractFeatureTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.properties.IPropertyHelper; diff --git a/src/test/java/com/datastax/cdm/feature/ConstantColumnsTest.java b/src/test/java/com/datastax/cdm/feature/ConstantColumnsTest.java index b000c22a..54cfd289 100644 --- a/src/test/java/com/datastax/cdm/feature/ConstantColumnsTest.java +++ b/src/test/java/com/datastax/cdm/feature/ConstantColumnsTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/feature/ExplodeMapTest.java b/src/test/java/com/datastax/cdm/feature/ExplodeMapTest.java index 552a524a..7e8040be 100644 --- a/src/test/java/com/datastax/cdm/feature/ExplodeMapTest.java +++ b/src/test/java/com/datastax/cdm/feature/ExplodeMapTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.data.CqlConversion; diff --git a/src/test/java/com/datastax/cdm/feature/FeatureFactoryTest.java b/src/test/java/com/datastax/cdm/feature/FeatureFactoryTest.java index a8c56aa4..5b0ed112 100644 --- a/src/test/java/com/datastax/cdm/feature/FeatureFactoryTest.java +++ b/src/test/java/com/datastax/cdm/feature/FeatureFactoryTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/datastax/cdm/feature/GuardrailTest.java b/src/test/java/com/datastax/cdm/feature/GuardrailTest.java index 3c028831..a28ad5df 100644 --- a/src/test/java/com/datastax/cdm/feature/GuardrailTest.java +++ b/src/test/java/com/datastax/cdm/feature/GuardrailTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/feature/OriginFilterConditionTest.java b/src/test/java/com/datastax/cdm/feature/OriginFilterConditionTest.java index 96345eb4..86547a31 100644 --- a/src/test/java/com/datastax/cdm/feature/OriginFilterConditionTest.java +++ b/src/test/java/com/datastax/cdm/feature/OriginFilterConditionTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.properties.IPropertyHelper; diff --git a/src/test/java/com/datastax/cdm/feature/TTLAndWritetimeTest.java b/src/test/java/com/datastax/cdm/feature/TTLAndWritetimeTest.java index 09b271b3..bfce7bf0 100644 --- a/src/test/java/com/datastax/cdm/feature/TTLAndWritetimeTest.java +++ b/src/test/java/com/datastax/cdm/feature/TTLAndWritetimeTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.feature; import com.datastax.cdm.cql.CommonMocks; diff --git a/src/test/java/com/datastax/cdm/job/JobCounterTest.java b/src/test/java/com/datastax/cdm/job/JobCounterTest.java index ca55ea4e..7e63f98e 100644 --- a/src/test/java/com/datastax/cdm/job/JobCounterTest.java +++ b/src/test/java/com/datastax/cdm/job/JobCounterTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.job; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/datastax/cdm/properties/KnownPropertiesTest.java b/src/test/java/com/datastax/cdm/properties/KnownPropertiesTest.java index 8b7c16d1..8171de77 100644 --- a/src/test/java/com/datastax/cdm/properties/KnownPropertiesTest.java +++ b/src/test/java/com/datastax/cdm/properties/KnownPropertiesTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.properties; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/com/datastax/cdm/properties/PropertyHelperTest.java b/src/test/java/com/datastax/cdm/properties/PropertyHelperTest.java index f0102992..cf2d8fc3 100644 --- a/src/test/java/com/datastax/cdm/properties/PropertyHelperTest.java +++ b/src/test/java/com/datastax/cdm/properties/PropertyHelperTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.properties; import java.util.List; diff --git a/src/test/java/com/datastax/cdm/regression/CQL_ColumnRenameWithConstantsAndExplode.java b/src/test/java/com/datastax/cdm/regression/CQL_ColumnRenameWithConstantsAndExplode.java index 9a70aab2..a5573e31 100644 --- a/src/test/java/com/datastax/cdm/regression/CQL_ColumnRenameWithConstantsAndExplode.java +++ b/src/test/java/com/datastax/cdm/regression/CQL_ColumnRenameWithConstantsAndExplode.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.regression; import com.datastax.cdm.cql.statement.*; diff --git a/src/test/java/com/datastax/cdm/schema/BaseTableTest.java b/src/test/java/com/datastax/cdm/schema/BaseTableTest.java index 6d6419f5..3515b3e2 100644 --- a/src/test/java/com/datastax/cdm/schema/BaseTableTest.java +++ b/src/test/java/com/datastax/cdm/schema/BaseTableTest.java @@ -1,3 +1,18 @@ +/* + * Copyright DataStax, 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 + * + * 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. + */ package com.datastax.cdm.schema; import com.datastax.cdm.cql.CommonMocks; From 73401b9e6e9f68978d9a4b2e5251094f419636d3 Mon Sep 17 00:00:00 2001 From: Madhavan Date: Thu, 7 Dec 2023 08:43:10 -0500 Subject: [PATCH 10/11] CI concurrency improvements (#224) --- .github/workflows/cdm-integrationtest.yml | 8 +++++--- .github/workflows/maven.yml | 8 ++++---- .github/workflows/snyk-cli-scan.yml | 6 ++++++ .github/workflows/snyk-pr-cleanup.yml | 5 +++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml index 0d180724..a7015962 100644 --- a/.github/workflows/cdm-integrationtest.yml +++ b/.github/workflows/cdm-integrationtest.yml @@ -5,11 +5,13 @@ on: push: branches: - main + +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true + jobs: CDM-Integration-Test: - concurrency: - group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }} - cancel-in-progress: true strategy: matrix: jdk: [ 8 ] diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 615bd276..b1793e8e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,12 +15,12 @@ on: branches: - main +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + cancel-in-progress: true + jobs: build: - concurrency: - group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }} - cancel-in-progress: true - strategy: matrix: jdk: [ 8 ] diff --git a/.github/workflows/snyk-cli-scan.yml b/.github/workflows/snyk-cli-scan.yml index 2952408f..269979b8 100644 --- a/.github/workflows/snyk-cli-scan.yml +++ b/.github/workflows/snyk-cli-scan.yml @@ -10,5 +10,11 @@ on: branches: [ main ] workflow_dispatch: +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + #group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }} + cancel-in-progress: true + env: SNYK_SEVERITY_THRESHOLD_LEVEL: critical + diff --git a/.github/workflows/snyk-pr-cleanup.yml b/.github/workflows/snyk-pr-cleanup.yml index b77b713f..4164eac6 100644 --- a/.github/workflows/snyk-pr-cleanup.yml +++ b/.github/workflows/snyk-pr-cleanup.yml @@ -9,3 +9,8 @@ on: - main workflow_dispatch: +concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' + #group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }} + cancel-in-progress: true + From b9b5e39c43a11f98283c254d179e7a5061c39810 Mon Sep 17 00:00:00 2001 From: Pravin Bhat Date: Tue, 12 Dec 2023 12:23:36 -0500 Subject: [PATCH 11/11] Feature/fix code coverage issue (#228) * Fixed coverage issue * Fixed mockito version * Minor coverage updates & enabled back scala --- README.md | 4 +- RELEASE.md | 3 + pom.xml | 84 ++++++------------- .../com/datastax/cdm/job/SplitPartitions.java | 2 +- .../datastax/cdm/job/SplitPartitionsTest.java | 40 +++++++++ 5 files changed, 70 insertions(+), 63 deletions(-) create mode 100644 src/test/java/com/datastax/cdm/job/SplitPartitionsTest.java diff --git a/README.md b/README.md index f1271744..324c6a8b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Migrate and Validate Tables between Origin and Target Cassandra Clusters. ### Prerequisite - Install Java8 as spark binaries are compiled with it. -- Install Spark version [3.4.1](https://archive.apache.org/dist/spark/spark-3.4.1/) on a single VM (no cluster necessary) where you want to run this job. Spark can be installed by running the following: - +- Install Spark version [3.4.1](https://archive.apache.org/dist/spark/spark-3.4.1/spark-3.4.1-bin-hadoop3-scala2.13.tgz) on a single VM (no cluster necessary) where you want to run this job. Spark can be installed by running the following: - ``` wget https://archive.apache.org/dist/spark/spark-3.4.1/spark-3.4.1-bin-hadoop3-scala2.13.tgz tar -xvzf spark-3.4.1-bin-hadoop3-scala2.13.tgz @@ -97,7 +97,7 @@ Each line above represents a partition-range (`min,max`). Alternatively, you can ./spark-submit --properties-file cdm.properties \ --conf spark.cdm.schema.origin.keyspaceTable="." \ --conf spark.cdm.tokenRange.partitionFile="//" \ ---master "local[*]" --driver-memory 25G --executor-memory 25G \ + --master "local[*]" --driver-memory 25G --executor-memory 25G \ --class com.datastax.cdm.job. cassandra-data-migrator-4.x.x.jar &> logfile_name_$(date +%Y%m%d_%H_%M).txt ``` This mode is specifically useful to processes a subset of partition-ranges that may have failed during a previous run. diff --git a/RELEASE.md b/RELEASE.md index 70376e89..f792ea4f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,7 @@ # Release Notes +## [4.1.9 to 4.1.11] - 2023-12-11 +- Code test & coverage changes + ## [4.1.8] - 2023-10-13 - Upgraded to use Scala 2.13 diff --git a/pom.xml b/pom.xml index a2481775..056987c5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ datastax.cdm cassandra-data-migrator - 4.1.10-SNAPSHOT + 4.1.11-SNAPSHOT jar @@ -11,7 +11,6 @@ 2.13.12 2.13 3.4.1 - 3.2.17 3.4.1 5.0-alpha1 5.9.1 @@ -151,12 +150,6 @@ - - org.scalatest - scalatest_${scala.main.version} - ${scalatest.version} - test - org.junit.jupiter junit-jupiter-engine @@ -200,20 +193,27 @@ - net.alchim31.maven - scala-maven-plugin - 4.8.0 - - - process-sources - - compile - testCompile - + net.alchim31.maven + scala-maven-plugin + 4.8.0 + + + process-sources + + compile + testCompile + - - + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + org.apache.maven.plugins maven-shade-plugin @@ -242,35 +242,6 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - true - - - - - org.scalatest - scalatest-maven-plugin - 2.2.0 - - ${project.build.directory}/surefire-reports - . - WDF TestSuite.txt - - - - test - - test - - - - org.apache.maven.plugins @@ -304,14 +275,10 @@ jacoco-check test - check report + check - - - com.datastax.cdm.job.* - BUNDLE @@ -319,20 +286,17 @@ COMPLEXITY COVEREDRATIO - - 0 + 0.33 INSTRUCTION COVEREDRATIO - - 0% + 45% LINE MISSEDCOUNT - - 3085 + 1500 diff --git a/src/main/java/com/datastax/cdm/job/SplitPartitions.java b/src/main/java/com/datastax/cdm/job/SplitPartitions.java index 25d8e8df..003e892f 100644 --- a/src/main/java/com/datastax/cdm/job/SplitPartitions.java +++ b/src/main/java/com/datastax/cdm/job/SplitPartitions.java @@ -35,7 +35,7 @@ public class SplitPartitions { public static Logger logger = LoggerFactory.getLogger(SplitPartitions.class.getName()); - public static Collection getRandomSubPartitions(int numSplits, BigInteger min, BigInteger max, int coveragePercent) { + public static List getRandomSubPartitions(int numSplits, BigInteger min, BigInteger max, int coveragePercent) { logger.info("ThreadID: {} Splitting min: {} max: {}", Thread.currentThread().getId(), min, max); List partitions = getSubPartitions(numSplits, min, max, coveragePercent); Collections.shuffle(partitions); diff --git a/src/test/java/com/datastax/cdm/job/SplitPartitionsTest.java b/src/test/java/com/datastax/cdm/job/SplitPartitionsTest.java new file mode 100644 index 00000000..a4de09ce --- /dev/null +++ b/src/test/java/com/datastax/cdm/job/SplitPartitionsTest.java @@ -0,0 +1,40 @@ +package com.datastax.cdm.job; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class SplitPartitionsTest { + + @Test + void getRandomSubPartitionsTest() { + List partitions = SplitPartitions.getRandomSubPartitions(10, BigInteger.ONE, + BigInteger.valueOf(100), 100); + assertEquals(10, partitions.size()); + partitions.forEach(p -> { + assertEquals(9, p.getMax().longValue() - p.getMin().longValue()); + }); + } + + @Test + void getRandomSubPartitionsTestOver100() { + List partitions = SplitPartitions.getRandomSubPartitions(8, BigInteger.ONE, + BigInteger.valueOf(44), 200); + assertEquals(8, partitions.size()); + } + @Test + void batchesTest() { + List mutable_list = Arrays.asList("e1", "e2", "e3", "e4", "e5", "e6"); + Stream> out = SplitPartitions.batches(mutable_list, 2); + assertEquals(3, out.count()); + } + +}