Prepare for Spring Cloud Azure 5.13.0 release (#40471)

* update version client

* update v/c/r

* Endpoint Fix (#40452)

* Fixing issues for API review. (#40489) (#40495)

---------

Co-authored-by: Matthew Metcalf <[email protected]>
Co-authored-by: Trevor Anderson <[email protected]>

eng/versioning/version_client.txt

@@ -210,56 +210,56 @@ com.azure:identity-test-webapp;0.0.1-SNAPSHOT;0.0.1-SNAPSHOT
 com.azure:azure-ai-vision-face;1.0.0-beta.1;1.0.0-beta.2
 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;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management-web;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-dependencies;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-messaging-azure;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-messaging-azure-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-messaging-azure-servicebus;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-messaging-azure-storage-queue;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-integration-azure-core;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-integration-azure-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-integration-azure-servicebus;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-integration-azure-storage-queue;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-core;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-autoconfigure;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-resourcemanager;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-service;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-actuator;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-cosmos;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventgrid;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-blob;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-queue;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-starter;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.12.0;5.13.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.12.0;5.13.0-beta.1
-com.azure:azure-spring-data-cosmos;5.12.0;5.13.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-appconfiguration-config;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-feature-management-web;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-feature-management;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-dependencies;5.12.0;5.13.0
+com.azure.spring:spring-messaging-azure;5.12.0;5.13.0
+com.azure.spring:spring-messaging-azure-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-messaging-azure-servicebus;5.12.0;5.13.0
+com.azure.spring:spring-messaging-azure-storage-queue;5.12.0;5.13.0
+com.azure.spring:spring-integration-azure-core;5.12.0;5.13.0
+com.azure.spring:spring-integration-azure-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-integration-azure-servicebus;5.12.0;5.13.0
+com.azure.spring:spring-integration-azure-storage-queue;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-core;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-actuator;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-autoconfigure;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-resourcemanager;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-service;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-active-directory;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-actuator;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-cosmos;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-eventgrid;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-servicebus;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-storage;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-blob;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-storage-queue;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-starter;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.12.0;5.13.0
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.12.0;5.13.0
+com.azure:azure-spring-data-cosmos;5.12.0;5.13.0
 com.azure.resourcemanager:azure-resourcemanager;2.39.0;2.40.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.39.0;2.40.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appservice;2.39.0;2.40.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>5.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
+  <version>5.13.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
   <packaging>pom</packaging>
 
   <name>Spring Cloud Azure Dependencies</name>
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-sdk-bom</artifactId>
-        <version>1.2.23</version>   <!-- NOTE: This should be updated manually. -->
+        <version>1.2.24</version>   <!-- NOTE: This should be updated manually. -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sdk/spring/CHANGELOG.md

@@ -1,16 +1,46 @@
 # Release History
-## 5.13.0-beta.1 (Unreleased)
-Upgrade Spring Boot dependencies version to 3.3.0 and Spring Cloud dependencies version to 2023.0.1
+## 5.13.0 (2024-06-06)
+- This release is compatible with Spring Boot 3.0.0-3.0.13, 3.1.0-3.1.8, 3.2.0-3.2.6. (Note: 3.0.x (x>13), 3.1.y (y>8) and 3.2.z (z>5) should be supported, but they aren't tested with this release.)
+- This release is compatible with Spring Cloud 2022.0.0-2022.0.5, 2023.0.0-2023.0.1. (Note: 2022.0.x (x>5) and 2023.0.y (y>1) should be supported, but they aren't tested with this release.)
+- Now, Spring Boot 3.3 is compatible with this release.
+
+### Spring Cloud Azure Dependencies (BOM)
+
+#### Features Added
+- Added the following artifacts into current bom file: `spring-cloud-azure-starter-data-redis-lettuce` [#40287](https://github.com/Azure/azure-sdk-for-java/pull/40287).
+
+#### Dependency Updates
+- Upgrade `azure-sdk-bom` to 1.2.24.
 
 ### Spring Cloud Azure Autoconfigure
 This section includes changes in `spring-cloud-azure-autoconfigure` module.
 
-### Bugs Fixed
+#### Features Added
+- Add `AzureLettucePasswordlessAutoConfiguration` to support redis passwordless [#40287](https://github.com/Azure/azure-sdk-for-java/pull/40287).
+
+#### Bugs Fixed
 - Fixed `IllegalArgumentException: Subscription cannot be null` error when only configured one subscription name of `AzureServiceBusConsumerClient` or `AzureServiceBusProcessorClient` [#40264](https://github.com/Azure/azure-sdk-for-java/pull/40264).
 
-### Other Changes
+#### Other Changes
 - Disable compatibility verifier by default [#40407](https://github.com/Azure/azure-sdk-for-java/pull/40407).
 
+### Spring Cloud Azure Appconfiguration Config
+This section includes changes in `spring-cloud-azure-starter-appconfiguration-config`, `spring-cloud-azure-appconfiguration-config*`, and `spring-cloud-azure-feature-management*` modules.
+
+#### Bugs Fixed
+- Fixing App Configuration expose the value of key in error message when parsing invalid JSON [#40132](https://github.com/Azure/azure-sdk-for-java/pull/40132).
+- Remove final from App Configuration refresh endpoints, which caused errors when creating Spring AOP Aspects [#40452](https://github.com/Azure/azure-sdk-for-java/pull/40452).
+
+### Spring Cloud Azure Starter Data Redis with Lettuce
+This section includes changes in `spring-cloud-azure-starter-data-redis-lettuce` module.
+
+#### Features Added
+- Provide `spring-cloud-azure-starter-data-redis-lettuce` to support redis passwordless [#40287](https://github.com/Azure/azure-sdk-for-java/pull/40287).
+
+### 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#5130-2024-06-06) for more details.
+
 ## 5.12.0 (2024-05-09)
 - This release is compatible with Spring Boot 3.0.0-3.0.13, 3.1.0-3.1.8, 3.2.0-3.2.5. (Note: 3.0.x (x>13), 3.1.y (y>8) and 3.2.z (z>5) should be supported, but they aren't tested with this release.)
 - This release is compatible with Spring Cloud 2022.0.0-2022.0.5, 2023.0.0-2023.0.1. (Note: 2022.0.x (x>5) and 2023.0.y (y>1) should be supported, but they aren't tested with this release.)

sdk/spring/README.md

@@ -139,7 +139,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>5.12.0</version>
+            <version>5.13.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

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

@@ -1,18 +1,14 @@
 ## Release History
 
-### 5.13.0-beta.1 (Unreleased)
+### 5.13.0 (2024-06-06)
 
 #### Features Added
 * Added support for `@Transient` annotation - see [PR 40401](https://github.com/Azure/azure-sdk-for-java/pull/40401).
 
-#### Breaking Changes
-
 #### Bugs Fixed
 * Fixing bug with annotated queries that have no where clause but do have a sort - See [PR 40165](https://github.com/Azure/azure-sdk-for-java/pull/40165).
 * Fixing bug with Spring JPA keywords that don't lead to criteria creation - See [PR 40204](https://github.com/Azure/azure-sdk-for-java/pull/40204).
 
-#### Other Changes
-
 ### 5.12.0 (2024-05-09)
 
 #### Features Added

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>5.12.0</version>
+    <version>5.13.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>5.13.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>5.13.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/CosmosTemplate.java

@@ -227,7 +227,7 @@ public <T> T insert(String containerName, T objectToSave, PartitionKey partition
         JsonNode originalItem;
         if (!transientFields.isEmpty()) {
             originalItem = mappingCosmosConverter.writeJsonNode(objectToSave, transientFields);
-            transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(objectToSave, transientFields);
+            transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(objectToSave, transientFields);
         } else {
             originalItem = mappingCosmosConverter.writeJsonNode(objectToSave);
         }
@@ -253,7 +253,7 @@ public <T> T insert(String containerName, T objectToSave, PartitionKey partition
             .block();
 
         assert response != null;
-        return toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(response.getItem(), transientFieldValuesMap));
+        return toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(response.getItem(), transientFieldValuesMap));
     }
 
     /**
@@ -279,7 +279,7 @@ public <S extends T, T> Iterable<S> insertAll(CosmosEntityInformation<T, ?> info
             JsonNode originalItem;
             if (!transientFields.isEmpty()) {
                 originalItem = mappingCosmosConverter.writeJsonNode(entity, transientFields);
-                Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(entity, transientFields);
+                Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(entity, transientFields);
                 mapOfTransientFieldValuesMaps.put(originalItem.get("id").asText(), transientFieldValuesMap);
             } else {
                 originalItem = mappingCosmosConverter.writeJsonNode(entity);
@@ -311,7 +311,7 @@ public <S extends T, T> Iterable<S> insertAll(CosmosEntityInformation<T, ?> info
                 if (responseItem != null) {
                     if (!mapOfTransientFieldValuesMaps.isEmpty()) {
                         Map<Field, Object> transientFieldValuesMap = mapOfTransientFieldValuesMaps.get(responseItem.get("id").asText());
-                        return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(responseItem, transientFieldValuesMap)));
+                        return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(responseItem, transientFieldValuesMap)));
                     } else {
                         return Flux.just(toDomainObject(domainType, responseItem));
                     }
@@ -515,7 +515,7 @@ public <T> T upsertAndReturnEntity(String containerName, T object) {
         JsonNode originalItem;
         if (!transientFields.isEmpty()) {
             originalItem = mappingCosmosConverter.writeJsonNode(object, transientFields);
-            transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(object, transientFields);
+            transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(object, transientFields);
         } else {
             originalItem = mappingCosmosConverter.writeJsonNode(object);
         }
@@ -542,7 +542,7 @@ public <T> T upsertAndReturnEntity(String containerName, T object) {
             .block();
 
         assert cosmosItemResponse != null;
-        return toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(cosmosItemResponse.getItem(), transientFieldValuesMap));
+        return toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(cosmosItemResponse.getItem(), transientFieldValuesMap));
     }
 
     /**