Updated azure-cosmos and azure-spring-data-cosmos release versions (Azure#27005)

kushagraThapar · web-flow · commit ddb17934df51 · 2022-02-10T21:43:23.000-08:00
* Updated azure-cosmos and azure-spring-data-cosmos release versions

* Fixed changelog

* Fixed flaky test of DocumentCrudTest

* Code review comments

* Updated changelog to reflect correct release date
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -178,7 +178,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -479,7 +479,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.18.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.18.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -78,7 +78,7 @@ com.azure:azure-core-serializer-json-gson;1.1.12;1.2.0-beta.1
 com.azure:azure-core-serializer-json-jackson;1.2.13;1.3.0-beta.1
 com.azure:azure-core-test;1.7.8;1.8.0-beta.1
 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.20;1.0.0-beta.21
-com.azure:azure-cosmos;4.25.0;4.26.0-beta.2
+com.azure:azure-cosmos;4.25.0;4.26.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
@@ -126,7 +126,7 @@ com.azure:azure-security-keyvault-keys;4.3.6;4.4.0-beta.7
 com.azure:azure-security-keyvault-secrets;4.3.6;4.4.0-beta.5
 com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.16
-com.azure:azure-spring-data-cosmos;3.17.0;3.18.0-beta.1
+com.azure:azure-spring-data-cosmos;3.17.0;3.18.0
 com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-storage-blob;12.14.3;12.15.0-beta.4
 com.azure:azure-storage-blob-batch;12.11.3;12.12.0-beta.4
diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
@@ -51,7 +51,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>
diff --git 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.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml
@@ -56,7 +56,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>
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
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
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
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>org.scala-lang.modules</groupId>
diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md
@@ -1,6 +1,15 @@
 ## Release History
 
-### 4.26.0-beta.2 (Unreleased)
+### 4.26.0 (2022-02-11)
+#### Features Added
+* Added support to resume a "multi order by query" from a continuation token - See [PR 26267](https://github.com/Azure/azure-sdk-for-java/pull/26267)
+* Added `RNTBD - open connections` information in `ClientTelemetry`.
+* Added Beta API to set custom `Reactor` scheduler to be used by the `ChangeFeedProcessor` implementation - See [PR 26750](https://github.com/Azure/azure-sdk-for-java/pull/26750)
+* Added support for correlating queries executed via the Cosmos Spark connector with service-telemetry based on the `correlationActivityId` - See [PR 26908](https://github.com/Azure/azure-sdk-for-java/pull/26908)
+
+#### Key Bug Fixes
+* Fixed an issue in `ChangeFeedProcessor` related to `leases` that were found expired - See [PR 26750](https://github.com/Azure/azure-sdk-for-java/pull/26750)
+* Fixed an issue with `QueryPlan` caching double initialization - See [PR 26825](https://github.com/Azure/azure-sdk-for-java/pull/26825)
 
 ### 4.26.0-beta.1 (2022-01-25)
 
diff --git 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.
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.25.0</version>
+  <version>4.26.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml
@@ -13,7 +13,7 @@ Licensed under the MIT License.
 
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+  <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
   <name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</name>
   <description>This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension Reactor support) for Azure Cosmos DB SQL API</description>
   <packaging>jar</packaging>
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemTest.java
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.UUID;
 
+import static org.apache.commons.io.FileUtils.ONE_MB;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class CosmosItemTest extends TestSuiteBase {
@@ -39,7 +40,7 @@ public class CosmosItemTest extends TestSuiteBase {
     private CosmosClient client;
     private CosmosContainer container;
 
-    @Factory(dataProvider = "clientBuilders")
+    @Factory(dataProvider = "clientBuildersWithDirectSession")
     public CosmosItemTest(CosmosClientBuilder clientBuilder) {
         super(clientBuilder);
     }
@@ -89,6 +90,54 @@ public void createItem_alreadyExists() throws Exception {
         }
     }
 
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void createLargeItem() throws Exception {
+        InternalObjectNode docDefinition = getDocumentDefinition(UUID.randomUUID().toString());
+
+        //Keep size as ~ 1.5MB to account for size of other props
+        int size = (int) (ONE_MB * 1.5);
+        BridgeInternal.setProperty(docDefinition, "largeString", StringUtils.repeat("x", size));
+
+        CosmosItemResponse<InternalObjectNode> itemResponse = container.createItem(docDefinition, new CosmosItemRequestOptions());
+
+        validateItemResponse(docDefinition, itemResponse);
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void createItemWithVeryLargePartitionKey() throws Exception {
+        InternalObjectNode docDefinition = getDocumentDefinition(UUID.randomUUID().toString());
+        StringBuilder sb = new StringBuilder();
+        for(int i = 0; i < 100; i++) {
+            sb.append(i).append("x");
+        }
+        BridgeInternal.setProperty(docDefinition, "mypk", sb.toString());
+
+        CosmosItemResponse<InternalObjectNode> itemResponse = container.createItem(docDefinition, new CosmosItemRequestOptions());
+
+        validateItemResponse(docDefinition, itemResponse);
+    }
+
+    @Test(groups = { "simple" }, timeOut = TIMEOUT)
+    public void readItemWithVeryLargePartitionKey() throws Exception {
+        InternalObjectNode docDefinition = getDocumentDefinition(UUID.randomUUID().toString());
+        StringBuilder sb = new StringBuilder();
+        for(int i = 0; i < 100; i++) {
+            sb.append(i).append("x");
+        }
+        BridgeInternal.setProperty(docDefinition, "mypk", sb.toString());
+
+        CosmosItemResponse<InternalObjectNode> itemResponse = container.createItem(docDefinition);
+
+        waitIfNeededForReplicasToCatchUp(getClientBuilder());
+
+        CosmosItemRequestOptions options = new CosmosItemRequestOptions();
+        CosmosItemResponse<InternalObjectNode> readResponse = container.readItem(docDefinition.getId(),
+            new PartitionKey(sb.toString()), options,
+            InternalObjectNode.class);
+
+        validateItemResponse(docDefinition, readResponse);
+    }
+
     @Test(groups = { "simple" }, timeOut = TIMEOUT)
     public void readItem() throws Exception {
         InternalObjectNode properties = getDocumentDefinition(UUID.randomUUID().toString());
diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java
@@ -20,7 +20,6 @@
 import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.util.CosmosPagedFlux;
-import org.apache.commons.lang3.StringUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
@@ -35,7 +34,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 
-import static org.apache.commons.io.FileUtils.ONE_MB;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DocumentCrudTest extends TestSuiteBase {
@@ -75,70 +73,6 @@ public void createDocument(String documentId) throws InterruptedException {
         this.validateItemSuccess(createObservable, validator);
     }
 
-    @Test(groups = { "emulator" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
-    public void createLargeDocument(String documentId) throws InterruptedException {
-        InternalObjectNode docDefinition = getDocumentDefinition(documentId);
-
-        //Keep size as ~ 1.5MB to account for size of other props
-        int size = (int) (ONE_MB * 1.5);
-        BridgeInternal.setProperty(docDefinition, "largeString", StringUtils.repeat("x", size));
-
-        Mono<CosmosItemResponse<InternalObjectNode>> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions());
-
-        CosmosItemResponseValidator validator =
-            new CosmosItemResponseValidator.Builder<CosmosItemResponse<InternalObjectNode>>()
-                .withId(docDefinition.getId())
-                .build();
-
-        this.validateItemSuccess(createObservable, validator);
-    }
-
-    @Test(groups = { "emulator" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
-    public void createDocumentWithVeryLargePartitionKey(String documentId) throws InterruptedException {
-        InternalObjectNode docDefinition = getDocumentDefinition(documentId);
-        StringBuilder sb = new StringBuilder();
-        for(int i = 0; i < 100; i++) {
-            sb.append(i).append("x");
-        }
-        BridgeInternal.setProperty(docDefinition, "mypk", sb.toString());
-
-        Mono<CosmosItemResponse<InternalObjectNode>> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions());
-
-        CosmosItemResponseValidator validator =
-            new CosmosItemResponseValidator.Builder<CosmosItemResponse<InternalObjectNode>>()
-                .withId(docDefinition.getId())
-                .withProperty("mypk", sb.toString())
-                .build();
-
-        this.validateItemSuccess(createObservable, validator);
-    }
-
-    @Test(groups = { "emulator" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
-    public void readDocumentWithVeryLargePartitionKey(String documentId) throws InterruptedException {
-        InternalObjectNode docDefinition = getDocumentDefinition(documentId);
-        StringBuilder sb = new StringBuilder();
-        for(int i = 0; i < 100; i++) {
-            sb.append(i).append("x");
-        }
-        BridgeInternal.setProperty(docDefinition, "mypk", sb.toString());
-
-        createDocument(container, docDefinition);
-
-        waitIfNeededForReplicasToCatchUp(getClientBuilder());
-
-        CosmosItemRequestOptions options = new CosmosItemRequestOptions();
-        Mono<CosmosItemResponse<InternalObjectNode>> readObservable = container.readItem(docDefinition.getId(),
-                                                                          new PartitionKey(sb.toString()), options,
-                                                                                                InternalObjectNode.class);
-
-        CosmosItemResponseValidator validator =
-            new CosmosItemResponseValidator.Builder<CosmosItemResponse<InternalObjectNode>>()
-                .withId(docDefinition.getId())
-                .withProperty("mypk", sb.toString())
-                .build();
-        this.validateItemSuccess(readObservable, validator);
-    }
-
     @Test(groups = { "emulator" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider")
     public void createDocument_AlreadyExists(String documentId) throws InterruptedException {
         InternalObjectNode docDefinition = getDocumentDefinition(documentId);
diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.18.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.18.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
     <!-- Test -->
     <dependency>
diff --git a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md
@@ -1,14 +1,8 @@
 ## Release History
 
-### 3.18.0-beta.1 (Unreleased)
-
+### 3.18.0 (2022-02-11)
 #### Features Added
-
-#### Breaking Changes
-
-#### Bugs Fixed
-
-#### Other Changes
+* Updated `azure-cosmos` to version `4.26.0`.
 
 ### 3.17.0 (2022-01-14)
 #### Features Added
diff --git a/sdk/cosmos/azure-spring-data-cosmos/README.md b/sdk/cosmos/azure-spring-data-cosmos/README.md
@@ -68,7 +68,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-spring-data-cosmos</artifactId>
-    <version>3.17.0</version>
+    <version>3.18.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-spring-data-cosmos</artifactId>
-  <version>3.18.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>3.18.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-cosmos</artifactId>
-          <version>4.26.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+          <version>4.26.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
         </dependency>
       </dependencies>
 
