diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml index 5fe3655c633a..9b675c5f16f9 100755 --- a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml +++ b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml @@ -805,7 +805,7 @@ - + @@ -884,40 +884,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -937,7 +903,7 @@ Issue: https://github.com/Azure/azure-sdk-for-java/issues/9054 --> - + @@ -1188,7 +1154,7 @@ - + @@ -1588,13 +1554,6 @@ - - - - - - - diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java index 9c9a117bffd7..83814981e75c 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java +++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java @@ -13,7 +13,7 @@ import com.azure.cosmos.DirectConnectionConfig; import com.azure.cosmos.GatewayConnectionConfig; import com.azure.cosmos.implementation.HttpConstants; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.PartitionKey; import com.azure.cosmos.models.ThroughputProperties; import com.codahale.metrics.ConsoleReporter; @@ -331,7 +331,7 @@ private void performWorkload(BaseSubscriber baseSubscriber, long i String partitionKeyValue = doc.getId(); result = client.getDatabase(configuration.getDatabaseId()).getContainer(configuration.getCollectionId()).readItem(doc.getId(), new PartitionKey(partitionKeyValue), - PojoizedJson.class).map(CosmosAsyncItemResponse::getItem); + PojoizedJson.class).map(CosmosItemResponse::getItem); concurrencyControlSemaphore.acquire(); AsyncReadBenchmark.LatencySubscriber latencySubscriber = new AsyncReadBenchmark.LatencySubscriber<>(baseSubscriber); latencySubscriber.context = latency.time(); diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java index 8bffc6d95632..d7538934bdd4 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java +++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java @@ -3,7 +3,7 @@ package com.azure.cosmos.benchmark; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.PartitionKey; import com.codahale.metrics.Timer; import org.reactivestreams.Subscription; @@ -56,7 +56,7 @@ protected void performWorkload(BaseSubscriber baseSubscriber, long String partitionKeyValue = doc.getId(); Mono result = cosmosAsyncContainer.readItem(doc.getId(), new PartitionKey(partitionKeyValue), - PojoizedJson.class).map(CosmosAsyncItemResponse::getItem); + PojoizedJson.class).map(CosmosItemResponse::getItem); concurrencyControlSemaphore.acquire(); diff --git a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java index 41087c69aa1c..d16f405d7baa 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java +++ b/sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncWriteBenchmark.java @@ -3,7 +3,7 @@ package com.azure.cosmos.benchmark; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosItemRequestOptions; import com.azure.cosmos.models.PartitionKey; import com.codahale.metrics.Timer; @@ -15,7 +15,7 @@ import java.util.UUID; -class AsyncWriteBenchmark extends AsyncBenchmark { +class AsyncWriteBenchmark extends AsyncBenchmark { private final String uuid; private final String dataFieldValue; @@ -23,9 +23,9 @@ class AsyncWriteBenchmark extends AsyncBenchmark { class LatencySubscriber extends BaseSubscriber { Timer.Context context; - BaseSubscriber baseSubscriber; + BaseSubscriber baseSubscriber; - LatencySubscriber(BaseSubscriber baseSubscriber) { + LatencySubscriber(BaseSubscriber baseSubscriber) { this.baseSubscriber = baseSubscriber; } @@ -59,9 +59,9 @@ protected void hookOnError(Throwable throwable) { } @Override - protected void performWorkload(BaseSubscriber baseSubscriber, long i) throws InterruptedException { + protected void performWorkload(BaseSubscriber baseSubscriber, long i) throws InterruptedException { String partitionKey = uuid + i; - Mono> obs; + Mono> obs; if (configuration.isDisablePassingPartitionKeyAsOptionOnWrite()) { // require parsing partition key from the doc obs = cosmosAsyncContainer.createItem(generateDocument(partitionKey, dataFieldValue)); @@ -77,7 +77,7 @@ protected void performWorkload(BaseSubscriber baseSubsc if (configuration.getOperationType() == Configuration.Operation.WriteThroughput) { obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber); } else { - LatencySubscriber latencySubscriber = new LatencySubscriber<>(baseSubscriber); + LatencySubscriber latencySubscriber = new LatencySubscriber<>(baseSubscriber); latencySubscriber.context = latency.time(); obs.subscribeOn(Schedulers.parallel()).subscribe(latencySubscriber); } diff --git a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java index 58db3abe2866..763e6e2da393 100644 --- a/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java +++ b/sdk/cosmos/azure-cosmos-examples/src/main/java/com/azure/cosmos/examples/BasicDemo.java @@ -5,7 +5,7 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; import com.azure.cosmos.CosmosAsyncDatabase; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosException; import com.azure.cosmos.models.CosmosContainerProperties; @@ -48,9 +48,9 @@ private void start() { //CREATE an Item async - Mono> itemResponseMono = container.createItem(testObject); + Mono> itemResponseMono = container.createItem(testObject); //CREATE another Item async - Mono> itemResponseMono1 = container.createItem(testObject2); + Mono> itemResponseMono1 = container.createItem(testObject2); //Wait for completion try { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java index 421eaba5bebf..e272ff33edf4 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java @@ -27,7 +27,6 @@ import com.azure.cosmos.implementation.directconnectivity.Uri; import com.azure.cosmos.implementation.query.metrics.ClientSideMetrics; import com.azure.cosmos.implementation.routing.PartitionKeyInternal; -import com.azure.cosmos.models.CosmosAsyncItemResponse; import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosStoredProcedureProperties; import com.azure.cosmos.models.FeedResponse; @@ -432,11 +431,6 @@ public static PartitionKeyInternal getPartitionKeyInternal(PartitionKey partitio return ModelBridgeInternal.getPartitionKeyInternal(partitionKey); } - @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosItemProperties getProperties(CosmosAsyncItemResponse cosmosItemResponse) { - return ModelBridgeInternal.getCosmosItemProperties(cosmosItemResponse); - } - @Warning(value = INTERNAL_USE_ONLY_WARNING) public static CosmosItemProperties getProperties(CosmosItemResponse cosmosItemResponse) { return ModelBridgeInternal.getCosmosItemProperties(cosmosItemResponse); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java index b71e0a3ec322..d7b8843f5502 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java @@ -12,7 +12,7 @@ import com.azure.cosmos.implementation.Utils; import com.azure.cosmos.implementation.query.QueryInfo; import com.azure.cosmos.models.CosmosContainerResponse; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosConflictProperties; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; @@ -180,7 +180,7 @@ public Mono replace( * @return an {@link Mono} containing the single resource response with the * created Cosmos item or an error. */ - public Mono> createItem(T item) { + public Mono> createItem(T item) { return createItem(item, new CosmosItemRequestOptions()); } @@ -197,7 +197,7 @@ public Mono> createItem(T item) { * @param options the request options. * @return an {@link Mono} containing the single resource response with the created Cosmos item or an error. */ - public Mono> createItem( + public Mono> createItem( T item, PartitionKey partitionKey, CosmosItemRequestOptions options) { @@ -217,7 +217,7 @@ public Mono> createItem( * @param options the item request options. * @return an {@link Mono} containing the single resource response with the created Cosmos item or an error. */ - public Mono> createItem(T item, CosmosItemRequestOptions options) { + public Mono> createItem(T item, CosmosItemRequestOptions options) { if (options == null) { options = new CosmosItemRequestOptions(); } @@ -244,7 +244,7 @@ public Mono> createItem(T item, CosmosItemRequest * @param item the item represented as a POJO or Item object to upsert. * @return an {@link Mono} containing the single resource response with the upserted item or an error. */ - public Mono> upsertItem(T item) { + public Mono> upsertItem(T item) { return upsertItem(item, new CosmosItemRequestOptions()); } @@ -260,7 +260,7 @@ public Mono> upsertItem(T item) { * @param options the request options. * @return an {@link Mono} containing the single resource response with the upserted item or an error. */ - public Mono> upsertItem(T item, CosmosItemRequestOptions options) { + public Mono> upsertItem(T item, CosmosItemRequestOptions options) { if (options == null) { options = new CosmosItemRequestOptions(); } @@ -429,7 +429,7 @@ private T transform(Object object, Class classType) { * @param itemType the item type. * @return an {@link Mono} containing the Cosmos item response with the read item or an error. */ - public Mono> readItem(String itemId, PartitionKey partitionKey, Class itemType) { + public Mono> readItem(String itemId, PartitionKey partitionKey, Class itemType) { return readItem(itemId, partitionKey, ModelBridgeInternal.createCosmosItemRequestOptions(partitionKey), itemType); } @@ -446,7 +446,7 @@ public Mono> readItem(String itemId, PartitionKey * @param itemType the item type. * @return an {@link Mono} containing the Cosmos item response with the read item or an error. */ - public Mono> readItem( + public Mono> readItem( String itemId, PartitionKey partitionKey, CosmosItemRequestOptions options, Class itemType) { if (options == null) { @@ -472,7 +472,7 @@ public Mono> readItem( * @param partitionKey the partition key. * @return an {@link Mono} containing the Cosmos item resource response with the replaced item or an error. */ - public Mono> replaceItem(T item, String itemId, PartitionKey partitionKey) { + public Mono> replaceItem(T item, String itemId, PartitionKey partitionKey) { return replaceItem(item, itemId, partitionKey, new CosmosItemRequestOptions()); } @@ -489,7 +489,7 @@ public Mono> replaceItem(T item, String itemId, P * @param options the request comosItemRequestOptions. * @return an {@link Mono} containing the Cosmos item resource response with the replaced item or an error. */ - public Mono> replaceItem( + public Mono> replaceItem( T item, String itemId, PartitionKey partitionKey, CosmosItemRequestOptions options) { Document doc = CosmosItemProperties.fromObject(item); @@ -516,7 +516,7 @@ public Mono> replaceItem( * @param partitionKey the partition key. * @return an {@link Mono} containing the Cosmos item resource response. */ - public Mono> deleteItem(String itemId, PartitionKey partitionKey) { + public Mono> deleteItem(String itemId, PartitionKey partitionKey) { return deleteItem(itemId, partitionKey, new CosmosItemRequestOptions()); } @@ -531,7 +531,7 @@ public Mono> deleteItem(String itemId, Partition * @param options the request options. * @return an {@link Mono} containing the Cosmos item resource response. */ - public Mono> deleteItem( + public Mono> deleteItem( String itemId, PartitionKey partitionKey, CosmosItemRequestOptions options) { if (options == null) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java index 322bd8f1abe2..58ed37381ae1 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java @@ -37,7 +37,7 @@ public final class CosmosClient implements Closeable { * @return the {@link CosmosDatabaseResponse} with the created database. */ CosmosDatabaseResponse createDatabaseIfNotExists(CosmosDatabaseProperties databaseProperties) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabaseIfNotExists(databaseProperties)); + return blockDatabaseResponse(asyncClientWrapper.createDatabaseIfNotExists(databaseProperties)); } /** @@ -51,7 +51,7 @@ CosmosDatabaseResponse createDatabaseIfNotExists(CosmosDatabaseProperties databa * @return the {@link CosmosDatabaseResponse} with the created database. */ public CosmosDatabaseResponse createDatabaseIfNotExists(String id, ThroughputProperties throughputProperties) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabaseIfNotExists(id, throughputProperties)); + return blockDatabaseResponse(asyncClientWrapper.createDatabaseIfNotExists(id, throughputProperties)); } /** @@ -61,7 +61,7 @@ public CosmosDatabaseResponse createDatabaseIfNotExists(String id, ThroughputPro * @return the {@link CosmosDatabaseResponse} with the created database. */ public CosmosDatabaseResponse createDatabaseIfNotExists(String id) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabaseIfNotExists(id)); + return blockDatabaseResponse(asyncClientWrapper.createDatabaseIfNotExists(id)); } /** @@ -73,7 +73,7 @@ public CosmosDatabaseResponse createDatabaseIfNotExists(String id) { */ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databaseProperties, CosmosDatabaseRequestOptions options) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(databaseProperties, options)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(databaseProperties, options)); } /** @@ -83,7 +83,7 @@ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databasePr * @return the {@link CosmosDatabaseResponse} with the created database. */ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databaseProperties) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(databaseProperties)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(databaseProperties)); } /** @@ -93,7 +93,7 @@ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databasePr * @return the {@link CosmosDatabaseResponse} with the created database. */ public CosmosDatabaseResponse createDatabase(String id) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(id)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(id)); } @@ -108,7 +108,7 @@ public CosmosDatabaseResponse createDatabase(String id) { public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databaseProperties, ThroughputProperties throughputProperties, CosmosDatabaseRequestOptions options) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(databaseProperties, throughputProperties, options)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(databaseProperties, throughputProperties, options)); } /** @@ -120,7 +120,7 @@ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databasePr */ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databaseProperties, ThroughputProperties throughputProperties) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(databaseProperties, throughputProperties)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(databaseProperties, throughputProperties)); } /** @@ -131,10 +131,10 @@ public CosmosDatabaseResponse createDatabase(CosmosDatabaseProperties databasePr * @return the {@link CosmosDatabaseResponse} with the created database. */ public CosmosDatabaseResponse createDatabase(String id, ThroughputProperties throughputProperties) { - return mapDatabaseResponseAndBlock(asyncClientWrapper.createDatabase(id, throughputProperties)); + return blockDatabaseResponse(asyncClientWrapper.createDatabase(id, throughputProperties)); } - CosmosDatabaseResponse mapDatabaseResponseAndBlock(Mono databaseMono) { + CosmosDatabaseResponse blockDatabaseResponse(Mono databaseMono) { try { return databaseMono.block(); } catch (Exception ex) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java index c9e25ff71a16..657adbd44bcf 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosContainer.java @@ -3,14 +3,12 @@ package com.azure.cosmos; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; import com.azure.cosmos.models.CosmosContainerResponse; import com.azure.cosmos.models.CosmosItemRequestOptions; -import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.FeedOptions; -import com.azure.cosmos.models.ModelBridgeInternal; import com.azure.cosmos.models.PartitionKey; import com.azure.cosmos.models.SqlQuerySpec; import com.azure.cosmos.models.ThroughputProperties; @@ -60,7 +58,7 @@ public String getId() { * @return the Cosmos container response with the read container. */ public CosmosContainerResponse read() { - return database.mapContainerResponseAndBlock(this.asyncContainer.read()); + return database.blockContainerResponse(this.asyncContainer.read()); } /** @@ -70,7 +68,7 @@ public CosmosContainerResponse read() { * @return the Cosmos container response. */ public CosmosContainerResponse read(CosmosContainerRequestOptions options) { - return database.mapContainerResponseAndBlock(this.asyncContainer.read(options)); + return database.blockContainerResponse(this.asyncContainer.read(options)); } /** @@ -80,7 +78,7 @@ public CosmosContainerResponse read(CosmosContainerRequestOptions options) { * @return the cosmos container response. */ public CosmosContainerResponse delete(CosmosContainerRequestOptions options) { - return database.mapContainerResponseAndBlock(this.asyncContainer.delete(options)); + return database.blockContainerResponse(this.asyncContainer.delete(options)); } /** @@ -89,7 +87,7 @@ public CosmosContainerResponse delete(CosmosContainerRequestOptions options) { * @return the cosmos container response. */ public CosmosContainerResponse delete() { - return database.mapContainerResponseAndBlock(this.asyncContainer.delete()); + return database.blockContainerResponse(this.asyncContainer.delete()); } /** @@ -99,7 +97,7 @@ public CosmosContainerResponse delete() { * @return the cosmos container response. */ public CosmosContainerResponse replace(CosmosContainerProperties containerProperties) { - return database.mapContainerResponseAndBlock(this.asyncContainer.replace(containerProperties)); + return database.blockContainerResponse(this.asyncContainer.replace(containerProperties)); } /** @@ -111,7 +109,7 @@ public CosmosContainerResponse replace(CosmosContainerProperties containerProper */ public CosmosContainerResponse replace(CosmosContainerProperties containerProperties, CosmosContainerRequestOptions options) { - return database.mapContainerResponseAndBlock(this.asyncContainer.replace(containerProperties, options)); + return database.blockContainerResponse(this.asyncContainer.replace(containerProperties, options)); } /** @@ -140,10 +138,10 @@ public ThroughputResponse readThroughput() { * * @param the type parameter * @param item the item - * @return the Cosmos sync item response + * @return the Cosmos item response */ public CosmosItemResponse createItem(T item) { - return this.mapItemResponseAndBlock(this.asyncContainer.createItem(item)); + return this.blockItemResponse(this.asyncContainer.createItem(item)); } /** @@ -154,12 +152,12 @@ public CosmosItemResponse createItem(T item) { * @param item the item. * @param partitionKey the partition key. * @param options the options. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse createItem(T item, PartitionKey partitionKey, CosmosItemRequestOptions options) { - return this.mapItemResponseAndBlock(this.asyncContainer.createItem(item, partitionKey, options)); + return this.blockItemResponse(this.asyncContainer.createItem(item, partitionKey, options)); } /** @@ -175,7 +173,7 @@ public CosmosItemResponse createItem(T item, */ public CosmosItemResponse createItem(T item, CosmosItemRequestOptions options) { - return this.mapItemResponseAndBlock(this.asyncContainer.createItem(item, options)); + return this.blockItemResponse(this.asyncContainer.createItem(item, options)); } /** @@ -183,10 +181,10 @@ public CosmosItemResponse createItem(T item, CosmosItemRequestOptions opt * * @param the type parameter. * @param item the item. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse upsertItem(T item) { - return this.mapItemResponseAndBlock(this.asyncContainer.upsertItem(item)); + return this.blockItemResponse(this.asyncContainer.upsertItem(item)); } /** @@ -195,23 +193,21 @@ public CosmosItemResponse upsertItem(T item) { * @param the type parameter. * @param item the item. * @param options the options. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse upsertItem(T item, CosmosItemRequestOptions options) { - return this.mapItemResponseAndBlock(this.asyncContainer.upsertItem(item, options)); + return this.blockItemResponse(this.asyncContainer.upsertItem(item, options)); } /** - * Maps item response and block cosmos sync item response. + * Block cosmos item response. * * @param itemMono the item mono. - * @return the cosmos sync item response. + * @return the cosmos item response. */ - CosmosItemResponse mapItemResponseAndBlock(Mono> itemMono) { + CosmosItemResponse blockItemResponse(Mono> itemMono) { try { - return itemMono - .map(this::convertResponse) - .block(); + return itemMono.block(); } catch (Exception ex) { final Throwable throwable = Exceptions.unwrap(ex); if (throwable instanceof CosmosException) { @@ -222,11 +218,9 @@ CosmosItemResponse mapItemResponseAndBlock(Mono mapDeleteItemResponseAndBlock(Mono> deleteItemMono) { + private CosmosItemResponse blockDeleteItemResponse(Mono> deleteItemMono) { try { - return deleteItemMono - .map(this::convertResponse) - .block(); + return deleteItemMono.block(); } catch (Exception ex) { final Throwable throwable = Exceptions.unwrap(ex); if (throwable instanceof CosmosException) { @@ -282,10 +276,10 @@ public CosmosPagedIterable queryItems(SqlQuerySpec querySpec, FeedOptions * @param itemId the item id. * @param partitionKey the partition key. * @param itemType the class type of item. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse readItem(String itemId, PartitionKey partitionKey, Class itemType) { - return this.mapItemResponseAndBlock(asyncContainer.readItem(itemId, + return this.blockItemResponse(asyncContainer.readItem(itemId, partitionKey, new CosmosItemRequestOptions(), itemType)); @@ -299,12 +293,12 @@ public CosmosItemResponse readItem(String itemId, PartitionKey partitionK * @param partitionKey the partition key. * @param options the options. * @param itemType the class type of item. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse readItem( String itemId, PartitionKey partitionKey, CosmosItemRequestOptions options, Class itemType) { - return this.mapItemResponseAndBlock(asyncContainer.readItem(itemId, partitionKey, options, itemType)); + return this.blockItemResponse(asyncContainer.readItem(itemId, partitionKey, options, itemType)); } /** @@ -315,13 +309,13 @@ public CosmosItemResponse readItem( * @param itemId the item id. * @param partitionKey the partition key. * @param options the options. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse replaceItem(T item, - String itemId, - PartitionKey partitionKey, - CosmosItemRequestOptions options) { - return this.mapItemResponseAndBlock(asyncContainer.replaceItem(item, itemId, partitionKey, options)); + String itemId, + PartitionKey partitionKey, + CosmosItemRequestOptions options) { + return this.blockItemResponse(asyncContainer.replaceItem(item, itemId, partitionKey, options)); } /** @@ -330,11 +324,11 @@ public CosmosItemResponse replaceItem(T item, * @param itemId the item id. * @param partitionKey the partition key. * @param options the options. - * @return the Cosmos sync item response. + * @return the Cosmos item response. */ public CosmosItemResponse deleteItem(String itemId, PartitionKey partitionKey, - CosmosItemRequestOptions options) { - return this.mapDeleteItemResponseAndBlock(asyncContainer.deleteItem(itemId, partitionKey, options)); + CosmosItemRequestOptions options) { + return this.blockDeleteItemResponse(asyncContainer.deleteItem(itemId, partitionKey, options)); } /** @@ -351,16 +345,6 @@ public CosmosScripts getScripts() { // TODO: should make partitionkey public in CosmosAsyncItem and fix the below call - /** - * Convert a {@link CosmosAsyncItemResponse} to a Cosmos sync item response. - * - * @param response the Cosmos item response. - * @return the Cosmos sync item response. - */ - private CosmosItemResponse convertResponse(CosmosAsyncItemResponse response) { - return ModelBridgeInternal.createCosmosItemResponse(response); - } - private CosmosPagedIterable getCosmosPagedIterable(CosmosPagedFlux cosmosPagedFlux) { return UtilBridgeInternal.createCosmosPagedIterable(cosmosPagedFlux); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java index 27765ffa00cf..08457cf2759f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java @@ -58,7 +58,7 @@ public String getId() { * @return the {@link CosmosDatabaseResponse}. */ public CosmosDatabaseResponse read() { - return client.mapDatabaseResponseAndBlock((databaseWrapper.read())); + return client.blockDatabaseResponse((databaseWrapper.read())); } /** @@ -68,7 +68,7 @@ public CosmosDatabaseResponse read() { * @return the {@link CosmosDatabaseResponse} */ public CosmosDatabaseResponse read(CosmosDatabaseRequestOptions options) { - return client.mapDatabaseResponseAndBlock(databaseWrapper.read(options)); + return client.blockDatabaseResponse(databaseWrapper.read(options)); } /** @@ -77,7 +77,7 @@ public CosmosDatabaseResponse read(CosmosDatabaseRequestOptions options) { * @return the {@link CosmosDatabaseResponse}. */ public CosmosDatabaseResponse delete() { - return client.mapDatabaseResponseAndBlock(databaseWrapper.delete()); + return client.blockDatabaseResponse(databaseWrapper.delete()); } /** @@ -87,7 +87,7 @@ public CosmosDatabaseResponse delete() { * @return the {@link CosmosDatabaseResponse}. */ public CosmosDatabaseResponse delete(CosmosDatabaseRequestOptions options) { - return client.mapDatabaseResponseAndBlock(databaseWrapper.delete(options)); + return client.blockDatabaseResponse(databaseWrapper.delete(options)); } /* Cosmos container operations */ @@ -99,7 +99,7 @@ public CosmosDatabaseResponse delete(CosmosDatabaseRequestOptions options) { * @return the {@link CosmosContainerResponse} with the created container. */ public CosmosContainerResponse createContainer(CosmosContainerProperties containerProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties)); + return this.blockContainerResponse(databaseWrapper.createContainer(containerProperties)); } /** @@ -112,7 +112,7 @@ public CosmosContainerResponse createContainer(CosmosContainerProperties contain public CosmosContainerResponse createContainer( CosmosContainerProperties containerProperties, ThroughputProperties throughputProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties, throughputProperties)); + return this.blockContainerResponse(databaseWrapper.createContainer(containerProperties, throughputProperties)); } /** @@ -125,7 +125,7 @@ public CosmosContainerResponse createContainer( public CosmosContainerResponse createContainer( CosmosContainerProperties containerProperties, CosmosContainerRequestOptions options) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties, options)); + return this.blockContainerResponse(databaseWrapper.createContainer(containerProperties, options)); } /** @@ -140,7 +140,7 @@ CosmosContainerResponse createContainer( CosmosContainerProperties containerProperties, int throughput, CosmosContainerRequestOptions options) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties, + return this.blockContainerResponse(databaseWrapper.createContainer(containerProperties, throughput, options)); } @@ -157,7 +157,7 @@ public CosmosContainerResponse createContainer( CosmosContainerProperties containerProperties, ThroughputProperties throughputProperties, CosmosContainerRequestOptions options) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(containerProperties, + return this.blockContainerResponse(databaseWrapper.createContainer(containerProperties, throughputProperties, options)); } @@ -170,7 +170,7 @@ public CosmosContainerResponse createContainer( * @return the cosmos container response. */ public CosmosContainerResponse createContainer(String id, String partitionKeyPath) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(id, partitionKeyPath)); + return this.blockContainerResponse(databaseWrapper.createContainer(id, partitionKeyPath)); } /** @@ -182,7 +182,7 @@ public CosmosContainerResponse createContainer(String id, String partitionKeyPat * @return the cosmos container response. */ public CosmosContainerResponse createContainer(String id, String partitionKeyPath, ThroughputProperties throughputProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainer(id, partitionKeyPath, throughputProperties)); + return this.blockContainerResponse(databaseWrapper.createContainer(id, partitionKeyPath, throughputProperties)); } /** @@ -192,7 +192,7 @@ public CosmosContainerResponse createContainer(String id, String partitionKeyPat * @return the cosmos container response. */ public CosmosContainerResponse createContainerIfNotExists(CosmosContainerProperties containerProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(containerProperties)); + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(containerProperties)); } /** @@ -205,7 +205,7 @@ public CosmosContainerResponse createContainerIfNotExists(CosmosContainerPropert CosmosContainerResponse createContainerIfNotExists( CosmosContainerProperties containerProperties, int throughput) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(containerProperties, + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(containerProperties, throughput)); } @@ -222,7 +222,7 @@ CosmosContainerResponse createContainerIfNotExists( public CosmosContainerResponse createContainerIfNotExists( CosmosContainerProperties containerProperties, ThroughputProperties throughputProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(containerProperties, + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(containerProperties, throughputProperties)); } @@ -236,7 +236,7 @@ public CosmosContainerResponse createContainerIfNotExists( public CosmosContainerResponse createContainerIfNotExists( String id, String partitionKeyPath) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(id, partitionKeyPath)); + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(id, partitionKeyPath)); } /** @@ -253,7 +253,7 @@ public CosmosContainerResponse createContainerIfNotExists( CosmosContainerResponse createContainerIfNotExists( String id, String partitionKeyPath, int throughput) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(id, + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(id, partitionKeyPath, throughput)); } @@ -272,18 +272,18 @@ CosmosContainerResponse createContainerIfNotExists( public CosmosContainerResponse createContainerIfNotExists( String id, String partitionKeyPath, ThroughputProperties throughputProperties) { - return this.mapContainerResponseAndBlock(databaseWrapper.createContainerIfNotExists(id, + return this.blockContainerResponse(databaseWrapper.createContainerIfNotExists(id, partitionKeyPath, throughputProperties)); } /** - * Map container response and block cosmos container response. + * Block cosmos container response. * * @param containerMono the container mono. * @return the cosmos container response. */ - CosmosContainerResponse mapContainerResponseAndBlock(Mono containerMono) { + CosmosContainerResponse blockContainerResponse(Mono containerMono) { try { return containerMono.block(); } catch (Exception ex) { @@ -380,20 +380,20 @@ public CosmosContainer getContainer(String id) { * * * @param userProperties the settings. - * @return the cosmos sync user response. + * @return the cosmos user response. */ public CosmosUserResponse createUser(CosmosUserProperties userProperties) { - return mapUserResponseAndBlock(databaseWrapper.createUser(userProperties)); + return blockUserResponse(databaseWrapper.createUser(userProperties)); } /** * Upserts a Cosmos user. * * @param userProperties the settings. - * @return the cosmos sync user response. + * @return the cosmos user response. */ public CosmosUserResponse upsertUser(CosmosUserProperties userProperties) { - return mapUserResponseAndBlock(databaseWrapper.upsertUser(userProperties)); + return blockUserResponse(databaseWrapper.upsertUser(userProperties)); } /** @@ -469,7 +469,7 @@ public CosmosUser getUser(String id) { return new CosmosUser(databaseWrapper.getUser(id), this, id); } - CosmosUserResponse mapUserResponseAndBlock(Mono containerMono) { + CosmosUserResponse blockUserResponse(Mono containerMono) { try { return containerMono.block(); } catch (Exception ex) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java index 0db50a44f904..ff6d87c13678 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosScripts.java @@ -41,10 +41,10 @@ public class CosmosScripts { * Create stored procedure * * @param properties the properties - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse createStoredProcedure(CosmosStoredProcedureProperties properties) { - return mapStoredProcedureResponseAndBlock( + return blockStoredProcedureResponse( asyncScripts.createStoredProcedure(properties, new CosmosStoredProcedureRequestOptions()) ); } @@ -54,12 +54,12 @@ public CosmosStoredProcedureResponse createStoredProcedure(CosmosStoredProcedure * * @param properties the properties * @param options the options - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse createStoredProcedure( CosmosStoredProcedureProperties properties, CosmosStoredProcedureRequestOptions options) { - return mapStoredProcedureResponseAndBlock(asyncScripts.createStoredProcedure(properties, + return blockStoredProcedureResponse(asyncScripts.createStoredProcedure(properties, options)); } @@ -131,7 +131,7 @@ public CosmosStoredProcedure getStoredProcedure(String id) { * @return the cosmos user defined function response */ public CosmosUserDefinedFunctionResponse createUserDefinedFunction(CosmosUserDefinedFunctionProperties properties) { - return mapUDFResponseAndBlock(asyncScripts.createUserDefinedFunction(properties)); + return blockUDFResponse(asyncScripts.createUserDefinedFunction(properties)); } /** @@ -198,10 +198,10 @@ public CosmosUserDefinedFunction getUserDefinedFunction(String id) { * Create trigger * * @param properties the properties - * @return the cosmos sync trigger response + * @return the cosmos trigger response */ public CosmosTriggerResponse createTrigger(CosmosTriggerProperties properties) { - return mapTriggerResponseAndBlock(asyncScripts.createTrigger(properties)); + return blockTriggerResponse(asyncScripts.createTrigger(properties)); } /** @@ -260,12 +260,12 @@ public CosmosTrigger getTrigger(String id) { } /** - * Map stored procedure response and block cosmos sync stored procedure response. + * Block cosmos stored procedure response. * * @param storedProcedureResponseMono the stored procedure response mono - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ - CosmosStoredProcedureResponse mapStoredProcedureResponseAndBlock( + CosmosStoredProcedureResponse blockStoredProcedureResponse( Mono storedProcedureResponseMono) { try { return storedProcedureResponseMono.block(); @@ -280,12 +280,12 @@ CosmosStoredProcedureResponse mapStoredProcedureResponseAndBlock( } /** - * Map udf response and block cosmos user defined function response. + * Block cosmos user defined function response. * * @param responseMono the response mono * @return the cosmos user defined function response */ - CosmosUserDefinedFunctionResponse mapUDFResponseAndBlock( + CosmosUserDefinedFunctionResponse blockUDFResponse( Mono responseMono) { try { return responseMono.block(); @@ -302,12 +302,12 @@ CosmosUserDefinedFunctionResponse mapUDFResponseAndBlock( //Trigger /** - * Map trigger response and block cosmos sync trigger response. + * Block cosmos trigger response. * * @param responseMono the response mono - * @return the cosmos sync trigger response + * @return the cosmos trigger response */ - CosmosTriggerResponse mapTriggerResponseAndBlock(Mono responseMono) { + CosmosTriggerResponse blockTriggerResponse(Mono responseMono) { try { return responseMono.block(); } catch (Exception ex) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java index 7dda62fe049d..feff167877d7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosStoredProcedure.java @@ -43,43 +43,43 @@ public String getId() { /** * Read cosmos sync stored procedure. * - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse read() { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.read()); + .blockStoredProcedureResponse(storedProcedure.read()); } /** * Read cosmos sync stored procedure. * * @param options the options - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse read(CosmosStoredProcedureRequestOptions options) { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.read(options)); + .blockStoredProcedureResponse(storedProcedure.read(options)); } /** * Delete cosmos stored procedure. * - * @return the cosmos sync response + * @return the cosmos response */ public CosmosStoredProcedureResponse delete() { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.delete()); + .blockStoredProcedureResponse(storedProcedure.delete()); } /** * Delete cosmos stored procedure. * * @param options the options - * @return the cosmos sync response + * @return the cosmos response */ CosmosStoredProcedureResponse delete(CosmosStoredProcedureRequestOptions options) { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.delete(options)); + .blockStoredProcedureResponse(storedProcedure.delete(options)); } /** @@ -87,24 +87,24 @@ CosmosStoredProcedureResponse delete(CosmosStoredProcedureRequestOptions options * * @param procedureParams the procedure params * @param options the options - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse execute( List procedureParams, CosmosStoredProcedureRequestOptions options) { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.execute(procedureParams, options)); + .blockStoredProcedureResponse(storedProcedure.execute(procedureParams, options)); } /** * Replace cosmos sync stored procedure. * * @param storedProcedureSettings the stored procedure settings - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse replace(CosmosStoredProcedureProperties storedProcedureSettings) { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.replace(storedProcedureSettings)); + .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureSettings)); } /** @@ -112,13 +112,13 @@ public CosmosStoredProcedureResponse replace(CosmosStoredProcedureProperties sto * * @param storedProcedureSettings the stored procedure settings * @param options the options - * @return the cosmos sync stored procedure response + * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse replace( CosmosStoredProcedureProperties storedProcedureSettings, CosmosStoredProcedureRequestOptions options) { return container.getScripts() - .mapStoredProcedureResponseAndBlock(storedProcedure.replace(storedProcedureSettings, options)); + .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureSettings, options)); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java index 538644554059..20463309b308 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosTrigger.java @@ -39,29 +39,29 @@ public String getId() { /** * Read cosmos trigger. * - * @return the cosmos sync trigger response + * @return the cosmos trigger response */ public CosmosTriggerResponse read() { - return container.getScripts().mapTriggerResponseAndBlock(trigger.read()); + return container.getScripts().blockTriggerResponse(trigger.read()); } /** * Replace cosmos trigger. * * @param triggerSettings the trigger settings - * @return the cosmos sync trigger response + * @return the cosmos trigger response */ public CosmosTriggerResponse replace(CosmosTriggerProperties triggerSettings) { - return container.getScripts().mapTriggerResponseAndBlock(trigger.replace(triggerSettings)); + return container.getScripts().blockTriggerResponse(trigger.replace(triggerSettings)); } /** * Delete cosmos trigger. * - * @return the cosmos sync response + * @return the cosmos response */ public CosmosTriggerResponse delete() { - return container.getScripts().mapTriggerResponseAndBlock(trigger.delete()); + return container.getScripts().blockTriggerResponse(trigger.delete()); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java index 810c491100b0..17ffd94993a7 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUser.java @@ -39,29 +39,29 @@ public String getId() { /** * Read cosmos user * - * @return the cosmos sync user response + * @return the cosmos user response */ public CosmosUserResponse read() { - return database.mapUserResponseAndBlock(asyncUser.read()); + return database.blockUserResponse(asyncUser.read()); } /** * Replace cosmos user. * * @param userProperties the user properties - * @return the cosmos sync user response + * @return the cosmos user response */ public CosmosUserResponse replace(CosmosUserProperties userProperties) { - return database.mapUserResponseAndBlock(asyncUser.replace(userProperties)); + return database.blockUserResponse(asyncUser.replace(userProperties)); } /** * Delete cosmos user. * - * @return the cosmos sync user response + * @return the cosmos user response */ public CosmosUserResponse delete() { - return database.mapUserResponseAndBlock(asyncUser.delete()); + return database.blockUserResponse(asyncUser.delete()); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java index 53afbea8ac5a..11f09fde2d0f 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosUserDefinedFunction.java @@ -44,7 +44,7 @@ public String getId() { * @return the cosmos user defined function response */ public CosmosUserDefinedFunctionResponse read() { - return container.getScripts().mapUDFResponseAndBlock(userDefinedFunction.read()); + return container.getScripts().blockUDFResponse(userDefinedFunction.read()); } /** @@ -54,15 +54,15 @@ public CosmosUserDefinedFunctionResponse read() { * @return the cosmos user defined function response */ public CosmosUserDefinedFunctionResponse replace(CosmosUserDefinedFunctionProperties udfSettings) { - return container.getScripts().mapUDFResponseAndBlock(userDefinedFunction.replace(udfSettings)); + return container.getScripts().blockUDFResponse(userDefinedFunction.replace(udfSettings)); } /** * Delete cosmos user defined function. * - * @return the cosmos sync response + * @return the cosmos user defined function */ public CosmosUserDefinedFunctionResponse delete() { - return container.getScripts().mapUDFResponseAndBlock(userDefinedFunction.delete()); + return container.getScripts().blockUDFResponse(userDefinedFunction.delete()); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/ChangeFeedContextClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/ChangeFeedContextClient.java index 29a74342ad16..2bd79daf8f84 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/ChangeFeedContextClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/ChangeFeedContextClient.java @@ -7,7 +7,7 @@ import com.azure.cosmos.models.CosmosContainerResponse; import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.models.CosmosDatabaseResponse; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; import com.azure.cosmos.models.CosmosDatabaseRequestOptions; @@ -73,9 +73,9 @@ Flux> createDocumentChangeFeedQuery(CosmosAsyncContainer * @param disableAutomaticIdGeneration the flag for disabling automatic id generation. * @return an {@link Mono} containing the single resource response with the created cosmos item or an error. */ - Mono> createItem(CosmosAsyncContainer containerLink, T document, - CosmosItemRequestOptions options, - boolean disableAutomaticIdGeneration); + Mono> createItem(CosmosAsyncContainer containerLink, T document, + CosmosItemRequestOptions options, + boolean disableAutomaticIdGeneration); /** * DELETE a cosmos item. @@ -84,8 +84,8 @@ Mono> createItem(CosmosAsyncContainer containerLi * @param options the request options. * @return an {@link Mono} containing the cosmos item resource response with the deleted item or an error. */ - Mono> deleteItem(String itemId, PartitionKey partitionKey, - CosmosItemRequestOptions options); + Mono> deleteItem(String itemId, PartitionKey partitionKey, + CosmosItemRequestOptions options); /** * Replaces a cosmos item. @@ -95,8 +95,8 @@ Mono> deleteItem(String itemId, PartitionKey par * @param options the request options. * @return an {@link Mono} containing the cosmos item resource response with the replaced item or an error. */ - Mono> replaceItem(String itemId, PartitionKey partitionKey, T document, - CosmosItemRequestOptions options); + Mono> replaceItem(String itemId, PartitionKey partitionKey, T document, + CosmosItemRequestOptions options); /** * Reads a cosmos item @@ -105,7 +105,7 @@ Mono> replaceItem(String itemId, PartitionKey par * @param options the request options. * @return an {@link Mono} containing the cosmos item resource response with the read item or an error. */ - Mono> readItem(String itemId, PartitionKey partitionKey, + Mono> readItem(String itemId, PartitionKey partitionKey, CosmosItemRequestOptions options, Class itemType); /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/ChangeFeedContextClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/ChangeFeedContextClientImpl.java index df0d299c3451..f4842424f038 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/ChangeFeedContextClientImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/ChangeFeedContextClientImpl.java @@ -8,7 +8,7 @@ import com.azure.cosmos.models.CosmosContainerResponse; import com.azure.cosmos.CosmosAsyncDatabase; import com.azure.cosmos.models.CosmosDatabaseResponse; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosBridgeInternal; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; @@ -113,8 +113,8 @@ public Mono readContainer(CosmosAsyncContainer containe } @Override - public Mono> createItem(CosmosAsyncContainer containerLink, T document, - CosmosItemRequestOptions options, boolean disableAutomaticIdGeneration) { + public Mono> createItem(CosmosAsyncContainer containerLink, T document, + CosmosItemRequestOptions options, boolean disableAutomaticIdGeneration) { if (options != null) { return containerLink.createItem(document, options) .publishOn(this.rxScheduler); @@ -125,22 +125,22 @@ public Mono> createItem(CosmosAsyncContainer cont } @Override - public Mono> deleteItem(String itemId, PartitionKey partitionKey, - CosmosItemRequestOptions options) { + public Mono> deleteItem(String itemId, PartitionKey partitionKey, + CosmosItemRequestOptions options) { return cosmosContainer.deleteItem(itemId, partitionKey, options) .publishOn(this.rxScheduler); } @Override - public Mono> replaceItem(String itemId, PartitionKey partitionKey, T document, - CosmosItemRequestOptions options) { + public Mono> replaceItem(String itemId, PartitionKey partitionKey, T document, + CosmosItemRequestOptions options) { return cosmosContainer.replaceItem(document, itemId, partitionKey, options) .publishOn(this.rxScheduler); } @Override - public Mono> readItem(String itemId, PartitionKey partitionKey, - CosmosItemRequestOptions options, Class itemType) { + public Mono> readItem(String itemId, PartitionKey partitionKey, + CosmosItemRequestOptions options, Class itemType) { return cosmosContainer.readItem(itemId, partitionKey, options, itemType) .publishOn(this.rxScheduler); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java deleted file mode 100644 index 1e684b0074e4..000000000000 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncItemResponse.java +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -package com.azure.cosmos.models; - -import com.azure.cosmos.BridgeInternal; -import com.azure.cosmos.CosmosDiagnostics; -import com.azure.cosmos.implementation.CosmosItemProperties; -import com.azure.cosmos.implementation.Document; -import com.azure.cosmos.implementation.ResourceResponse; -import com.azure.cosmos.implementation.SerializationDiagnosticsContext; -import com.azure.cosmos.implementation.Utils; - -import java.time.Duration; -import java.time.Instant; -import java.util.Map; - -/** - * The type Cosmos async item response. This contains the item and response methods - * - * @param the type parameter - */ -public class CosmosAsyncItemResponse { - private final Class itemClassType; - private final byte[] responseBodyAsByteArray; - private T item; - private final ResourceResponse resourceResponse; - private CosmosItemProperties props; - - CosmosAsyncItemResponse(ResourceResponse response, Class classType) { - this.itemClassType = classType; - this.responseBodyAsByteArray = response.getBodyAsByteArray(); - this.resourceResponse = response; - } - - /** - * Gets the resource . - * - * @return the resource - */ - @SuppressWarnings("unchecked") // Casting getProperties() to T is safe given T is of CosmosItemProperties. - public T getItem() { - if (item != null) { - return item; - } - - SerializationDiagnosticsContext serializationDiagnosticsContext = BridgeInternal.getSerializationDiagnosticsContext(this.getDiagnostics()); - if (item == null && this.itemClassType == CosmosItemProperties.class) { - Instant serializationStartTime = Instant.now(); - item =(T) getProperties(); - Instant serializationEndTime = Instant.now(); - SerializationDiagnosticsContext.SerializationDiagnostics diagnostics = new SerializationDiagnosticsContext.SerializationDiagnostics( - serializationStartTime, - serializationEndTime, - SerializationDiagnosticsContext.SerializationType.ITEM_DESERIALIZATION - ); - serializationDiagnosticsContext.addSerializationDiagnostics(diagnostics); - return item; - } - - if (item == null) { - synchronized (this) { - if (item == null && !Utils.isEmpty(responseBodyAsByteArray)) { - Instant serializationStartTime = Instant.now(); - item = Utils.parse(responseBodyAsByteArray, itemClassType); - Instant serializationEndTime = Instant.now(); - SerializationDiagnosticsContext.SerializationDiagnostics diagnostics = new SerializationDiagnosticsContext.SerializationDiagnostics( - serializationStartTime, - serializationEndTime, - SerializationDiagnosticsContext.SerializationType.ITEM_DESERIALIZATION - ); - serializationDiagnosticsContext.addSerializationDiagnostics(diagnostics); - } - } - } - - return item; - } - - /** - * Gets the itemProperties - * - * @return the itemProperties - */ - CosmosItemProperties getProperties() { - ensureCosmosItemPropertiesInitialized(); - return props; - } - - private void ensureCosmosItemPropertiesInitialized() { - synchronized (this) { - if (Utils.isEmpty(responseBodyAsByteArray)) { - props = null; - } else { - props = new CosmosItemProperties(responseBodyAsByteArray); - } - - } - } - - /** - * Gets the maximum size limit for this entity (in megabytes (MB) for server resources and in count for master - * resources). - * - * @return the max resource quota. - */ - public String getMaxResourceQuota() { - return resourceResponse.getMaxResourceQuota(); - } - - /** - * Gets the current size of this entity (in megabytes (MB) for server resources and in count for master resources) - * - * @return the current resource quota usage. - */ - public String getCurrentResourceQuotaUsage() { - return resourceResponse.getCurrentResourceQuotaUsage(); - } - - /** - * Gets the Activity ID for the request. - * - * @return the activity getId. - */ - public String getActivityId() { - return resourceResponse.getActivityId(); - } - - /** - * Gets the request charge as request units (RU) consumed by the operation. - *

- * For more information about the RU and factors that can impact the effective charges please visit - * Request Units in Azure Cosmos DB - * - * @return the request charge. - */ - public double getRequestCharge() { - return resourceResponse.getRequestCharge(); - } - - /** - * Gets the HTTP status code associated with the response. - * - * @return the status code. - */ - public int getStatusCode() { - return resourceResponse.getStatusCode(); - } - - /** - * Gets the token used for managing client's consistency requirements. - * - * @return the session token. - */ - public String getSessionToken() { - return resourceResponse.getSessionToken(); - } - - /** - * Gets the headers associated with the response. - * - * @return the response headers. - */ - public Map getResponseHeaders() { - return resourceResponse.getResponseHeaders(); - } - - /** - * Gets the diagnostics information for the current request to Azure Cosmos DB service. - * - * @return diagnostics information for the current request to Azure Cosmos DB service. - */ - public CosmosDiagnostics getDiagnostics() { - return resourceResponse.getDiagnostics(); - } - - /** - * Gets the end-to-end request latency for the current request to Azure Cosmos DB service. - * - * @return end-to-end request latency for the current request to Azure Cosmos DB service. - */ - public Duration getDuration() { - return resourceResponse.getDuration(); - } - - /** - * Gets the ETag from the response headers. - * This is only relevant when getting response from the server. - * - * Null in case of delete operation. - * - * @return ETag - */ - public String getETag() { - return resourceResponse.getETag(); - } -} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java index 23c742c6801f..9e50ccfa74fe 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosItemResponse.java @@ -1,42 +1,102 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. - package com.azure.cosmos.models; +import com.azure.cosmos.BridgeInternal; import com.azure.cosmos.CosmosDiagnostics; import com.azure.cosmos.implementation.CosmosItemProperties; +import com.azure.cosmos.implementation.Document; +import com.azure.cosmos.implementation.ResourceResponse; +import com.azure.cosmos.implementation.SerializationDiagnosticsContext; +import com.azure.cosmos.implementation.Utils; import java.time.Duration; +import java.time.Instant; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; import java.util.Map; /** - * The synchronous Cosmos item response. Contains methods to access the Item and other response methods + * The type Cosmos item response. This contains the item and response methods * * @param the type parameter */ public class CosmosItemResponse { - private final CosmosAsyncItemResponse responseWrapper; - - CosmosItemResponse(CosmosAsyncItemResponse response) { - this.responseWrapper = response; + private final Class itemClassType; + private final byte[] responseBodyAsByteArray; + private T item; + private final ResourceResponse resourceResponse; + private CosmosItemProperties props; + + CosmosItemResponse(ResourceResponse response, Class classType) { + this.itemClassType = classType; + this.responseBodyAsByteArray = response.getBodyAsByteArray(); + this.resourceResponse = response; } /** - * Gets resource. + * Gets the resource. * * @return the resource */ + @SuppressWarnings("unchecked") // Casting getProperties() to T is safe given T is of CosmosItemProperties. public T getItem() { - return responseWrapper.getItem(); + if (item != null) { + return item; + } + + SerializationDiagnosticsContext serializationDiagnosticsContext = BridgeInternal.getSerializationDiagnosticsContext(this.getDiagnostics()); + if (item == null && this.itemClassType == CosmosItemProperties.class) { + Instant serializationStartTime = Instant.now(); + item =(T) getProperties(); + Instant serializationEndTime = Instant.now(); + SerializationDiagnosticsContext.SerializationDiagnostics diagnostics = new SerializationDiagnosticsContext.SerializationDiagnostics( + serializationStartTime, + serializationEndTime, + SerializationDiagnosticsContext.SerializationType.ITEM_DESERIALIZATION + ); + serializationDiagnosticsContext.addSerializationDiagnostics(diagnostics); + return item; + } + + if (item == null) { + synchronized (this) { + if (item == null && !Utils.isEmpty(responseBodyAsByteArray)) { + Instant serializationStartTime = Instant.now(); + item = Utils.parse(responseBodyAsByteArray, itemClassType); + Instant serializationEndTime = Instant.now(); + SerializationDiagnosticsContext.SerializationDiagnostics diagnostics = new SerializationDiagnosticsContext.SerializationDiagnostics( + serializationStartTime, + serializationEndTime, + SerializationDiagnosticsContext.SerializationType.ITEM_DESERIALIZATION + ); + serializationDiagnosticsContext.addSerializationDiagnostics(diagnostics); + } + } + } + + return item; } /** - * Gets the itemSettings + * Gets the itemProperties * - * @return the itemSettings + * @return the itemProperties */ CosmosItemProperties getProperties() { - return responseWrapper.getProperties(); + ensureCosmosItemPropertiesInitialized(); + return props; + } + + private void ensureCosmosItemPropertiesInitialized() { + synchronized (this) { + if (Utils.isEmpty(responseBodyAsByteArray)) { + props = null; + } else { + props = new CosmosItemProperties(responseBodyAsByteArray); + } + + } } /** @@ -46,7 +106,7 @@ CosmosItemProperties getProperties() { * @return the max resource quota. */ public String getMaxResourceQuota() { - return responseWrapper.getMaxResourceQuota(); + return resourceResponse.getMaxResourceQuota(); } /** @@ -55,7 +115,7 @@ public String getMaxResourceQuota() { * @return the current resource quota usage. */ public String getCurrentResourceQuotaUsage() { - return responseWrapper.getCurrentResourceQuotaUsage(); + return resourceResponse.getCurrentResourceQuotaUsage(); } /** @@ -64,7 +124,7 @@ public String getCurrentResourceQuotaUsage() { * @return the activity getId. */ public String getActivityId() { - return responseWrapper.getActivityId(); + return resourceResponse.getActivityId(); } /** @@ -76,7 +136,7 @@ public String getActivityId() { * @return the request charge. */ public double getRequestCharge() { - return responseWrapper.getRequestCharge(); + return resourceResponse.getRequestCharge(); } /** @@ -85,7 +145,7 @@ public double getRequestCharge() { * @return the status code. */ public int getStatusCode() { - return responseWrapper.getStatusCode(); + return resourceResponse.getStatusCode(); } /** @@ -94,7 +154,7 @@ public int getStatusCode() { * @return the session token. */ public String getSessionToken() { - return responseWrapper.getSessionToken(); + return resourceResponse.getSessionToken(); } /** @@ -103,7 +163,7 @@ public String getSessionToken() { * @return the response headers. */ public Map getResponseHeaders() { - return responseWrapper.getResponseHeaders(); + return resourceResponse.getResponseHeaders(); } /** @@ -112,7 +172,7 @@ public Map getResponseHeaders() { * @return diagnostics information for the current request to Azure Cosmos DB service. */ public CosmosDiagnostics getDiagnostics() { - return responseWrapper.getDiagnostics(); + return resourceResponse.getDiagnostics(); } /** @@ -121,7 +181,7 @@ public CosmosDiagnostics getDiagnostics() { * @return end-to-end request latency for the current request to Azure Cosmos DB service. */ public Duration getDuration() { - return responseWrapper.getDuration(); + return resourceResponse.getDuration(); } /** @@ -133,6 +193,6 @@ public Duration getDuration() { * @return ETag */ public String getETag() { - return responseWrapper.getETag(); + return resourceResponse.getETag(); } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java index 5d02c5524315..661083242451 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosTriggerResponse.java @@ -7,7 +7,7 @@ import com.azure.cosmos.implementation.apachecommons.lang.StringUtils; /** - * The type Cosmos async trigger response. + * The type Cosmos trigger response. */ public class CosmosTriggerResponse extends CosmosResponse { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java index a9697822cd24..c72caf51a219 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ModelBridgeInternal.java @@ -77,13 +77,13 @@ public static CosmosDatabaseResponse createCosmosDatabaseResponse(ResourceRespon } @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosAsyncItemResponse createCosmosAsyncItemResponse(ResourceResponse response, Class classType) { - return new CosmosAsyncItemResponse<>(response, classType); + public static CosmosItemResponse createCosmosAsyncItemResponse(ResourceResponse response, Class classType) { + return new CosmosItemResponse<>(response, classType); } @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosAsyncItemResponse createCosmosAsyncItemResponseWithObjectType(ResourceResponse response) { - return new CosmosAsyncItemResponse<>(response, Object.class); + public static CosmosItemResponse createCosmosAsyncItemResponseWithObjectType(ResourceResponse response) { + return new CosmosItemResponse<>(response, Object.class); } @Warning(value = INTERNAL_USE_ONLY_WARNING) @@ -126,11 +126,6 @@ public static CosmosUserResponse createCosmosUserResponse(ResourceResponse return new CosmosUserResponse(response); } - @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosItemResponse createCosmosItemResponse(CosmosAsyncItemResponse response) { - return new CosmosItemResponse<>(response); - } - @Warning(value = INTERNAL_USE_ONLY_WARNING) public static List getCosmosConflictPropertiesFromV2Results(List results) { return CosmosConflictProperties.getFromV2Results(results); @@ -151,11 +146,6 @@ public static List getCosmosDatabasePropertiesFromV2Re return CosmosDatabaseProperties.getFromV2Results(results); } - @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosItemProperties getCosmosItemProperties(CosmosAsyncItemResponse cosmosItemResponse) { - return cosmosItemResponse.getProperties(); - } - @Warning(value = INTERNAL_USE_ONLY_WARNING) public static CosmosItemProperties getCosmosItemProperties(CosmosItemResponse cosmosItemResponse) { return cosmosItemResponse.getProperties(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/AzureKeyCredentialTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/AzureKeyCredentialTest.java index 629fdca9a185..5038805297c4 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/AzureKeyCredentialTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/AzureKeyCredentialTest.java @@ -5,7 +5,7 @@ import com.azure.cosmos.implementation.RetryAnalyzer; import com.azure.cosmos.models.CosmosContainerResponse; import com.azure.cosmos.models.CosmosDatabaseResponse; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; import com.azure.cosmos.models.CosmosDatabaseProperties; @@ -192,10 +192,10 @@ public void createDocumentWithSecondaryKey(String documentId) throws Interrupted credential.update(TestConfigurations.SECONDARY_MASTER_KEY); CosmosItemProperties properties = getDocumentDefinition(documentId); - Mono> createObservable = container.createItem(properties, new CosmosItemRequestOptions()); + Mono> createObservable = container.createItem(properties, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(properties.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -219,13 +219,13 @@ public void readDocumentWithSecondaryKey(String documentId) throws InterruptedEx CosmosItemRequestOptions options = new CosmosItemRequestOptions(); ModelBridgeInternal.setPartitionKey(options, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk"))); - Mono> readObservable = container.readItem(docDefinition.getId(), + Mono> readObservable = container.readItem(docDefinition.getId(), new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options, CosmosItemProperties.class); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(readObservable, validator); @@ -248,11 +248,11 @@ public void deleteDocumentWithSecondaryKey(String documentId) throws Interrupted CosmosItemRequestOptions options = new CosmosItemRequestOptions(); ModelBridgeInternal.setPartitionKey(options, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk"))); - Mono> deleteObservable = container.deleteItem(docDefinition.getId(), + Mono> deleteObservable = container.deleteItem(docDefinition.getId(), new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); validateItemSuccess(deleteObservable, validator); @@ -260,7 +260,7 @@ public void deleteDocumentWithSecondaryKey(String documentId) throws Interrupted // attempt to read document which was deleted waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono> readObservable = container.readItem(documentId, + Mono> readObservable = container.readItem(documentId, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options, CosmosItemProperties.class); FailureValidator notFoundValidator = new FailureValidator.Builder().resourceNotFound().build(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java index a291d7a2f3ab..110bb9eeb953 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/CosmosItemContentResponseOnWriteTest.java @@ -139,7 +139,7 @@ private void validateItemResponse(CosmosItemProperties containerProperties, } private void validateMinimalItemResponse(CosmosItemProperties containerProperties, - CosmosItemResponse createResponse, boolean withETag) { + CosmosItemResponse createResponse, boolean withETag) { // Basic validation assertThat(BridgeInternal.getProperties(createResponse)).isNull(); assertThat(createResponse.getStatusCode()).isNotNull(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/MultipleCosmosClientsWithTransportClientSharingTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/MultipleCosmosClientsWithTransportClientSharingTest.java index 233353bcbd28..e9766273b33c 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/MultipleCosmosClientsWithTransportClientSharingTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/MultipleCosmosClientsWithTransportClientSharingTest.java @@ -14,8 +14,8 @@ import com.azure.cosmos.implementation.directconnectivity.TransportClient; import com.azure.cosmos.implementation.http.HttpClient; import com.azure.cosmos.implementation.http.SharedGatewayHttpClient; -import com.azure.cosmos.models.CosmosItemRequestOptions; import com.azure.cosmos.models.CosmosItemResponse; +import com.azure.cosmos.models.CosmosItemRequestOptions; import com.azure.cosmos.models.FeedOptions; import com.azure.cosmos.models.FeedResponse; import com.azure.cosmos.models.ModelBridgeInternal; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/models/CosmosPartitionKeyTests.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/models/CosmosPartitionKeyTests.java index f19e7c27f167..9a96ab361a64 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/models/CosmosPartitionKeyTests.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/models/CosmosPartitionKeyTests.java @@ -138,52 +138,52 @@ public void nonPartitionedCollectionOperations() throws Exception { createContainerWithoutPk(); CosmosAsyncContainer createdContainer = createdDatabase.getContainer(NON_PARTITIONED_CONTAINER_ID); - Mono> readMono = createdContainer.readItem(NON_PARTITIONED_CONTAINER_DOCUEMNT_ID, + Mono> readMono = createdContainer.readItem(NON_PARTITIONED_CONTAINER_DOCUEMNT_ID, PartitionKey.NONE, CosmosItemProperties.class); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(NON_PARTITIONED_CONTAINER_DOCUEMNT_ID) .build(); this.validateItemSuccess(readMono, validator); String createdItemId = UUID.randomUUID().toString(); - Mono> createMono = + Mono> createMono = createdContainer.createItem(new CosmosItemProperties("{'id':'" + createdItemId + "'}")); validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(createdItemId) .build(); this.validateItemSuccess(createMono, validator); readMono = createdContainer.readItem(createdItemId, PartitionKey.NONE, CosmosItemProperties.class); validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(createdItemId) .build(); this.validateItemSuccess(readMono, validator); - CosmosAsyncItemResponse response = createdContainer.readItem(createdItemId, PartitionKey.NONE, + CosmosItemResponse response = createdContainer.readItem(createdItemId, PartitionKey.NONE, CosmosItemProperties.class) .block(); CosmosItemProperties itemSettingsToReplace = ModelBridgeInternal.getCosmosItemProperties(response); String replacedItemId = UUID.randomUUID().toString(); itemSettingsToReplace.setId(replacedItemId); - Mono> replaceMono = createdContainer.replaceItem(itemSettingsToReplace, + Mono> replaceMono = createdContainer.replaceItem(itemSettingsToReplace, createdItemId, PartitionKey.NONE); validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(replacedItemId) .build(); this.validateItemSuccess(replaceMono, validator); String upsertedItemId = UUID.randomUUID().toString(); - Mono> upsertMono = createdContainer.upsertItem(new CosmosItemProperties("{'id':'" + upsertedItemId + "'}")); + Mono> upsertMono = createdContainer.upsertItem(new CosmosItemProperties("{'id':'" + upsertedItemId + "'}")); validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(upsertedItemId) .build(); this.validateItemSuccess(upsertMono, validator); @@ -248,10 +248,10 @@ public void nonPartitionedCollectionOperations() throws Exception { .build(); validateQuerySuccess(queryFlux.byPage(), queryValidator); CosmosItemResponseValidator deleteResponseValidator; - Mono> deleteMono = + Mono> deleteMono = createdContainer.deleteItem(upsertedItemId, PartitionKey.NONE); deleteResponseValidator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); this.validateItemSuccess(deleteMono, deleteResponseValidator); @@ -259,21 +259,21 @@ public void nonPartitionedCollectionOperations() throws Exception { deleteMono = createdContainer.deleteItem(replacedItemId, PartitionKey.NONE); deleteResponseValidator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); this.validateItemSuccess(deleteMono, deleteResponseValidator); deleteMono = createdContainer.deleteItem(NON_PARTITIONED_CONTAINER_DOCUEMNT_ID, PartitionKey.NONE); deleteResponseValidator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); this.validateItemSuccess(deleteMono, deleteResponseValidator); deleteMono = createdContainer.deleteItem(documentCreatedBySprocId, PartitionKey.NONE); deleteResponseValidator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); this.validateItemSuccess(deleteMono, deleteResponseValidator); @@ -298,12 +298,12 @@ public void multiPartitionCollectionReadDocumentWithNoPk() throws InterruptedExc createdContainer.createItem(cosmosItemProperties).block(); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); ModelBridgeInternal.setPartitionKey(options, PartitionKey.NONE); - Mono> readMono = createdContainer.readItem(cosmosItemProperties.getId(), + Mono> readMono = createdContainer.readItem(cosmosItemProperties.getId(), PartitionKey.NONE, options, CosmosItemProperties.class); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(IdOfDocumentWithNoPk) .build(); this.validateItemSuccess(readMono, validator); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java index 10453dccb99c..83cb4d53127e 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CollectionCrudTest.java @@ -10,7 +10,7 @@ import com.azure.cosmos.CosmosAsyncContainer; import com.azure.cosmos.models.CosmosContainerResponse; import com.azure.cosmos.CosmosAsyncDatabase; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; @@ -330,13 +330,13 @@ public void sessionTokenConsistencyCollectionDeleteCreateSameName() { BridgeInternal.setProperty(document, "mypk", "mypkValue"); createDocument(collection, document); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); - CosmosAsyncItemResponse readDocumentResponse = + CosmosItemResponse readDocumentResponse = collection.readItem(document.getId(), new PartitionKey("mypkValue"), options, CosmosItemProperties.class).block(); logger.info("Client 1 READ Document Client Side Request Statistics {}", readDocumentResponse.getDiagnostics()); logger.info("Client 1 READ Document Latency {}", readDocumentResponse.getDuration()); BridgeInternal.setProperty(document, "name", "New Updated Document"); - CosmosAsyncItemResponse upsertDocumentResponse = collection.upsertItem(document).block(); + CosmosItemResponse upsertDocumentResponse = collection.upsertItem(document).block(); logger.info("Client 1 Upsert Document Client Side Request Statistics {}", upsertDocumentResponse.getDiagnostics()); logger.info("Client 1 Upsert Document Latency {}", upsertDocumentResponse.getDuration()); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosItemResponseValidator.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosItemResponseValidator.java index cbc5aa69b453..096408f05cc1 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosItemResponseValidator.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/CosmosItemResponseValidator.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. package com.azure.cosmos.rx; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.implementation.CosmosItemProperties; import com.azure.cosmos.models.ModelBridgeInternal; @@ -13,7 +13,7 @@ public interface CosmosItemResponseValidator { @SuppressWarnings("rawtypes") - void validate(CosmosAsyncItemResponse itemResponse); + void validate(CosmosItemResponse itemResponse); class Builder { private List validators = new ArrayList<>(); @@ -23,7 +23,7 @@ public Builder withId(final String resourceId) { @Override @SuppressWarnings("rawtypes") - public void validate(CosmosAsyncItemResponse itemResponse) { + public void validate(CosmosItemResponse itemResponse) { assertThat(itemResponse.getItem()).isNotNull(); // This could be validated for potential improvement by remove fromObject assertThat(CosmosItemProperties.fromObject(itemResponse.getItem()) @@ -38,7 +38,7 @@ public Builder withProperty(String propertyName, String value) { @Override @SuppressWarnings("rawtypes") - public void validate(CosmosAsyncItemResponse itemResponse) { + public void validate(CosmosItemResponse itemResponse) { assertThat(itemResponse.getItem()).isNotNull(); assertThat(ModelBridgeInternal .getObjectFromJsonSerializable(CosmosItemProperties.fromObject(itemResponse.getItem()), propertyName)) @@ -53,7 +53,7 @@ public CosmosItemResponseValidator build() { return new CosmosItemResponseValidator() { @Override @SuppressWarnings("rawtypes") - public void validate(CosmosAsyncItemResponse itemResponse) { + public void validate(CosmosItemResponse itemResponse) { for (CosmosItemResponseValidator validator : validators) { validator.validate(itemResponse); } @@ -66,7 +66,7 @@ public Builder nullResource() { @Override @SuppressWarnings("rawtypes") - public void validate(CosmosAsyncItemResponse itemResponse) { + public void validate(CosmosItemResponse itemResponse) { assertThat(itemResponse.getItem()).isNull(); } }); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java index c4d2fbf5cb2c..ac842c0803e5 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/DocumentCrudTest.java @@ -6,7 +6,7 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; import com.azure.cosmos.implementation.HttpConstants; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.CosmosException; import com.azure.cosmos.models.CosmosItemRequestOptions; @@ -56,10 +56,10 @@ public Object[][] documentCrudArgProvider() { public void createDocument(String documentId) throws InterruptedException { CosmosItemProperties properties = getDocumentDefinition(documentId); - Mono> createObservable = container.createItem(properties, new CosmosItemRequestOptions()); + Mono> createObservable = container.createItem(properties, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(properties.getId()) .build(); @@ -74,10 +74,10 @@ public void createLargeDocument(String documentId) throws InterruptedException { int size = (int) (ONE_MB * 1.5); BridgeInternal.setProperty(docDefinition, "largeString", StringUtils.repeat("x", size)); - Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); + Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); @@ -93,10 +93,10 @@ public void createDocumentWithVeryLargePartitionKey(String documentId) throws In } BridgeInternal.setProperty(docDefinition, "mypk", sb.toString()); - Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); + Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .withProperty("mypk", sb.toString()) .build(); @@ -118,12 +118,12 @@ public void readDocumentWithVeryLargePartitionKey(String documentId) throws Inte waitIfNeededForReplicasToCatchUp(getClientBuilder()); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); - Mono> readObservable = container.readItem(docDefinition.getId(), + Mono> readObservable = container.readItem(docDefinition.getId(), new PartitionKey(sb.toString()), options, CosmosItemProperties.class); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .withProperty("mypk", sb.toString()) .build(); @@ -134,7 +134,7 @@ public void readDocumentWithVeryLargePartitionKey(String documentId) throws Inte public void createDocument_AlreadyExists(String documentId) throws InterruptedException { CosmosItemProperties docDefinition = getDocumentDefinition(documentId); container.createItem(docDefinition, new CosmosItemRequestOptions()).block(); - Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); + Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()); FailureValidator validator = new FailureValidator.Builder() .resourceAlreadyExists() .documentClientExceptionToStringExcludesHeader(HttpConstants.HttpHeaders.AUTHORIZATION) @@ -145,7 +145,7 @@ public void createDocument_AlreadyExists(String documentId) throws InterruptedEx @Test(groups = { "simple" }, timeOut = TIMEOUT, dataProvider = "documentCrudArgProvider") public void createDocumentTimeout(String documentId) throws InterruptedException { CosmosItemProperties docDefinition = getDocumentDefinition(documentId); - Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()).timeout(Duration.ofMillis(1)); + Mono> createObservable = container.createItem(docDefinition, new CosmosItemRequestOptions()).timeout(Duration.ofMillis(1)); FailureValidator validator = new FailureValidator.Builder().instanceOf(TimeoutException.class).build(); validateItemFailure(createObservable, validator); } @@ -159,12 +159,12 @@ public void readDocument(String documentId) throws InterruptedException { waitIfNeededForReplicasToCatchUp(getClientBuilder()); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); - Mono> readObservable = container.readItem(docDefinition.getId(), + Mono> readObservable = container.readItem(docDefinition.getId(), new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options, CosmosItemProperties.class); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); @@ -204,7 +204,7 @@ public void readDocument_DoesntExist(String documentId) throws InterruptedExcept waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono> readObservable = container.readItem(docDefinition.getId(), + Mono> readObservable = container.readItem(docDefinition.getId(), new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options, CosmosItemProperties.class); @@ -223,12 +223,12 @@ public void deleteDocument(String documentId) throws InterruptedException { container.createItem(docDefinition, new CosmosItemRequestOptions()).block(); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); - Mono> deleteObservable = container.deleteItem(documentId, + Mono> deleteObservable = container.deleteItem(documentId, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource() .build(); this.validateItemSuccess(deleteObservable, validator); @@ -236,7 +236,7 @@ public void deleteDocument(String documentId) throws InterruptedException { // attempt to read document which was deleted waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono> readObservable = container.readItem(documentId, + Mono> readObservable = container.readItem(documentId, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), options, CosmosItemProperties.class); FailureValidator notFoundValidator = new FailureValidator.Builder() @@ -254,19 +254,19 @@ public void deleteDocument_undefinedPK(String documentId) throws InterruptedExce container.createItem(docDefinition, new CosmosItemRequestOptions()).block(); CosmosItemRequestOptions options = new CosmosItemRequestOptions(); - Mono> deleteObservable = container.deleteItem(documentId, + Mono> deleteObservable = container.deleteItem(documentId, PartitionKey.NONE, options); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .nullResource().build(); this.validateItemSuccess(deleteObservable, validator); // attempt to read document which was deleted waitIfNeededForReplicasToCatchUp(getClientBuilder()); - Mono> readObservable = container.readItem(documentId, + Mono> readObservable = container.readItem(documentId, PartitionKey.NONE, options, CosmosItemProperties.class); FailureValidator notFoundValidator = new FailureValidator.Builder().resourceNotFound().build(); @@ -286,7 +286,7 @@ public void deleteDocument_DoesntExist(String documentId) throws InterruptedExce .block(); // delete again - Mono> deleteObservable = container.deleteItem(documentId, + Mono> deleteObservable = container.deleteItem(documentId, PartitionKey.NONE, options);; @@ -306,7 +306,7 @@ public void replaceDocument(String documentId) throws InterruptedException { CosmosItemRequestOptions options = new CosmosItemRequestOptions(); // replace document - Mono> replaceObservable = + Mono> replaceObservable = container.replaceItem(docDefinition, documentId, new PartitionKey(ModelBridgeInternal.getObjectFromJsonSerializable(docDefinition, "mypk")), @@ -314,7 +314,7 @@ public void replaceDocument(String documentId) throws InterruptedException { // validate CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .withProperty("newProp", newPropValue) .build(); @@ -328,11 +328,11 @@ public void upsertDocument_CreateDocument(String documentId) throws Throwable { // replace document - Mono> upsertObservable = container.upsertItem(docDefinition, new CosmosItemRequestOptions()); + Mono> upsertObservable = container.upsertItem(docDefinition, new CosmosItemRequestOptions()); // validate CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); @@ -351,12 +351,12 @@ public void upsertDocument_ReplaceDocument(String documentId) throws Throwable { // Replace document - Mono> readObservable = container.upsertItem(properties, new CosmosItemRequestOptions()); + Mono> readObservable = container.upsertItem(properties, new CosmosItemRequestOptions()); System.out.println(properties); // Validate result CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withProperty("newProp", newPropValue) .build(); @@ -380,11 +380,11 @@ public void typedItems() throws Throwable { TestObject newTestObject = new TestObject(docId, partitionKey, sgmts, "test string"); - Mono> itemResponseMono = container.createItem(newTestObject); + Mono> itemResponseMono = container.createItem(newTestObject); TestObject resultObject = itemResponseMono.block().getItem(); compareTestObjs(newTestObject, resultObject); - Mono> readResponseMono = container.readItem(newTestObject.id, + Mono> readResponseMono = container.readItem(newTestObject.id, new PartitionKey(newTestObject .getMypk()), TestObject.class); @@ -392,7 +392,7 @@ public void typedItems() throws Throwable { compareTestObjs(newTestObject, resultObject); newTestObject.setStringProp("another string"); - Mono> replaceMono = container.replaceItem(newTestObject, + Mono> replaceMono = container.replaceItem(newTestObject, newTestObject.getId(), new PartitionKey(newTestObject .getMypk())); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java index 0d87671c9b75..a0e0cfa9f602 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/LogLevelTest.java @@ -5,7 +5,7 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.implementation.CosmosItemProperties; import com.azure.cosmos.models.CosmosItemRequestOptions; import org.apache.logging.log4j.Level; @@ -86,11 +86,11 @@ public void createDocumentWithDebugLevel() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -116,10 +116,10 @@ public void createDocumentWithWarningLevel() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -148,10 +148,10 @@ public void createDocumentWithTraceLevel() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -178,10 +178,10 @@ public void createDocumentWithTraceLevelAtRoot() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -225,10 +225,10 @@ public void createDocumentWithDebugLevelAtRoot() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -256,10 +256,10 @@ public void createDocumentWithErrorClient() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); @@ -287,10 +287,10 @@ public void createDocumentWithInfoLevel() throws Exception { CosmosAsyncClient client = getClientBuilder().buildAsyncClient(); try { CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = createdCollection.createItem(docDefinition, + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); validateItemSuccess(createObservable, validator); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java index d881276d9c7f..8330807a6fa2 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ProxyHostTest.java @@ -7,7 +7,7 @@ import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; import com.azure.cosmos.CosmosAsyncDatabase; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.implementation.CosmosItemProperties; import com.azure.cosmos.models.CosmosItemRequestOptions; @@ -78,11 +78,11 @@ public void createDocumentWithValidHttpProxy() throws Exception { .contentResponseOnWriteEnabled(true) .buildAsyncClient(); CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId()) + Mono> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId()) .createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); this.validateItemSuccess(createObservable, validator); @@ -114,10 +114,10 @@ public void createDocumentWithValidHttpProxyWithNettyWireLogging() throws Except .contentResponseOnWriteEnabled(true) .buildAsyncClient(); CosmosItemProperties docDefinition = getDocumentDefinition(); - Mono> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId()) + Mono> createObservable = clientWithRightProxy.getDatabase(createdDatabase.getId()).getContainer(createdCollection.getId()) .createItem(docDefinition, new CosmosItemRequestOptions()); CosmosItemResponseValidator validator = - new CosmosItemResponseValidator.Builder>() + new CosmosItemResponseValidator.Builder>() .withId(docDefinition.getId()) .build(); this.validateItemSuccess(createObservable, validator); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java index f0cb78189791..a972092481c2 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/TestSuiteBase.java @@ -36,7 +36,7 @@ import com.azure.cosmos.models.CompositePath; import com.azure.cosmos.models.CompositePathSortOrder; import com.azure.cosmos.models.CosmosDatabaseResponse; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.models.CosmosContainerProperties; import com.azure.cosmos.models.CosmosContainerRequestOptions; import com.azure.cosmos.models.CosmosDatabaseProperties; @@ -474,10 +474,10 @@ public static CosmosItemProperties createDocument(CosmosAsyncContainer cosmosCon return BridgeInternal.getProperties(cosmosContainer.createItem(item).block()); } - public Flux> bulkInsert(CosmosAsyncContainer cosmosContainer, - List documentDefinitionList, - int concurrencyLevel) { - List>> result = + public Flux> bulkInsert(CosmosAsyncContainer cosmosContainer, + List documentDefinitionList, + int concurrencyLevel) { + List>> result = new ArrayList<>(documentDefinitionList.size()); for (T docDef : documentDefinitionList) { result.add(cosmosContainer.createItem(docDef)); @@ -794,10 +794,10 @@ public static void validateFailur } @SuppressWarnings("rawtypes") - public void validateItemSuccess( + public void validateItemSuccess( Mono responseMono, CosmosItemResponseValidator validator) { - TestSubscriber testSubscriber = new TestSubscriber<>(); + TestSubscriber testSubscriber = new TestSubscriber<>(); responseMono.subscribe(testSubscriber); testSubscriber.awaitTerminalEvent(subscriberValidationTimeout, TimeUnit.MILLISECONDS); testSubscriber.assertNoErrors(); @@ -807,9 +807,9 @@ public void validateItemSuccess( } @SuppressWarnings("rawtypes") - public void validateItemFailure( + public void validateItemFailure( Mono responseMono, FailureValidator validator) { - TestSubscriber testSubscriber = new TestSubscriber<>(); + TestSubscriber testSubscriber = new TestSubscriber<>(); responseMono.subscribe(testSubscriber); testSubscriber.awaitTerminalEvent(subscriberValidationTimeout, TimeUnit.MILLISECONDS); testSubscriber.assertNotComplete(); diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java index 66e652ab76cc..8684d1b52dba 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/VeryLargeDocumentQueryTest.java @@ -5,7 +5,7 @@ import com.azure.cosmos.BridgeInternal; import com.azure.cosmos.CosmosAsyncClient; import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.models.CosmosAsyncItemResponse; +import com.azure.cosmos.models.CosmosItemResponse; import com.azure.cosmos.CosmosClientBuilder; import com.azure.cosmos.util.CosmosPagedFlux; import com.azure.cosmos.implementation.CosmosItemProperties; @@ -49,7 +49,7 @@ public void queryLargeDocuments() { } FeedOptions options = new FeedOptions(); - + CosmosPagedFlux feedResponseFlux = createdCollection.queryItems("SELECT * FROM r", options, CosmosItemProperties.class); @@ -71,7 +71,7 @@ private void createLargeDocument() { int size = (int) (ONE_MB * 1.999); BridgeInternal.setProperty(docDefinition, "largeString", StringUtils.repeat("x", size)); - Mono> createObservable = + Mono> createObservable = createdCollection.createItem(docDefinition, new CosmosItemRequestOptions()); StepVerifier.create(createObservable.subscribeOn(Schedulers.single()))