Prepare for Spring Cloud Azure 4.13.0 release (#37517)

* update version client

* update version/changelog/readme

* Added overloads to saveAll and deleteAll APIs with both Publisher and Iterable (#37532)

* Updated params of reactive bulk API to Iterable:

* Added additional APIs to match saveAll and deleteAll APIs from spring framework

* Removed unused imports

---------

Co-authored-by: Kushagra Thapar <[email protected]>

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -109,6 +109,16 @@
           "new": "method <S extends T, T> reactor.core.publisher.Flux<S> com.azure.spring.data.cosmos.core.ReactiveCosmosOperations::insertAll(com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation<T, ?>, reactor.core.publisher.Flux<S>)",
           "justification": "Spring interfaces are allowed to add methods."
         },
+        {
+          "code": "java.method.addedToInterface",
+          "new": "method <S extends T, T> reactor.core.publisher.Mono<java.lang.Void> com.azure.spring.data.cosmos.core.ReactiveCosmosOperations::deleteEntities(com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation<T, ?>, java.lang.Iterable<S>)",
+          "justification": "Spring interfaces are allowed to add methods."
+        },
+        {
+          "code": "java.method.addedToInterface",
+          "new": "method <S extends T, T> reactor.core.publisher.Flux<S> com.azure.spring.data.cosmos.core.ReactiveCosmosOperations::insertAll(com.azure.spring.data.cosmos.repository.support.CosmosEntityInformation<T, ?>, java.lang.Iterable<S>)",
+          "justification": "Spring interfaces are allowed to add methods."
+        },
         {
           "regex": true,
           "code": "java\\.annotation\\.(added|attributeValueChanged)",

eng/versioning/version_client.txt

@@ -177,7 +177,7 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template;1.1.1234;1.2.2-beta.1
 com.azure:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-spring-data-cosmos;3.39.0;3.40.0-beta.1
+com.azure:azure-spring-data-cosmos;3.39.0;3.40.0
 com.azure:azure-storage-blob;12.24.1;12.25.0-beta.2
 com.azure:azure-storage-blob-batch;12.20.1;12.21.0-beta.2
 com.azure:azure-storage-blob-changefeed;12.0.0-beta.18;12.0.0-beta.19
@@ -195,58 +195,58 @@ com.azure:azure-xml;1.0.0-beta.2;1.0.0-beta.3
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
 com.azure.spring:azure-monitor-spring-native;1.0.0-beta.1;1.0.0-beta.1
 com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config-web;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management-web;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-dependencies;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-messaging-azure;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-messaging-azure-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-messaging-azure-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-messaging-azure-storage-queue;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-integration-azure-core;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-integration-azure-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-integration-azure-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-integration-azure-storage-queue;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-core;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator-autoconfigure;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-autoconfigure;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-resourcemanager;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-service;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-actuator;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-cosmos;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-cosmos;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventgrid;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-redis;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;4.12.0;4.13.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config-web;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-appconfiguration-config;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-feature-management-web;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-feature-management;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-dependencies;4.12.0;4.13.0
+com.azure.spring:spring-messaging-azure;4.12.0;4.13.0
+com.azure.spring:spring-messaging-azure-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-messaging-azure-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-messaging-azure-storage-queue;4.12.0;4.13.0
+com.azure.spring:spring-integration-azure-core;4.12.0;4.13.0
+com.azure.spring:spring-integration-azure-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-integration-azure-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-integration-azure-storage-queue;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-core;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-actuator-autoconfigure;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-actuator;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-autoconfigure;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-resourcemanager;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-service;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-active-directory;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-actuator;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-appconfiguration;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-cosmos;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-data-cosmos;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-eventgrid;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-redis;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;4.12.0;4.13.0
 com.azure.spring:spring-cloud-azure-starter-monitor;1.0.0-beta.1;1.0.0-beta.2
-com.azure.spring:spring-cloud-azure-starter-servicebus-jms;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-blob;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-file-share;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-queue;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus;4.12.0;4.13.0-beta.1
-com.azure.spring:spring-cloud-azure-trace-sleuth;4.12.0;4.13.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus-jms;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-storage;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-blob;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-file-share;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-queue;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-starter;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;4.12.0;4.13.0
+com.azure.spring:spring-cloud-azure-trace-sleuth;4.12.0;4.13.0
 com.azure.resourcemanager:azure-resourcemanager;2.32.0;2.33.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.32.0;2.33.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appservice;2.32.0;2.33.0-beta.1

sdk/boms/spring-cloud-azure-dependencies/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>spring-cloud-azure-dependencies</artifactId>
-  <version>4.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
+  <version>4.13.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
   <packaging>pom</packaging>
 
   <name>Spring Cloud Azure Dependencies</name>
@@ -51,14 +51,14 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-sdk-bom</artifactId>
-        <version>1.2.17</version>   <!-- NOTE: This should be updated manually. -->
+        <version>1.2.18</version>   <!-- NOTE: This should be updated manually. -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-spring-data-cosmos</artifactId>
-        <version>3.40.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+        <version>3.40.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
       </dependency>
       <dependency>
         <groupId>com.azure.resourcemanager</groupId>

sdk/spring/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Release History
 
-## 4.13.0-beta.1 (Unreleased)
-Upgrade Spring Boot dependencies version to 2.7.17 and Spring Cloud dependencies version to 2021.0.8
+## 4.13.0 (2023-11-07)
+- This release is compatible with Spring Boot 2.5.0-2.5.15, 2.6.0-2.6.15, 2.7.0-2.7.17. (Note: 2.5.x (x>15), 2.6.y (y>15) and 2.7.z (z>17) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2020.0.3-2020.0.6, 2021.0.0-2021.0.8. (Note: 2020.0.x (x>6) and 2021.0.y (y>8) should be supported, but they aren't tested with this release.)
+
+### Spring Cloud Azure Dependencies (BOM)
+
+#### Dependency Updates
+- Upgrade `azure-sdk-bom` to 1.2.18.
 
 ### Spring Cloud Azure Autoconfigure
 This section includes changes in `spring-cloud-azure-autoconfigure` module.
@@ -23,6 +29,11 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
 - Deprecated APIs `ServiceBusProvisioner.provisionQueue`, `ServiceBusProvisioner.provisionTopic`, `ServiceBusProvisioner.provisionSubscription` [#36996](https://github.com/Azure/azure-sdk-for-java/pull/36996).
 - Add new methods to provision queue and topic with entity properties [#36996](https://github.com/Azure/azure-sdk-for-java/pull/36996).
 
+### Azure Spring Data Cosmos
+This section includes changes in `azure-spring-data-cosmos` module.
+Please refer to [azure-spring-data-cosmos/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/azure-spring-data-cosmos/CHANGELOG.md#3400-2023-11-07) for more details.
+
+
 ## 5.6.0 (2023-10-24)
 - This release is compatible with Spring Boot 3.0.0-3.1.3. (Note: 3.1.x (x>3) should be supported, but they aren't tested with this release.)
 - This release is compatible with Spring Cloud 2022.0.0-2022.0.4. (Note: 2022.0.x (x>4) should be supported, but they aren't tested with this release.)

sdk/spring/README.md

@@ -138,7 +138,7 @@ If you’re a Maven user, add our BOM to your pom.xml `<dependencyManagement>` s
         <dependency>
             <groupId>com.azure.spring</groupId>
             <artifactId>spring-cloud-azure-dependencies</artifactId>
-            <version>4.12.0</version>
+            <version>4.13.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

sdk/spring/azure-spring-data-cosmos/CHANGELOG.md

@@ -1,15 +1,19 @@
 ## Release History
 
-### 3.40.0-beta.1 (Unreleased)
+### 3.40.0 (2023-11-07)
 
 #### Features Added
 * Updated Spring and Reactive Spring repository `saveAll` and `deleteAll` APIs to use bulk functionality implementation. NOTE: `azure-spring-data-cosmos` is currently unable to set throughput control limits at the request level, which will need to be achieved by creating multiple clients. - See [PR 36611](https://github.com/Azure/azure-sdk-for-java/pull/36611).
 
-#### Breaking Changes
+#### Other Changes
+* Updated `azure-cosmos` to version `4.52.0`.
+* Updated `Spring Data Commons` to version `2.7.17`.
 
-#### Bugs Fixed
+### 5.6.0 (2023-10-24)
 
 #### Other Changes
+* Updated `azure-cosmos` to version `4.51.0`.
+* Updated `Spring Data Commons` to version `3.1.3`.
 
 ### 3.39.0 (2023-10-23)
 

sdk/spring/azure-spring-data-cosmos/README.md

@@ -100,7 +100,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-spring-data-cosmos</artifactId>
-    <version>3.39.0</version>
+    <version>3.40.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/spring/azure-spring-data-cosmos/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-spring-data-cosmos</artifactId>
-  <version>3.40.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>3.40.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>

sdk/spring/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosOperations.java

@@ -147,6 +147,17 @@ Mono<CosmosContainerProperties> replaceContainerProperties(String containerName,
      */
     <T> Mono<T> insert(String containerName, T objectToSave);
 
+    /**
+     * Insert all items with bulk.
+     *
+     * @param entityInformation must not be {@literal null}
+     * @param entities must not be {@literal null}
+     * @param <T> type class of domain type
+     * @param <S> type class of domain type
+     * @return Flux of result
+     */
+    <S extends T, T> Flux<S> insertAll(CosmosEntityInformation<T, ?> entityInformation, Iterable<S> entities);
+
     /**
      * Insert all items with bulk.
      *
@@ -220,6 +231,17 @@ Mono<CosmosContainerProperties> replaceContainerProperties(String containerName,
      */
     <T> Mono<Void> deleteEntity(String containerName, T entity);
 
+    /**
+     * Delete all items with bulk.
+     *
+     * @param entityInformation must not be {@literal null}
+     * @param entities must not be {@literal null}
+     * @param <T> type class of domain type
+     * @param <S> type class of domain type
+     * @return void Mono
+     */
+    <S extends T, T> Mono<Void> deleteEntities(CosmosEntityInformation<T, ?> entityInformation, Iterable<S> entities);
+
     /**
      * Delete all items with bulk.
      *