From b38fc9ebc5f780fb2d207a3ed35a75f7b354a984 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 08:31:39 -0700 Subject: [PATCH 1/6] Updated release versions to 4.46.0 for azure-cosmos and 4.19.0 for spark connector --- eng/jacoco-test-coverage/pom.xml | 4 ++-- eng/versioning/version_client.txt | 10 +++++----- sdk/cosmos/azure-cosmos-benchmark/pom.xml | 4 ++-- sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml | 2 +- sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md | 10 ++-------- sdk/cosmos/azure-cosmos-encryption/README.md | 2 +- sdk/cosmos/azure-cosmos-encryption/pom.xml | 4 ++-- sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md | 6 +----- sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md | 1 + sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml | 2 +- sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md | 6 +----- sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md | 1 + sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml | 2 +- sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md | 6 +----- sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md | 1 + sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml | 2 +- sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml | 2 +- sdk/cosmos/azure-cosmos-test/pom.xml | 2 +- sdk/cosmos/azure-cosmos-tests/pom.xml | 2 +- sdk/cosmos/azure-cosmos/CHANGELOG.md | 2 +- sdk/cosmos/azure-cosmos/README.md | 2 +- sdk/cosmos/azure-cosmos/pom.xml | 2 +- 22 files changed, 30 insertions(+), 45 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 63e005190966..b66525f89d3f 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -183,12 +183,12 @@ com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 com.azure azure-cosmos-encryption - 2.2.0-beta.1 + 2.2.0 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 0408940015b0..ef4f8914ae56 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -93,14 +93,14 @@ com.azure:azure-core-test;1.18.0;1.19.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.36;1.0.0-beta.37 com.azure:azure-core-tracing-opentelemetry-samples;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-version-tests;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-cosmos;4.45.1;4.46.0-beta.1 +com.azure:azure-cosmos;4.45.1;4.46.0 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;1.0.0-beta.1;1.0.0-beta.1 -com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.18.2;4.19.0-beta.1 -com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.18.2;4.19.0-beta.1 -com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.18.2;4.19.0-beta.1 -com.azure:azure-cosmos-encryption;2.1.0;2.2.0-beta.1 +com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.18.2;4.19.0 +com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.18.2;4.19.0 +com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.18.2;4.19.0 +com.azure:azure-cosmos-encryption;2.1.0;2.2.0 com.azure:azure-cosmos-test;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-data-appconfiguration;1.4.5;1.5.0-beta.1 diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 06385c576da2..faf8c7848210 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -51,13 +51,13 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 com.azure azure-cosmos-encryption - 2.2.0-beta.1 + 2.2.0 diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml index 5c39173a6327..c2ebba3e6e96 100644 --- a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml @@ -50,7 +50,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 diff --git a/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md b/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md index 4ad087830c4b..4bc80ba6762a 100644 --- a/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md @@ -1,14 +1,8 @@ ## Release History -### 2.2.0-beta.1 (Unreleased) - -#### Features Added - -#### Breaking Changes - -#### Bugs Fixed - +### 2.2.0 (2023-06-09) #### Other Changes +* Updated `azure-cosmos` to version `4.46.0`. ### 2.1.0 (2023-05-12) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-encryption/README.md b/sdk/cosmos/azure-cosmos-encryption/README.md index 0f7daebde633..7ca84ceb5f8e 100644 --- a/sdk/cosmos/azure-cosmos-encryption/README.md +++ b/sdk/cosmos/azure-cosmos-encryption/README.md @@ -12,7 +12,7 @@ The Azure Cosmos Encryption Plugin is used for encrypting data with a user-provi com.azure azure-cosmos-encryption - 2.1.0 + 2.2.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index c131be7bb949..2f321a9df181 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.azure azure-cosmos-encryption - 2.2.0-beta.1 + 2.2.0 Encryption Plugin for Azure Cosmos DB SDK This Package contains Encryption Plugin for Microsoft Azure Cosmos SDK jar @@ -57,7 +57,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md index cf8704bddd6b..ca418ff9ebc8 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md @@ -1,18 +1,14 @@ ## Release History -### 4.19.0-beta.1 (Unreleased) +### 4.19.0 (2023-06-09) #### Features Added * Added support for priority based throttling - See [PR 35238](https://github.com/Azure/azure-sdk-for-java/pull/35238) * Added new configuration parameter `spark.cosmos.write.bulk.targetedPayloadSizeInBytes` to allow increasing the micro batch payload size for better efficiency when documents are often above 110 KB. - See [PR 35379](https://github.com/Azure/azure-sdk-for-java/pull/35379) * -#### Breaking Changes - #### Bugs Fixed * Addressed `NullPointerException` in `CosmosDataItemSource` constructor when Spark runtime initialization hasn't completed yet. - See [PR 35201](https://github.com/Azure/azure-sdk-for-java/pull/35201) -#### Other Changes - ### 4.18.2 (2023-05-16) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md index d072260ea934..c3a5edc361e4 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md @@ -29,6 +29,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-1_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |--------------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml index 8d2ffaee0f5e..dc0c35a52c57 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml @@ -11,7 +11,7 @@ com.azure.cosmos.spark azure-cosmos-spark_3-1_2-12 - 4.19.0-beta.1 + 4.19.0 jar https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12 OLTP Spark 3.1 Connector for Azure Cosmos DB SQL API diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md index 4196b3f96f7c..886602db42a1 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md @@ -1,18 +1,14 @@ ## Release History -### 4.19.0-beta.1 (Unreleased) +### 4.19.0 (2023-06-09) #### Features Added * Added support for priority based throttling - See [PR 35238](https://github.com/Azure/azure-sdk-for-java/pull/35238) * Added new configuration parameter `spark.cosmos.write.bulk.targetedPayloadSizeInBytes` to allow increasing the micro batch payload size for better efficiency when documents are often above 110 KB. - See [PR 35379](https://github.com/Azure/azure-sdk-for-java/pull/35379) -#### Breaking Changes - #### Bugs Fixed * Addressed `NullPointerException` in `CosmosDataItemSource` constructor when Spark runtime initialization hasn't completed yet. - See [PR 35201](https://github.com/Azure/azure-sdk-for-java/pull/35201) -#### Other Changes - ### 4.18.2 (2023-05-16) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md index 28b6463fbf3d..02f9a7397693 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md @@ -28,6 +28,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-2_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml index 63b840531c45..d7c163cb4ab4 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml @@ -11,7 +11,7 @@ com.azure.cosmos.spark azure-cosmos-spark_3-2_2-12 - 4.19.0-beta.1 + 4.19.0 jar https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-cosmos-spark_3-2_2-12 OLTP Spark 3.2 Connector for Azure Cosmos DB SQL API diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md index 52bda88f86ec..f875a544aa7c 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md @@ -1,18 +1,14 @@ ## Release History -### 4.19.0-beta.1 (Unreleased) +### 4.19.0 (2023-06-09) #### Features Added * Added support for priority based throttling - See [PR 35238](https://github.com/Azure/azure-sdk-for-java/pull/35238) * Added new configuration parameter `spark.cosmos.write.bulk.targetedPayloadSizeInBytes` to allow increasing the micro batch payload size for better efficiency when documents are often above 110 KB. - See [PR 35379](https://github.com/Azure/azure-sdk-for-java/pull/35379) -#### Breaking Changes - #### Bugs Fixed * Addressed `NullPointerException` in `CosmosDataItemSource` constructor when Spark runtime initialization hasn't completed yet. - See [PR 35201](https://github.com/Azure/azure-sdk-for-java/pull/35201) -#### Other Changes - ### 4.18.2 (2023-05-16) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md index 5da700eca95b..0f9680696d6d 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md @@ -28,6 +28,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-3_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------|--------------------------| -------------------- | ----------------------- |-------------------------------| +| 4.19.0 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.2 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.1 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.0 | 3.3.0 | 8 | 2.12 | 11.\* | diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml index 2ed2c7069d06..a79c6f8e3850 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml @@ -11,7 +11,7 @@ com.azure.cosmos.spark azure-cosmos-spark_3-3_2-12 - 4.19.0-beta.1 + 4.19.0 jar https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-cosmos-spark_3-3_2-12 OLTP Spark 3.3 Connector for Azure Cosmos DB SQL API diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml index d96a82c63f08..2441832e3629 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml @@ -63,7 +63,7 @@ com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 org.scala-lang.modules diff --git a/sdk/cosmos/azure-cosmos-test/pom.xml b/sdk/cosmos/azure-cosmos-test/pom.xml index 952faac06b14..595220853e33 100644 --- a/sdk/cosmos/azure-cosmos-test/pom.xml +++ b/sdk/cosmos/azure-cosmos-test/pom.xml @@ -54,7 +54,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 diff --git a/sdk/cosmos/azure-cosmos-tests/pom.xml b/sdk/cosmos/azure-cosmos-tests/pom.xml index bf317abc7109..17f7285ecbd2 100644 --- a/sdk/cosmos/azure-cosmos-tests/pom.xml +++ b/sdk/cosmos/azure-cosmos-tests/pom.xml @@ -99,7 +99,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 com.azure diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md index 55ac0deedc2f..519506091950 100644 --- a/sdk/cosmos/azure-cosmos/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos/CHANGELOG.md @@ -1,6 +1,6 @@ ## Release History -### 4.46.0-beta.1 (Unreleased) +### 4.46.0 (2023-06-09) #### Features Added * Added the capability to filter request-level metrics based on diagnostic thresholds. Request-level metrics usually are used to capture metrics per backend endpoint/replica - a high cardinality dimension. Filtering by diagnostic thresholds reduces the overhead - but also means request-level metrics can only be used for debugging purposes - not for monitoring purposes. So, it is important to use the unfiltered operation-level metrics for health monitoring in this case. - See [PR 35114](https://github.com/Azure/azure-sdk-for-java/pull/35114) diff --git a/sdk/cosmos/azure-cosmos/README.md b/sdk/cosmos/azure-cosmos/README.md index ad0dd232edd5..1da790abad1f 100644 --- a/sdk/cosmos/azure-cosmos/README.md +++ b/sdk/cosmos/azure-cosmos/README.md @@ -45,7 +45,7 @@ add the direct dependency to your project as follows. com.azure azure-cosmos - 4.45.1 + 4.46.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index 6f7a0225155f..4327e8ed5207 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.46.0-beta.1 + 4.46.0 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension Reactor support) for Azure Cosmos DB SQL API jar From 12d631ec99565a1d5a7865a28d136a5e60dfcd42 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 08:55:41 -0700 Subject: [PATCH 2/6] Updated spark readme files --- sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md | 6 ++++-- sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md | 6 ++++-- sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md index c3a5edc361e4..ba1c83efffca 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md @@ -74,6 +74,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-2_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | @@ -103,6 +104,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-3_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------|--------------------------| -------------------- | ----------------------- |-------------------------------| +| 4.19.0 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.2 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.1 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.0 | 3.3.0 | 8 | 2.12 | 11.\* | @@ -113,11 +115,11 @@ https://github.com/Azure/azure-sdk-for-java/issues/new ### Download You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 8 from Maven: -`com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.18.2` +`com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.19.0` You can also integrate against Cosmos DB Spark Connector in your SBT project: ```scala -libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-1_2-12" % "4.18.2" +libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-1_2-12" % "4.19.0" ``` Cosmos DB Spark Connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark). diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md index 02f9a7397693..87c25dd7e697 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md @@ -58,6 +58,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-3_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------|--------------------------| -------------------- | ----------------------- |-------------------------------| +| 4.19.0 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.2 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.1 | 3.3.0 | 8 | 2.12 | 11.\* | | 4.18.0 | 3.3.0 | 8 | 2.12 | 11.\* | @@ -69,6 +70,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-1_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |--------------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 8.\*, 9.\* | | 4.18.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 8.\*, 9.\* | @@ -113,11 +115,11 @@ https://github.com/Azure/azure-sdk-for-java/issues/new ### Download You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 10 from Maven: -`com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.18.2` +`com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.19.0` You can also integrate against Cosmos DB Spark Connector in your SBT project: ```scala -libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-2_2-12" % "4.18.2" +libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-2_2-12" % "4.19.0" ``` Cosmos DB Spark Connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark). diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md index 0f9680696d6d..3362c3959b16 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/README.md @@ -40,6 +40,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-2_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |-----------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | @@ -69,6 +70,7 @@ https://github.com/Azure/azure-sdk-for-java/issues/new #### azure-cosmos-spark_3-1_2-12 | Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | |--------------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.19.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | | 4.18.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | @@ -113,11 +115,11 @@ https://github.com/Azure/azure-sdk-for-java/issues/new ### Download You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 11 from Maven: -`com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12:4.18.2` +`com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12:4.19.0` You can also integrate against Cosmos DB Spark Connector in your SBT project: ```scala -libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-3_2-12" % "4.18.2" +libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-3_2-12" % "4.19.0" ``` Cosmos DB Spark Connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark). From 1a92e793793260b1991a13685e29a276f20afa56 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 08:56:50 -0700 Subject: [PATCH 3/6] Updated quick start files --- sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md b/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md index b8546f74485f..c19f6c50f7de 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md @@ -26,13 +26,13 @@ You can use any other Spark 3.1.1 spark offering as well, also you should be abl SLF4J is only needed if you plan to use logging, please also download an SLF4J binding which will link the SLF4J API with the logging implementation of your choice. See the [SLF4J user manual](https://www.slf4j.org/manual.html) for more information. For Spark 3.1: -- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.18.2](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-1_2-12/4.18.2/jar) +- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.19.0](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-1_2-12/4.19.0/jar) For Spark 3.2: -- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.18.2](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-2_2-12/4.18.2/jar) +- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.19.0](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-2_2-12/4.19.0/jar) For Spark 3.3: -- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12:4.18.2](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-3_2-12/4.18.2/jar) +- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12:4.19.0](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-3_2-12/4.19.0/jar) The getting started guide is based on PySpark however you can use the equivalent scala version as well, and you can run the following code snippet in an Azure Databricks PySpark notebook. From 40b797098e592d37bd6200e032e965fcd3e6763e Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 12:05:32 -0700 Subject: [PATCH 4/6] Fixed spring tests for emulator --- .../azure/spring/data/cosmos/common/TestConstants.java | 1 + .../azure/spring/data/cosmos/core/CosmosTemplateIT.java | 3 +++ .../cosmos/core/MultiTenantContainerCosmosFactoryIT.java | 5 +---- .../data/cosmos/core/MultiTenantDBCosmosFactoryIT.java | 5 +---- .../spring/data/cosmos/core/ReactiveCosmosTemplateIT.java | 8 +++----- .../core/ReactiveMultiTenantContainerCosmosFactoryIT.java | 5 +---- .../cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java | 5 +---- .../java/com/azure/spring/data/cosmos/domain/Address.java | 2 +- .../azure/spring/data/cosmos/domain/AuditableEntity.java | 3 ++- .../data/cosmos/domain/AuditableIdGeneratedEntity.java | 3 ++- .../com/azure/spring/data/cosmos/domain/BasicItem.java | 3 ++- .../data/cosmos/domain/ComplexIndexPolicyEntity.java | 3 ++- .../spring/data/cosmos/domain/CompositeIndexEntity.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Contact.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Course.java | 3 ++- .../azure/spring/data/cosmos/domain/CourseWithEtag.java | 3 ++- .../com/azure/spring/data/cosmos/domain/Customer.java | 3 +++ .../com/azure/spring/data/cosmos/domain/GenIdEntity.java | 3 +++ .../spring/data/cosmos/domain/IndexPolicyEntity.java | 3 ++- .../data/cosmos/domain/IndexPolicyOverwriteEntity.java | 3 ++- .../azure/spring/data/cosmos/domain/IntegerIdDomain.java | 3 ++- .../com/azure/spring/data/cosmos/domain/LongIdDomain.java | 3 ++- .../spring/data/cosmos/domain/LongIdDomainPartition.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Memo.java | 3 ++- .../data/cosmos/domain/NestedPartitionKeyEntity.java | 4 +++- .../NestedPartitionKeyEntityWithGeneratedValue.java | 4 +++- .../com/azure/spring/data/cosmos/domain/PageableMemo.java | 3 ++- .../azure/spring/data/cosmos/domain/PageablePerson.java | 3 ++- .../azure/spring/data/cosmos/domain/PartitionPerson.java | 3 ++- .../spring/data/cosmos/domain/PersistableEntity.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Person.java | 3 ++- .../azure/spring/data/cosmos/domain/PersonWithEtag.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Project.java | 3 ++- .../com/azure/spring/data/cosmos/domain/Question.java | 3 ++- .../azure/spring/data/cosmos/domain/ReactiveTeacher.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Role.java | 2 +- .../azure/spring/data/cosmos/domain/SortedProject.java | 3 ++- .../azure/spring/data/cosmos/domain/SpELBeanStudent.java | 3 ++- .../spring/data/cosmos/domain/SpELPropertyStudent.java | 3 ++- .../java/com/azure/spring/data/cosmos/domain/Student.java | 3 +++ .../java/com/azure/spring/data/cosmos/domain/Teacher.java | 3 ++- .../azure/spring/data/cosmos/domain/TimeToLiveSample.java | 2 +- .../com/azure/spring/data/cosmos/domain/UUIDIdDomain.java | 3 ++- .../spring/data/cosmos/domain/UniqueKeyPolicyEntity.java | 3 ++- .../data/cosmos/repository/MultiCosmosTemplateIT.java | 1 + .../repository/integration/PersonCrossPartitionIT.java | 5 +---- .../repository/integration/SpELCosmosAnnotationIT.java | 1 + .../cosmos/repository/integration/UniqueKeyPolicyIT.java | 3 ++- 48 files changed, 92 insertions(+), 60 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java index aeeb86da26b4..20c1c22566b5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/TestConstants.java @@ -25,6 +25,7 @@ public final class TestConstants { public static final List
ADDRESSES = Arrays.asList(ADDRESS_1, ADDRESS_2); public static final int DEFAULT_TIME_TO_LIVE = -1; + public static final String DEFAULT_MINIMUM_RU = "400"; public static final boolean DEFAULT_INDEXING_POLICY_AUTOMATIC = true; public static final IndexingMode DEFAULT_INDEXING_POLICY_MODE = IndexingMode.CONSISTENT; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index b18028740c63..454ad5e34c93 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -42,6 +42,7 @@ import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -967,6 +968,7 @@ public void createWithAutoscale() throws ClassNotFoundException { assertNotNull(throughput); assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT), throughput.getProperties().getAutoscaleMaxThroughput()); + collectionManager.deleteContainer(autoScaleSampleInfo); } @Test @@ -987,6 +989,7 @@ public void createDatabaseWithThroughput() throws ClassNotFoundException { final CosmosAsyncDatabase database = client.getDatabase(configuredThroughputDbName); final ThroughputResponse response = database.readThroughput().block(); assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput()); + deleteDatabaseIfExists(configuredThroughputDbName); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index a301a7d65e97..d1a35d6da28a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -16,10 +16,7 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index dc16252d651a..c63cd97dee8d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -16,10 +16,7 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 1b265059cf1e..ac631689cf61 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -38,11 +38,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.assertj.core.api.Assertions; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -649,6 +645,7 @@ public void createWithAutoscale() { assertNotNull(throughput); assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT), throughput.getProperties().getAutoscaleMaxThroughput()); + cosmosTemplate.deleteContainer(autoScaleSampleInfo.getContainerName()); } @Test @@ -669,6 +666,7 @@ public void createDatabaseWithThroughput() throws ClassNotFoundException { final CosmosAsyncDatabase database = client.getDatabase(configuredThroughputDbName); final ThroughputResponse response = database.readThroughput().block(); assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput()); + deleteDatabaseIfExists(configuredThroughputDbName); } @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index 17b2ce4b97d2..cdeaeef03c42 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -16,10 +16,7 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index a865e65a1a07..960707c66e52 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -16,10 +16,7 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java index a7a91bba1ebf..8d87690c6a5e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Address.java @@ -9,7 +9,7 @@ import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class Address { public static final Address TEST_ADDRESS1_PARTITION1 = new Address( diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java index 4da7049e08b1..57a37039d2a5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableEntity.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -12,7 +13,7 @@ import java.time.OffsetDateTime; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class AuditableEntity { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableIdGeneratedEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableIdGeneratedEntity.java index 788de92f41c3..2be25518ba46 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableIdGeneratedEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/AuditableIdGeneratedEntity.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.GeneratedValue; import org.springframework.data.annotation.CreatedBy; @@ -12,7 +13,7 @@ import java.time.OffsetDateTime; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class AuditableIdGeneratedEntity { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/BasicItem.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/BasicItem.java index b2c4ea4e71bb..af98685eebc6 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/BasicItem.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/BasicItem.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class BasicItem { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ComplexIndexPolicyEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ComplexIndexPolicyEntity.java index fbe3a2c5caed..267d9d6c9f94 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ComplexIndexPolicyEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ComplexIndexPolicyEntity.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.CompositeIndex; import com.azure.spring.data.cosmos.core.mapping.CompositeIndexPath; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import org.springframework.data.annotation.Id; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy( includePaths = {"/field/?"}, excludePaths = {"/*", "/\"_etag\"/?"}, diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CompositeIndexEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CompositeIndexEntity.java index 5a605b3b7fca..9da21cb17c06 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CompositeIndexEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CompositeIndexEntity.java @@ -3,13 +3,14 @@ package com.azure.spring.data.cosmos.domain; import com.azure.cosmos.models.CompositePathSortOrder; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.CompositeIndex; import com.azure.spring.data.cosmos.core.mapping.CompositeIndexPath; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import org.springframework.data.annotation.Id; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy(compositeIndexes = { @CompositeIndex(paths = { @CompositeIndexPath(path = "/fieldOne"), diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java index 5b8bc513dfd3..f07e7b5853fe 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Contact.java @@ -2,12 +2,13 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class Contact { @Id private String logicId; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java index 9bf469da8a11..b6212eebdc05 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Course.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class Course { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java index da992e815c75..42f6fb4f23a0 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/CourseWithEtag.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; @@ -9,7 +10,7 @@ import java.util.Objects; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class CourseWithEtag { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java index a1395e5be571..d377a3de35b2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Customer.java @@ -2,10 +2,13 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; +import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.Id; import java.util.Objects; +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class Customer { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/GenIdEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/GenIdEntity.java index 5fae624e6444..8536d2faebe3 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/GenIdEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/GenIdEntity.java @@ -2,11 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; +import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.GeneratedValue; import org.springframework.data.annotation.Id; import java.util.Objects; +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class GenIdEntity { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyEntity.java index 0035cf2b3343..6bb7e3789c8f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyEntity.java @@ -2,11 +2,12 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import org.springframework.data.annotation.Id; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy public class IndexPolicyEntity { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyOverwriteEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyOverwriteEntity.java index b1ca09c2d58d..781917fa2cb7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyOverwriteEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IndexPolicyOverwriteEntity.java @@ -2,11 +2,12 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import org.springframework.data.annotation.Id; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy( overwritePolicy = true, includePaths = {"/\"_etag\"/?"}, diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java index 1979fab6702e..471d5a22d6c8 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/IntegerIdDomain.java @@ -2,12 +2,13 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class IntegerIdDomain { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java index 8c4021132c48..f63e91c38cb1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomain.java @@ -2,12 +2,13 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class LongIdDomain { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java index 081ebd7c0ed5..2e2d9626a938 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/LongIdDomainPartition.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class LongIdDomainPartition { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java index b46578d3402a..8c39a1589b83 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Memo.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import java.util.Date; @@ -10,7 +11,7 @@ /** * For testing date and enum purpose */ -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class Memo { private String id; private String message; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntity.java index a299209e2d71..98ef33be4be1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntity.java @@ -2,13 +2,15 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.GeneratedValue; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container(containerName = "nested-partition-key", partitionKeyPath = "/nestedEntity/nestedPartitionKey") +@Container(containerName = "nested-partition-key", partitionKeyPath = "/nestedEntity/nestedPartitionKey", + ru = TestConstants.DEFAULT_MINIMUM_RU) public class NestedPartitionKeyEntity { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntityWithGeneratedValue.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntityWithGeneratedValue.java index cd74099241df..5ae4b3471778 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntityWithGeneratedValue.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/NestedPartitionKeyEntityWithGeneratedValue.java @@ -2,13 +2,15 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.GeneratedValue; import org.springframework.data.annotation.Id; import java.util.Objects; -@Container(containerName = "nested-partition-key-with-generated-value", partitionKeyPath = "/nestedEntity/nestedPartitionKey") +@Container(containerName = "nested-partition-key-with-generated-value", partitionKeyPath = "/nestedEntity/nestedPartitionKey", + ru = TestConstants.DEFAULT_MINIMUM_RU) public class NestedPartitionKeyEntityWithGeneratedValue { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java index 5f4d734281ab..5c8d7b80e075 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageableMemo.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import java.util.Date; @@ -10,7 +11,7 @@ /** * For testing date and enum purpose */ -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class PageableMemo { private String id; private String message; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java index 7c7e96313f34..aaf185ef76d9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PageablePerson.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -11,7 +12,7 @@ import java.util.List; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class PageablePerson { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java index 752c4a86e361..c1cb5e255fb8 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PartitionPerson.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import java.util.List; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class PartitionPerson { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersistableEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersistableEntity.java index 707472095158..399a64599aa7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersistableEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersistableEntity.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; @@ -11,7 +12,7 @@ import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class PersistableEntity implements Persistable { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java index 076d678849f3..546fe14deaa5 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Person.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -12,7 +13,7 @@ import java.util.Map; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class Person { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java index a4fcbe0d4b16..bb9a66d9a520 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/PersonWithEtag.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -11,7 +12,7 @@ import java.util.List; import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class PersonWithEtag { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java index 32df15c106fb..1e553dba9c37 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Project.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -9,7 +10,7 @@ import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class Project { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java index eb04df85309d..4ad67942fbd4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Question.java @@ -3,6 +3,7 @@ package com.azure.spring.data.cosmos.domain; import com.azure.cosmos.models.IndexingMode; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -11,7 +12,7 @@ import java.util.Objects; import java.util.UUID; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy(mode = IndexingMode.CONSISTENT) public class Question { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ReactiveTeacher.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ReactiveTeacher.java index 31209f42e5a0..03b5244d63a4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ReactiveTeacher.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/ReactiveTeacher.java @@ -4,6 +4,7 @@ package com.azure.spring.data.cosmos.domain; import com.azure.cosmos.models.IndexingMode; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.fasterxml.jackson.annotation.JsonInclude; @@ -11,7 +12,7 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_NULL) -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy(mode = IndexingMode.CONSISTENT) public class ReactiveTeacher { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java index 78baf9f261ea..a9b56a6119c7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java @@ -25,7 +25,7 @@ TestConstants.EXCLUDED_PATH_2, }) @Container(containerName = TestConstants.ROLE_COLLECTION_NAME, - autoCreateContainer = false) + autoCreateContainer = false, ru = TestConstants.DEFAULT_MINIMUM_RU) public class Role { @Id String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java index 116a8f001959..7f9418fb7379 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SortedProject.java @@ -2,6 +2,7 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; @@ -9,7 +10,7 @@ import java.util.Objects; -@Container() +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class SortedProject { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java index 727d5a307fcf..2574116376c4 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELBeanStudent.java @@ -3,11 +3,12 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import java.util.Objects; -@Container(containerName = "#{@dynamicContainer.getContainerName()}") +@Container(containerName = "#{@dynamicContainer.getContainerName()}", ru = TestConstants.DEFAULT_MINIMUM_RU) public class SpELBeanStudent { private String id; private String firstName; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java index 85c8d8c703e7..fa0c70a72f00 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/SpELPropertyStudent.java @@ -3,11 +3,12 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import java.util.Objects; -@Container(containerName = "${dynamic.collection.name}") +@Container(containerName = "${dynamic.collection.name}", ru = TestConstants.DEFAULT_MINIMUM_RU) public class SpELPropertyStudent { private String id; private String firstName; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java index 3f0ae3dc54ff..1acebc076d22 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Student.java @@ -3,10 +3,13 @@ package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; +import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import java.util.Objects; +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy() public class Student { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Teacher.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Teacher.java index 7acf7225a56e..e9ad11a53281 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Teacher.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Teacher.java @@ -4,6 +4,7 @@ package com.azure.spring.data.cosmos.domain; import com.azure.cosmos.models.IndexingMode; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; import com.fasterxml.jackson.annotation.JsonInclude; @@ -11,7 +12,7 @@ import java.util.Objects; @JsonInclude(JsonInclude.Include.NON_NULL) -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosIndexingPolicy(mode = IndexingMode.CONSISTENT) public class Teacher { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java index 01064077006a..49cf66c5d77c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/TimeToLiveSample.java @@ -5,7 +5,7 @@ import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; -@Container(timeToLive = TestConstants.TIME_TO_LIVE) +@Container(timeToLive = TestConstants.TIME_TO_LIVE, ru = TestConstants.DEFAULT_MINIMUM_RU) public class TimeToLiveSample { private String id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UUIDIdDomain.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UUIDIdDomain.java index f3b9f8141445..cb2e76fb092a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UUIDIdDomain.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UUIDIdDomain.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import org.springframework.data.annotation.Id; import java.util.Objects; import java.util.UUID; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) public class UUIDIdDomain { @Id diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UniqueKeyPolicyEntity.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UniqueKeyPolicyEntity.java index c347750ef260..555a1188eb57 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UniqueKeyPolicyEntity.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/UniqueKeyPolicyEntity.java @@ -2,13 +2,14 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.domain; +import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosUniqueKey; import com.azure.spring.data.cosmos.core.mapping.CosmosUniqueKeyPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; -@Container +@Container(ru = TestConstants.DEFAULT_MINIMUM_RU) @CosmosUniqueKeyPolicy(uniqueKeys = { @CosmosUniqueKey(paths = {"/lastName", "/zipCode"}), @CosmosUniqueKey(paths = {"/city"}) diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java index 87703fac276a..f9e86aa85c8e 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java @@ -12,6 +12,7 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import org.assertj.core.api.Assertions; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java index 472807cc2e02..3cf6a7d673d7 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java @@ -15,10 +15,7 @@ import com.azure.spring.data.cosmos.repository.repository.AuditableRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import org.assertj.core.util.Lists; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java index fc369a7ba29d..346c5344c992 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.AfterClass; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java index 1aeaf5fb52ed..6e1fca24d01d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java @@ -18,6 +18,7 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; import com.azure.spring.data.cosmos.repository.support.SimpleReactiveCosmosRepository; +import org.junit.AfterClass; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -59,7 +60,7 @@ public class UniqueKeyPolicyIT { @Autowired ReactiveCosmosTemplate reactiveTemplate; - CosmosEntityInformation information = + private CosmosEntityInformation information = new CosmosEntityInformation<>(UniqueKeyPolicyEntity.class); @Before From f2beedd9dc6db72ea9299781da70bb19532636e7 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 12:18:12 -0700 Subject: [PATCH 5/6] Fix imports --- .../java/com/azure/spring/data/cosmos/CosmosFactory.java | 3 ++- .../azure/spring/data/cosmos/common/MemoizerUnitTest.java | 7 ++++--- .../azure/spring/data/cosmos/core/CosmosTemplateIT.java | 1 - .../spring/data/cosmos/core/CosmosTemplatePartitionIT.java | 4 ---- .../cosmos/core/MultiTenantContainerCosmosFactoryIT.java | 5 ++++- .../data/cosmos/core/MultiTenantDBCosmosFactoryIT.java | 5 ++++- .../spring/data/cosmos/core/ReactiveCosmosTemplateIT.java | 7 +++++-- .../core/ReactiveMultiTenantContainerCosmosFactoryIT.java | 5 ++++- .../cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java | 5 ++++- .../core/mapping/event/CosmosEventListenerUnitTests.java | 4 ++-- .../java/com/azure/spring/data/cosmos/domain/Role.java | 1 - .../data/cosmos/repository/CosmosAnnotationUnitTest.java | 3 --- .../data/cosmos/repository/MultiCosmosTemplateIT.java | 1 - .../cosmos/repository/integration/ContactRepositoryIT.java | 1 - .../repository/integration/PersonCrossPartitionIT.java | 5 ++++- .../repository/integration/QuestionRepositoryIT.java | 1 - .../repository/integration/SpELCosmosAnnotationIT.java | 1 - .../cosmos/repository/integration/UniqueKeyPolicyIT.java | 1 - 18 files changed, 33 insertions(+), 27 deletions(-) diff --git a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java index ffaa77a8f19f..89f2458de17f 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java +++ b/sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/CosmosFactory.java @@ -6,11 +6,12 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosClientBuilder; import com.azure.spring.data.cosmos.common.PropertyLoader; -import java.lang.reflect.Field; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.Assert; +import java.lang.reflect.Field; + /** * Factory class for CosmosDb to create client */ diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java index 2812fb2ef9c0..88c79e428d33 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/common/MemoizerUnitTest.java @@ -2,15 +2,16 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.common; -import static org.junit.Assert.assertEquals; +import org.junit.Before; +import org.junit.Test; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.IntStream; -import org.junit.Before; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class MemoizerUnitTest { diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java index 454ad5e34c93..1d21efff6891 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java @@ -42,7 +42,6 @@ import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java index bd6d67aac316..ad9cf498a005 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplatePartitionIT.java @@ -4,10 +4,8 @@ package com.azure.spring.data.cosmos.core; import com.azure.cosmos.CosmosAsyncClient; -import com.azure.cosmos.CosmosBridgeInternal; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.models.PartitionKey; -import com.azure.cosmos.models.SqlQuerySpec; import com.azure.spring.data.cosmos.CosmosFactory; import com.azure.spring.data.cosmos.IntegrationTestCollectionManager; import com.azure.spring.data.cosmos.common.PageTestUtils; @@ -16,7 +14,6 @@ import com.azure.spring.data.cosmos.common.TestUtils; import com.azure.spring.data.cosmos.config.CosmosConfig; import com.azure.spring.data.cosmos.core.convert.MappingCosmosConverter; -import com.azure.spring.data.cosmos.core.generator.FindQuerySpecGenerator; import com.azure.spring.data.cosmos.core.mapping.CosmosMappingContext; import com.azure.spring.data.cosmos.core.query.CosmosPageRequest; import com.azure.spring.data.cosmos.core.query.CosmosQuery; @@ -42,7 +39,6 @@ import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.UUID; import static com.azure.spring.data.cosmos.common.TestConstants.ADDRESSES; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java index d1a35d6da28a..a301a7d65e97 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantContainerCosmosFactoryIT.java @@ -16,7 +16,10 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java index c63cd97dee8d..dc16252d651a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/MultiTenantDBCosmosFactoryIT.java @@ -16,7 +16,10 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index ac631689cf61..de082861cec1 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java @@ -38,7 +38,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.assertj.core.api.Assertions; -import org.junit.*; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -67,7 +71,6 @@ import static com.azure.spring.data.cosmos.common.TestConstants.ID_1; import static com.azure.spring.data.cosmos.common.TestConstants.LAST_NAME; import static com.azure.spring.data.cosmos.common.TestConstants.NEW_PASSPORT_IDS_BY_COUNTRY; -import static com.azure.spring.data.cosmos.common.TestConstants.NOT_EXIST_ID; import static com.azure.spring.data.cosmos.common.TestConstants.PASSPORT_IDS_BY_COUNTRY; import static com.azure.spring.data.cosmos.common.TestConstants.PATCH_AGE_1; import static com.azure.spring.data.cosmos.common.TestConstants.PATCH_AGE_INCREMENT; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java index cdeaeef03c42..17b2ce4b97d2 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantContainerCosmosFactoryIT.java @@ -16,7 +16,10 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java index 960707c66e52..a865e65a1a07 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveMultiTenantDBCosmosFactoryIT.java @@ -16,7 +16,10 @@ import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.repository.MultiTenantTestRepositoryConfig; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.domain.EntityScanner; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java index d51d98fcaa30..e604fdddd8a9 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java @@ -2,8 +2,6 @@ // Licensed under the MIT License. package com.azure.spring.data.cosmos.core.mapping.event; -import static org.assertj.core.api.Assertions.*; - import com.azure.spring.data.cosmos.domain.IPerson; import com.azure.spring.data.cosmos.domain.Person; import com.azure.spring.data.cosmos.domain.Student; @@ -11,6 +9,8 @@ import com.fasterxml.jackson.databind.node.NullNode; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class CosmosEventListenerUnitTests { @Test diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java index a9b56a6119c7..d2311224b839 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/domain/Role.java @@ -6,7 +6,6 @@ import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; import com.azure.spring.data.cosmos.core.mapping.CosmosIndexingPolicy; -import com.azure.spring.data.cosmos.core.mapping.CosmosUniqueKeyPolicy; import com.azure.spring.data.cosmos.core.mapping.PartitionKey; import org.springframework.data.annotation.Id; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java index df5818512425..73f2c734de4c 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/CosmosAnnotationUnitTest.java @@ -3,7 +3,6 @@ package com.azure.spring.data.cosmos.repository; import com.azure.cosmos.models.IndexingPolicy; -import com.azure.cosmos.models.UniqueKey; import com.azure.cosmos.models.UniqueKeyPolicy; import com.azure.spring.data.cosmos.common.TestConstants; import com.azure.spring.data.cosmos.core.mapping.Container; @@ -16,8 +15,6 @@ import org.junit.Test; import org.springframework.util.Assert; -import java.util.List; - public class CosmosAnnotationUnitTest { private CosmosEntityInformation personInfo; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java index f9e86aa85c8e..87703fac276a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/MultiCosmosTemplateIT.java @@ -12,7 +12,6 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import org.assertj.core.api.Assertions; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java index 0c235c8d9069..c10af40ed10a 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/ContactRepositoryIT.java @@ -9,7 +9,6 @@ import com.azure.spring.data.cosmos.exception.CosmosAccessException; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.ContactRepository; -import com.fasterxml.jackson.databind.node.ObjectNode; import org.assertj.core.util.Lists; import org.junit.Assert; import org.junit.Before; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java index 3cf6a7d673d7..472807cc2e02 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/PersonCrossPartitionIT.java @@ -15,7 +15,10 @@ import com.azure.spring.data.cosmos.repository.repository.AuditableRepository; import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import org.assertj.core.util.Lists; -import org.junit.*; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java index a5f52f00e597..36c4e6005318 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/QuestionRepositoryIT.java @@ -5,7 +5,6 @@ import com.azure.spring.data.cosmos.IntegrationTestCollectionManager; import com.azure.spring.data.cosmos.common.ResponseDiagnosticsTestUtils; import com.azure.spring.data.cosmos.core.CosmosTemplate; -import com.azure.spring.data.cosmos.core.ResponseDiagnostics; import com.azure.spring.data.cosmos.domain.Question; import com.azure.spring.data.cosmos.repository.TestRepositoryConfig; import com.azure.spring.data.cosmos.repository.repository.QuestionRepository; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java index 346c5344c992..fc369a7ba29d 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/SpELCosmosAnnotationIT.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.AfterClass; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java index 6e1fca24d01d..94cbcf40db62 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java @@ -18,7 +18,6 @@ import com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation; import com.azure.spring.data.cosmos.repository.support.SimpleCosmosRepository; import com.azure.spring.data.cosmos.repository.support.SimpleReactiveCosmosRepository; -import org.junit.AfterClass; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; From acddc0eb9c15df83faebdf13b2a96cf6c8b3e66b Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Fri, 9 Jun 2023 12:19:17 -0700 Subject: [PATCH 6/6] Added a dummy commit to run Java cosmos CI --- .../src/test/java/com/azure/cosmos/CosmosItemTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemTest.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemTest.java index dcf56eb2d203..f6b022e0d82b 100644 --- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemTest.java +++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemTest.java @@ -85,6 +85,7 @@ public void createItem() throws Exception { validateItemResponse(properties, itemResponse); properties = getDocumentDefinition(UUID.randomUUID().toString()); + logger.info("Testing log"); CosmosItemResponse itemResponse1 = container.createItem(properties, new CosmosItemRequestOptions()); validateItemResponse(properties, itemResponse1); }