diff --git a/eng/pipelines/templates/stages/cosmos-emulator-matrix.json b/eng/pipelines/templates/stages/cosmos-emulator-matrix.json index f31b46187423..252377bbe6dc 100644 --- a/eng/pipelines/templates/stages/cosmos-emulator-matrix.json +++ b/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", diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml index 30300594b865..a99f4b7ec3bd 100644 --- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml +++ b/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 diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 5b8e44064a21..0d639d53307d 100644 --- a/eng/versioning/external_dependencies.txt +++ b/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 diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 7191a139e19c..3567f8311b37 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -145,8 +145,8 @@ Licensed under the MIT License. org.apache.logging.log4j - log4j-slf4j-impl - 2.19.0 + log4j-slf4j2-impl + 2.19.0 @@ -278,7 +278,7 @@ Licensed under the MIT License. org.apache.commons:commons-lang3:[3.12.0] 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.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:[1.1.0] 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); } diff --git a/sdk/cosmos/ci.spring.yml b/sdk/cosmos/ci.spring.yml deleted file mode 100644 index 83340b58988a..000000000000 --- a/sdk/cosmos/ci.spring.yml +++ /dev/null @@ -1,78 +0,0 @@ -# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. -trigger: - branches: - include: - - main - - hotfix/* - - release/* - paths: - include: - - sdk/cosmos/ci.spring.yml - - sdk/cosmos/azure-cosmos/ - - sdk/cosmos/azure-cosmos-benchmark/ - - sdk/cosmos/azure-cosmos-dotnet-benchmark/ - - sdk/cosmos/azure-cosmos-encryption/ - - sdk/cosmos/azure-cosmos-examples/ - - sdk/cosmos/azure-cosmos-spark_3_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-3_2-12/ - - sdk/cosmos/azure-cosmos-test/ - - sdk/cosmos/azure-cosmos-tests/ - - sdk/cosmos/faq/ - exclude: - - sdk/cosmos/pom.xml - - sdk/cosmos/azure-cosmos/pom.xml - - sdk/cosmos/azure-cosmos-tests/pom.xml - - sdk/cosmos/azure-cosmos-benchmark/pom.xml - - sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml - - sdk/cosmos/azure-cosmos-encryption/pom.xml - - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml - - -pr: - branches: - include: - - main - - feature/* - - hotfix/* - - release/* - paths: - include: - - sdk/cosmos/ci.spring.yml - - sdk/cosmos/azure-cosmos/ - - sdk/cosmos/azure-cosmos-benchmark/ - - sdk/cosmos/azure-cosmos-dotnet-benchmark/ - - sdk/cosmos/azure-cosmos-encryption/ - - sdk/cosmos/azure-cosmos-examples/ - - sdk/cosmos/azure-cosmos-test/ - - sdk/cosmos/azure-cosmos-tests/ - - sdk/cosmos/azure-cosmos-spark_3_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-1_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-2_2-12/ - - sdk/cosmos/azure-cosmos-spark_3-3_2-12/ - - - sdk/cosmos/faq/ - exclude: - - sdk/cosmos/pom.xml - - sdk/cosmos/azure-cosmos/pom.xml - - sdk/cosmos/azure-cosmos-benchmark/pom.xml - - sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml - - sdk/cosmos/azure-cosmos-encryption/pom.xml - - sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml - - sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml - - - sdk/cosmos/azure-cosmos-test/pom.xml - - sdk/cosmos/azure-cosmos-tests/pom.xml - -extends: - template: /eng/pipelines/templates/stages/archetype-sdk-client.yml - parameters: - ServiceDirectory: spring - Artifacts: - - name: azure-spring-data-cosmos - groupId: com.azure - safeName: azurespringdatacosmos - releaseInBatch: false 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/AbstractIntegrationTestCollectionManager.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java index 347a26a3adc4..b856a0f85888 100644 --- a/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java +++ b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/AbstractIntegrationTestCollectionManager.java @@ -22,7 +22,7 @@ public abstract class AbstractIntegrationTestCollectionManager 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 CONTAINER_CLEANUP_REGISTRY = new ConcurrentHashMap<>(); static { 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/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..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 @@ -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 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/ReactiveCosmosTemplateIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java index 1b265059cf1e..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 @@ -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 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/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..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; @@ -25,7 +24,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/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/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/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/UniqueKeyPolicyIT.java b/sdk/spring/azure-spring-data-cosmos/src/test/java/com/azure/spring/data/cosmos/repository/integration/UniqueKeyPolicyIT.java index 1aeaf5fb52ed..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 @@ -59,7 +59,7 @@ public class UniqueKeyPolicyIT { @Autowired ReactiveCosmosTemplate reactiveTemplate; - CosmosEntityInformation information = + private CosmosEntityInformation information = new CosmosEntityInformation<>(UniqueKeyPolicyEntity.class); @Before diff --git a/sdk/spring/ci.cosmos.yml b/sdk/spring/ci.cosmos.yml new file mode 100644 index 000000000000..b3e28cf0bd73 --- /dev/null +++ b/sdk/spring/ci.cosmos.yml @@ -0,0 +1,44 @@ +# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. + +trigger: + branches: + include: + - main + - feature/* + - hotfix/* + - release/* + paths: + include: + - sdk/spring/ci.cosmos.yml + - sdk/spring/azure-spring-data-cosmos/ +pr: + branches: + include: + - main + - feature/* + - hotfix/* + - release/* + paths: + include: + - sdk/spring/ci.cosmos.yml + - sdk/spring/azure-spring-data-cosmos/ + +extends: + # NOTE: This is for running spring data cosmos emulator tests + template: /eng/pipelines/templates/stages/cosmos-sdk-client.yml #NOTE: Non-standard template. + parameters: + ServiceDirectory: spring + EnableBatchRelease: true + SDKType: client + Artifacts: + - name: azure-spring-data-cosmos + groupId: com.azure + safeName: azurespringdatacosmos + releaseInBatch: true + MatrixFilters: + - JavaTestVersion=^(?!1.8|1.11).* + LanguageFilter: + - Language=.*(Spring).* + AdditionalModules: + - name: azure-spring-data-cosmos + groupId: com.azure \ No newline at end of file diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml index 66cf4e9837af..3ebb231d220b 100644 --- a/sdk/spring/tests.yml +++ b/sdk/spring/tests.yml @@ -68,16 +68,23 @@ stages: SubscriptionConfiguration: $(sub-config-gov-test-resources) China: SubscriptionConfiguration: $(sub-config-cn-test-resources) + MatrixConfigs: + - Name: Cosmos_live_test_integration + Path: sdk/spring/cosmos-integration-matrix.json + Selection: all + GenerateVMJobs: true TestResourceDirectories: - spring/spring-cloud-azure-integration-tests/test-resources/cosmos-spring Artifacts: - name: azure-spring-data-cosmos groupId: com.azure safeName: azurespringdatacosmos - TimeoutInMinutes: 60 + TimeoutInMinutes: 90 + PreSteps: + - template: /eng/pipelines/templates/steps/install-reporting-tools.yml ServiceDirectory: spring - TestName: Spring_Data_Cosmos_IT - TestGoals: 'verify' - TestOptions: '-P integration-test-azure' + TestName: 'Spring_Data_Cosmos_Integration' + TestGoals: 'clean verify' + TestOptions: '$(ProfileFlag)' MatrixFilters: - JavaTestVersion=^(?!1.8|1.11).*