diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java index 9eba16587f0d..748208d91125 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncConflict.java @@ -4,7 +4,7 @@ import com.azure.cosmos.implementation.Paths; import com.azure.cosmos.implementation.RequestOptions; -import com.azure.cosmos.models.CosmosAsyncConflictResponse; +import com.azure.cosmos.models.CosmosConflictResponse; import com.azure.cosmos.models.CosmosConflictRequestOptions; import com.azure.cosmos.models.ModelBridgeInternal; import reactor.core.publisher.Mono; @@ -59,13 +59,13 @@ CosmosAsyncConflict setId(String id) { * @return a {@link Mono} containing the single resource response with the read * conflict or an error. */ - public Mono read(CosmosConflictRequestOptions options) { + public Mono read(CosmosConflictRequestOptions options) { if (options == null) { options = new CosmosConflictRequestOptions(); } RequestOptions requestOptions = ModelBridgeInternal.toRequestOptions(options); return this.container.getDatabase().getDocClientWrapper().readConflict(getLink(), requestOptions) - .map(response -> ModelBridgeInternal.createCosmosAsyncConflictResponse(response, container)).single(); + .map(response -> ModelBridgeInternal.createCosmosConflictResponse(response)).single(); } @@ -80,13 +80,13 @@ public Mono read(CosmosConflictRequestOptions optio * @return a {@link Mono} containing one or several feed response pages of the * read conflicts or an error. */ - public Mono delete(CosmosConflictRequestOptions options) { + public Mono delete(CosmosConflictRequestOptions options) { if (options == null) { options = new CosmosConflictRequestOptions(); } RequestOptions requestOptions = ModelBridgeInternal.toRequestOptions(options); return this.container.getDatabase().getDocClientWrapper().deleteConflict(getLink(), requestOptions) - .map(response -> ModelBridgeInternal.createCosmosAsyncConflictResponse(response, container)).single(); + .map(response -> ModelBridgeInternal.createCosmosConflictResponse(response)).single(); } String getURIPathSegment() { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncConflictResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncConflictResponse.java deleted file mode 100644 index 0914d2c6dd22..000000000000 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosAsyncConflictResponse.java +++ /dev/null @@ -1,54 +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.CosmosAsyncConflict; -import com.azure.cosmos.CosmosAsyncContainer; -import com.azure.cosmos.implementation.Conflict; -import com.azure.cosmos.implementation.ResourceResponse; -import com.azure.cosmos.implementation.apachecommons.lang.StringUtils; - -/** - * The type Cosmos async conflict response. - */ -public class CosmosAsyncConflictResponse extends CosmosResponse { - private final CosmosAsyncContainer container; - private final CosmosAsyncConflict conflictClient; - - CosmosAsyncConflictResponse(ResourceResponse response, CosmosAsyncContainer container) { - super(response); - this.container = container; - String bodyAsString = response.getBodyAsString(); - if (StringUtils.isEmpty(bodyAsString)) { - super.setProperties(null); - conflictClient = null; - } else { - CosmosConflictProperties props = new CosmosConflictProperties(bodyAsString); - super.setProperties(props); - conflictClient = BridgeInternal.createCosmosAsyncConflict(props.getId(), container); - } - } - - CosmosAsyncContainer getContainer() { - return container; - } - - /** - * Get conflict client - * - * @return the cosmos conflict client - */ - public CosmosAsyncConflict getConflict() { - return conflictClient; - } - - /** - * Get conflict properties object representing the resource on the server - * - * @return the conflict properties - */ - public CosmosConflictProperties getProperties() { - return super.getProperties(); - } -} diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosConflictResponse.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosConflictResponse.java new file mode 100644 index 000000000000..f59d696d866a --- /dev/null +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/CosmosConflictResponse.java @@ -0,0 +1,33 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +package com.azure.cosmos.models; + +import com.azure.cosmos.implementation.Conflict; +import com.azure.cosmos.implementation.ResourceResponse; +import com.azure.cosmos.implementation.apachecommons.lang.StringUtils; + +/** + * The type Cosmos conflict response. + */ +public class CosmosConflictResponse extends CosmosResponse { + + CosmosConflictResponse(ResourceResponse response) { + super(response); + String bodyAsString = response.getBodyAsString(); + if (StringUtils.isEmpty(bodyAsString)) { + super.setProperties(null); + } else { + CosmosConflictProperties props = new CosmosConflictProperties(bodyAsString); + super.setProperties(props); + } + } + + /** + * Get conflict properties object representing the resource on the server + * + * @return the conflict properties + */ + public CosmosConflictProperties getProperties() { + return super.getProperties(); + } +} 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 3cacb3759b72..ad9559f263aa 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 @@ -69,9 +69,8 @@ public final class ModelBridgeInternal { private ModelBridgeInternal() {} @Warning(value = INTERNAL_USE_ONLY_WARNING) - public static CosmosAsyncConflictResponse createCosmosAsyncConflictResponse(ResourceResponse response, - CosmosAsyncContainer container) { - return new CosmosAsyncConflictResponse(response, container); + public static CosmosConflictResponse createCosmosConflictResponse(ResourceResponse response) { + return new CosmosConflictResponse(response); } @Warning(value = INTERNAL_USE_ONLY_WARNING)