Feature/spring boot 3 pr35404, 35453 and 35485

eng/pipelines/templates/stages/cosmos-emulator-matrix.json

@@ -28,7 +28,8 @@
         "NEW_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
         "NEW_SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
         "TestFromSource": true,
-        "AdditionalArgs": "-Dspring-e2e"
+        "AdditionalArgs": "-Dspring-e2e",
+        "Language": "Spring"
       },
       "Spring Emulator Only Integration Tests - Java 17": {
           "ProfileFlag": "-Pintegration-test-emulator",
@@ -40,7 +41,8 @@
           "NEW_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
           "NEW_SECONDARY_ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
           "TestFromSource": true,
-          "AdditionalArgs": "-Dspring-e2e"
+          "AdditionalArgs": "-Dspring-e2e",
+          "Language": "Spring"
       },
       "Encryption Emulator Only Integration Tests": {
           "ProfileFlag": "-Pencryption-integration",

eng/pipelines/templates/stages/cosmos-sdk-client.yml

@@ -27,6 +27,12 @@ parameters:
 - name: UseEsrpRelease
   type: boolean
   default: true
+- name: MatrixFilters
+  type: object
+  default: []
+- name: LanguageFilter
+  type: object
+  default: []
 
 variables:
   - template: /eng/pipelines/templates/variables/globals.yml
@@ -55,6 +61,7 @@ stages:
             GenerateVMJobs: true
         MatrixFilters:
           - TestFromSource=^$|false
+          - ${{ parameters.MatrixFilters }}
         MatrixReplace:
           - AZURE_TEST.*=.*/
         BuildParallelization: 1
@@ -72,6 +79,9 @@ stages:
             Path: eng/pipelines/templates/stages/cosmos-emulator-matrix.json
             Selection: all
             GenerateVMJobs: true
+        MatrixFilters:
+          - ${{ parameters.LanguageFilter }}
+          - ${{ parameters.MatrixFilters }}
         AdditionalParameters:
           BuildParallelization: 1
           DisableAzureResourceCreation: true

eng/versioning/external_dependencies.txt

@@ -85,6 +85,7 @@ org.apache.kafka:kafka-clients;3.3.2
 org.apache.logging.log4j:log4j-api;2.19.0
 org.apache.logging.log4j:log4j-core;2.19.0
 org.apache.logging.log4j:log4j-slf4j-impl;2.19.0
+org.apache.logging.log4j:log4j-slf4j2-impl;2.19.0
 org.apache.maven:maven-core;3.5.4
 org.apache.maven.archetype:archetype-packaging;3.2.0
 org.apache.maven.archetype:maven-archetype-plugin;3.2.0

sdk/cosmos/azure-cosmos-benchmark/pom.xml

@@ -145,8 +145,8 @@ Licensed under the MIT License.
 
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.19.0</version> <!-- {x-version-update;org.apache.logging.log4j:log4j-slf4j-impl;external_dependency} -->
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <version>2.19.0</version> <!-- {x-version-update;org.apache.logging.log4j:log4j-slf4j2-impl;external_dependency} -->
     </dependency>
 
     <dependency>
@@ -278,7 +278,7 @@ Licensed under the MIT License.
                 <include>org.apache.commons:commons-lang3:[3.12.0]</include> <!-- {x-include-update;org.apache.commons:commons-lang3;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-api:[2.19.0]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-api;external_dependency} -->
                 <include>org.apache.logging.log4j:log4j-core:[2.19.0]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-core;external_dependency} -->
-                <include>org.apache.logging.log4j:log4j-slf4j-impl:[2.19.0]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-slf4j-impl;external_dependency} -->
+                <include>org.apache.logging.log4j:log4j-slf4j2-impl:[2.19.0]</include> <!-- {x-include-update;org.apache.logging.log4j:log4j-slf4j2-impl;external_dependency} -->
                 <include>org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:[1.1.0]</include> <!-- {x-include-update;cosmos_org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir;external_dependency} -->
               </includes>
             </bannedDependencies>

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<InternalObjectNode> itemResponse1 = container.createItem(properties, new CosmosItemRequestOptions());
         validateItemResponse(properties, itemResponse1);
     }

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
  */

sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java

@@ -22,7 +22,7 @@
 public abstract class AbstractIntegrationTestCollectionManager<T> implements TestRule {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractIntegrationTestCollectionManager.class);
-    private static final Duration LEASE_DURATION = Duration.ofMinutes(5);
+    private static final Duration LEASE_DURATION = Duration.ofSeconds(5 * 60);
     private static final ConcurrentMap<String, DeleteContainerAction> CONTAINER_CLEANUP_REGISTRY = new ConcurrentHashMap<>();
 
     static {

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 {
 

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<Address> 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;
 

sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java

@@ -967,6 +967,7 @@ public void createWithAutoscale() throws ClassNotFoundException {
         assertNotNull(throughput);
         assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT),
             throughput.getProperties().getAutoscaleMaxThroughput());
+        collectionManager.deleteContainer(autoScaleSampleInfo);
     }
 
     @Test
@@ -987,6 +988,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

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;

sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java

@@ -71,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;
@@ -649,6 +648,7 @@ public void createWithAutoscale() {
         assertNotNull(throughput);
         assertEquals(Integer.parseInt(TestConstants.AUTOSCALE_MAX_THROUGHPUT),
             throughput.getProperties().getAutoscaleMaxThroughput());
+        cosmosTemplate.deleteContainer(autoScaleSampleInfo.getContainerName());
     }
 
     @Test
@@ -669,6 +669,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

sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/mapping/event/CosmosEventListenerUnitTests.java

@@ -2,15 +2,15 @@
 // 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;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.NullNode;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class CosmosEventListenerUnitTests {
 
     @Test

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(

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

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

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

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\"/?"},

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"),