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 e272ff33edf4..88cc466388e3 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 @@ -10,9 +10,11 @@ import com.azure.cosmos.implementation.DatabaseAccount; import com.azure.cosmos.implementation.Document; import com.azure.cosmos.implementation.FeedResponseDiagnostics; +import com.azure.cosmos.implementation.HttpConstants; import com.azure.cosmos.implementation.JsonSerializable; import com.azure.cosmos.implementation.MetadataDiagnosticsContext; import com.azure.cosmos.implementation.QueryMetrics; +import com.azure.cosmos.implementation.RMResources; import com.azure.cosmos.implementation.ReplicationPolicy; import com.azure.cosmos.implementation.RequestTimeline; import com.azure.cosmos.implementation.Resource; @@ -20,7 +22,9 @@ import com.azure.cosmos.implementation.RxDocumentServiceRequest; import com.azure.cosmos.implementation.RxDocumentServiceResponse; import com.azure.cosmos.implementation.SerializationDiagnosticsContext; +import com.azure.cosmos.implementation.ServiceUnavailableException; import com.azure.cosmos.implementation.StoredProcedureResponse; +import com.azure.cosmos.implementation.Strings; import com.azure.cosmos.implementation.Warning; import com.azure.cosmos.implementation.directconnectivity.StoreResponse; import com.azure.cosmos.implementation.directconnectivity.StoreResult; @@ -485,4 +489,9 @@ public static CosmosUser createCosmosUser(CosmosAsyncUser asyncUser, CosmosDatab public static ConsistencyLevel fromServiceSerializedFormat(String consistencyLevel) { return ConsistencyLevel.fromServiceSerializedFormat(consistencyLevel); } + + @Warning(value = INTERNAL_USE_ONLY_WARNING) + public static CosmosException createServiceUnavailableException(Exception innerException) { + return new ServiceUnavailableException(innerException.getMessage(), innerException, null, null); + } } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java index f47566215307..2c5c14a04585 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java @@ -190,12 +190,12 @@ boolean isContentResponseOnWriteEnabled() { * The {@link Mono} upon successful completion will contain a single cosmos database response with the * created or existing database. * - * @param databaseSettings CosmosDatabaseProperties. + * @param databaseProperties CosmosDatabaseProperties. * @return a {@link Mono} containing the cosmos database response with the created or existing database or * an error. */ - Mono createDatabaseIfNotExists(CosmosDatabaseProperties databaseSettings) { - return createDatabaseIfNotExistsInternal(getDatabase(databaseSettings.getId())); + Mono createDatabaseIfNotExists(CosmosDatabaseProperties databaseProperties) { + return createDatabaseIfNotExistsInternal(getDatabase(databaseProperties.getId())); } /** @@ -263,17 +263,17 @@ public Mono createDatabaseIfNotExists(String id, Through * created database. * In case of failure the {@link Mono} will error. * - * @param databaseSettings {@link CosmosDatabaseProperties}. + * @param databaseProperties {@link CosmosDatabaseProperties}. * @param options {@link CosmosDatabaseRequestOptions}. * @return an {@link Mono} containing the single cosmos database response with the created database or an error. */ - public Mono createDatabase(CosmosDatabaseProperties databaseSettings, + public Mono createDatabase(CosmosDatabaseProperties databaseProperties, CosmosDatabaseRequestOptions options) { if (options == null) { options = new CosmosDatabaseRequestOptions(); } Database wrappedDatabase = new Database(); - wrappedDatabase.setId(databaseSettings.getId()); + wrappedDatabase.setId(databaseProperties.getId()); return asyncDocumentClient.createDatabase(wrappedDatabase, ModelBridgeInternal.toRequestOptions(options)) .map(databaseResourceResponse -> ModelBridgeInternal.createCosmosDatabaseResponse(databaseResourceResponse)) .single(); @@ -287,11 +287,11 @@ public Mono createDatabase(CosmosDatabaseProperties data * created database. * In case of failure the {@link Mono} will error. * - * @param databaseSettings {@link CosmosDatabaseProperties}. + * @param databaseProperties {@link CosmosDatabaseProperties}. * @return an {@link Mono} containing the single cosmos database response with the created database or an error. */ - public Mono createDatabase(CosmosDatabaseProperties databaseSettings) { - return createDatabase(databaseSettings, new CosmosDatabaseRequestOptions()); + public Mono createDatabase(CosmosDatabaseProperties databaseProperties) { + return createDatabase(databaseProperties, new CosmosDatabaseRequestOptions()); } /** @@ -317,12 +317,12 @@ public Mono createDatabase(String id) { * created database. * In case of failure the {@link Mono} will error. * - * @param databaseSettings {@link CosmosDatabaseProperties}. + * @param databaseProperties {@link CosmosDatabaseProperties}. * @param throughputProperties the throughput properties for the database. * @param options {@link CosmosDatabaseRequestOptions}. * @return an {@link Mono} containing the single cosmos database response with the created database or an error. */ - public Mono createDatabase(CosmosDatabaseProperties databaseSettings, + public Mono createDatabase(CosmosDatabaseProperties databaseProperties, ThroughputProperties throughputProperties, CosmosDatabaseRequestOptions options) { if (options == null) { @@ -330,7 +330,7 @@ public Mono createDatabase(CosmosDatabaseProperties data } ModelBridgeInternal.setThroughputProperties(options, throughputProperties); Database wrappedDatabase = new Database(); - wrappedDatabase.setId(databaseSettings.getId()); + wrappedDatabase.setId(databaseProperties.getId()); return asyncDocumentClient.createDatabase(wrappedDatabase, ModelBridgeInternal.toRequestOptions(options)) .map(databaseResourceResponse -> ModelBridgeInternal.createCosmosDatabaseResponse(databaseResourceResponse)) .single(); @@ -344,14 +344,14 @@ public Mono createDatabase(CosmosDatabaseProperties data * created database. * In case of failure the {@link Mono} will error. * - * @param databaseSettings {@link CosmosDatabaseProperties}. + * @param databaseProperties {@link CosmosDatabaseProperties}. * @param throughputProperties the throughput properties for the database. * @return an {@link Mono} containing the single cosmos database response with the created database or an error. */ - public Mono createDatabase(CosmosDatabaseProperties databaseSettings, ThroughputProperties throughputProperties) { + public Mono createDatabase(CosmosDatabaseProperties databaseProperties, ThroughputProperties throughputProperties) { CosmosDatabaseRequestOptions options = new CosmosDatabaseRequestOptions(); ModelBridgeInternal.setThroughputProperties(options, throughputProperties); - return createDatabase(databaseSettings, options); + return createDatabase(databaseProperties, options); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java index d61c50b55ca7..8e0a51768818 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java @@ -148,11 +148,11 @@ public Mono execute(List procedureParams, * procedure. * In case of failure the {@link Mono} will error. * - * @param storedProcedureSettings the stored procedure properties + * @param storedProcedureProperties the stored procedure properties * @return an {@link Mono} containing the single resource response with the replaced stored procedure or an error. */ - public Mono replace(CosmosStoredProcedureProperties storedProcedureSettings) { - return replace(storedProcedureSettings, null); + public Mono replace(CosmosStoredProcedureProperties storedProcedureProperties) { + return replace(storedProcedureProperties, null); } /** @@ -163,11 +163,11 @@ public Mono replace(CosmosStoredProcedureProperti * procedure. * In case of failure the {@link Mono} will error. * - * @param storedProcedureSettings the stored procedure properties. + * @param storedProcedureProperties the stored procedure properties. * @param options the request options. * @return an {@link Mono} containing the single resource response with the replaced stored procedure or an error. */ - public Mono replace(CosmosStoredProcedureProperties storedProcedureSettings, + public Mono replace(CosmosStoredProcedureProperties storedProcedureProperties, CosmosStoredProcedureRequestOptions options) { if (options == null) { options = new CosmosStoredProcedureRequestOptions(); @@ -175,7 +175,7 @@ public Mono replace(CosmosStoredProcedureProperti return cosmosContainer.getDatabase() .getDocClientWrapper() .replaceStoredProcedure(new StoredProcedure(ModelBridgeInternal.toJsonFromJsonSerializable( - ModelBridgeInternal.getResource(storedProcedureSettings))), + ModelBridgeInternal.getResource(storedProcedureProperties))), ModelBridgeInternal.toRequestOptions(options)) .map(response -> ModelBridgeInternal.createCosmosStoredProcedureResponse(response)) .single(); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java index 8809d531979e..ae06eb230079 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java @@ -67,14 +67,14 @@ public Mono read() { * The {@link Mono} upon successful completion will contain a single resource response with the replaced trigger. * In case of failure the {@link Mono} will error. * - * @param triggerSettings the cosmos trigger properties. + * @param triggerProperties the cosmos trigger properties. * @return an {@link Mono} containing the single resource response with the replaced cosmos trigger or an error. */ - public Mono replace(CosmosTriggerProperties triggerSettings) { + public Mono replace(CosmosTriggerProperties triggerProperties) { return container.getDatabase() .getDocClientWrapper() .replaceTrigger(new Trigger(ModelBridgeInternal.toJsonFromJsonSerializable( - ModelBridgeInternal.getResource(triggerSettings))), null) + ModelBridgeInternal.getResource(triggerProperties))), null) .map(response -> ModelBridgeInternal.createCosmosTriggerResponse(response)) .single(); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java index b14974b83709..bf75ccb383fe 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java @@ -64,12 +64,12 @@ public Mono read() { /** * Replace a cosmos user * - * @param userSettings the user properties to use + * @param userProperties the user properties to use * @return a {@link Mono} containing the single resource response with the replaced user or an error. */ - public Mono replace(CosmosUserProperties userSettings) { + public Mono replace(CosmosUserProperties userProperties) { return this.database.getDocClientWrapper() - .replaceUser(ModelBridgeInternal.getV2User(userSettings), null) + .replaceUser(ModelBridgeInternal.getV2User(userProperties), null) .map(response -> ModelBridgeInternal.createCosmosUserResponse(response)).single(); } @@ -91,17 +91,17 @@ public Mono delete() { * The {@link Mono} upon successful completion will contain a single resource response with the created permission. * In case of failure the {@link Mono} will error. * - * @param permissionSettings the permission properties to create. + * @param permissionProperties the permission properties to create. * @param options the request options. * @return an {@link Mono} containing the single resource response with the created permission or an error. */ public Mono createPermission( - CosmosPermissionProperties permissionSettings, + CosmosPermissionProperties permissionProperties, CosmosPermissionRequestOptions options) { if (options == null) { options = new CosmosPermissionRequestOptions(); } - Permission permission = ModelBridgeInternal.getV2Permissions(permissionSettings); + Permission permission = ModelBridgeInternal.getV2Permissions(permissionProperties); return database.getDocClientWrapper() .createPermission(getLink(), permission, ModelBridgeInternal.toRequestOptions(options)) .map(response -> ModelBridgeInternal.createCosmosPermissionResponse(response)) @@ -115,14 +115,14 @@ public Mono createPermission( * The {@link Mono} upon successful completion will contain a single resource response with the upserted permission. * In case of failure the {@link Mono} will error. * - * @param permissionSettings the permission properties to upsert. + * @param permissionProperties the permission properties to upsert. * @param options the request options. * @return an {@link Mono} containing the single resource response with the upserted permission or an error. */ public Mono upsertPermission( - CosmosPermissionProperties permissionSettings, + CosmosPermissionProperties permissionProperties, CosmosPermissionRequestOptions options) { - Permission permission = ModelBridgeInternal.getV2Permissions(permissionSettings); + Permission permission = ModelBridgeInternal.getV2Permissions(permissionProperties); if (options == null) { options = new CosmosPermissionRequestOptions(); } 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 feff167877d7..a6da8565ea46 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 @@ -99,26 +99,26 @@ public CosmosStoredProcedureResponse execute( /** * Replace cosmos sync stored procedure. * - * @param storedProcedureSettings the stored procedure settings + * @param storedProcedureProperties the stored procedure settings * @return the cosmos stored procedure response */ - public CosmosStoredProcedureResponse replace(CosmosStoredProcedureProperties storedProcedureSettings) { + public CosmosStoredProcedureResponse replace(CosmosStoredProcedureProperties storedProcedureProperties) { return container.getScripts() - .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureSettings)); + .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureProperties)); } /** * Replace cosmos sync stored procedure. * - * @param storedProcedureSettings the stored procedure settings + * @param storedProcedureProperties the stored procedure settings * @param options the options * @return the cosmos stored procedure response */ public CosmosStoredProcedureResponse replace( - CosmosStoredProcedureProperties storedProcedureSettings, + CosmosStoredProcedureProperties storedProcedureProperties, CosmosStoredProcedureRequestOptions options) { return container.getScripts() - .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureSettings, options)); + .blockStoredProcedureResponse(storedProcedure.replace(storedProcedureProperties, 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 20463309b308..027aa9b075e7 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 @@ -48,11 +48,11 @@ public CosmosTriggerResponse read() { /** * Replace cosmos trigger. * - * @param triggerSettings the trigger settings + * @param triggerProperties the trigger properties. * @return the cosmos trigger response */ - public CosmosTriggerResponse replace(CosmosTriggerProperties triggerSettings) { - return container.getScripts().blockTriggerResponse(trigger.replace(triggerSettings)); + public CosmosTriggerResponse replace(CosmosTriggerProperties triggerProperties) { + return container.getScripts().blockTriggerResponse(trigger.replace(triggerProperties)); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ServiceUnavailableException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ServiceUnavailableException.java index 562ec24705d4..e55c6b9373e8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ServiceUnavailableException.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ServiceUnavailableException.java @@ -71,7 +71,10 @@ public ServiceUnavailableException(String message, Exception innerException, HttpHeaders headers, String requestUriString) { - super(String.format("%s: %s", RMResources.ServiceUnavailable, message), + super( + String.format("%s: %s", + RMResources.ServiceUnavailable, + String.format(RMResources.ExceptionMessage, Strings.isNullOrWhiteSpace(message) ? RMResources.ServiceUnavailable : message)), innerException, HttpUtils.asMap(headers), HttpConstants.StatusCodes.SERVICE_UNAVAILABLE, diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/GoneAndRetryWithRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/GoneAndRetryWithRetryPolicy.java index d202b9261ae2..231871ce1765 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/GoneAndRetryWithRetryPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/GoneAndRetryWithRetryPolicy.java @@ -85,8 +85,7 @@ public Mono shouldRetry(Exception exception) { } else { logger.warn("Received gone exception after backoff/retry. Will fail the request. {}", exception.toString()); - exceptionToThrow = BridgeInternal.createCosmosException(HttpConstants.StatusCodes.SERVICE_UNAVAILABLE, - exception); + exceptionToThrow = BridgeInternal.createServiceUnavailableException(exception); } } else if (exception instanceof PartitionKeyRangeGoneException) { @@ -100,8 +99,7 @@ public Mono shouldRetry(Exception exception) { logger.warn( "Received partition key range gone exception after backoff/retry. Will fail the request. {}", exception.toString()); - exceptionToThrow = BridgeInternal.createCosmosException(HttpConstants.StatusCodes.SERVICE_UNAVAILABLE, - exception); + exceptionToThrow = BridgeInternal.createServiceUnavailableException(exception); } } else if (exception instanceof InvalidPartitionException) { if (this.lastRetryWithException != null) { @@ -113,8 +111,7 @@ public Mono shouldRetry(Exception exception) { logger.warn( "Received invalid collection partition exception after backoff/retry. Will fail the request. {}", exception.toString()); - exceptionToThrow = BridgeInternal.createCosmosException(HttpConstants.StatusCodes.SERVICE_UNAVAILABLE, - exception); + exceptionToThrow = BridgeInternal.createServiceUnavailableException(exception); } } else { logger.warn("Received retrywith exception after backoff/retry. Will fail the request. {}", @@ -151,7 +148,7 @@ public Mono shouldRetry(Exception exception) { logger.warn("Received second InvalidPartitionException after backoff/retry. Will fail the request. {}", exception.toString()); return Mono.just(ShouldRetryResult - .error(BridgeInternal.createCosmosException(HttpConstants.StatusCodes.SERVICE_UNAVAILABLE, exception))); + .error(BridgeInternal.createServiceUnavailableException(exception))); } if (this.request != null) { diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java index b66c23442317..3bc2af841710 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/HttpTransportClient.java @@ -183,12 +183,10 @@ public Mono invokeStoreAsync( // TODO: a possible solution for this is to add the ability to send a request to the server // to check if the previous request was received or not and act accordingly. ServiceUnavailableException serviceUnavailableException = new ServiceUnavailableException( - String.format( - RMResources.ExceptionMessage, - RMResources.ServiceUnavailable), - exception, - null, - physicalAddress.toString()); + exception.getMessage(), + exception, + null, + physicalAddress.toString()); serviceUnavailableException.getResponseHeaders().put(HttpConstants.HttpHeaders.REQUEST_VALIDATION_FAILURE, "1"); serviceUnavailableException.getResponseHeaders().put(HttpConstants.HttpHeaders.WRITE_REQUEST_TRIGGER_ADDRESS_REFRESH, "1"); return Mono.error(serviceUnavailableException); @@ -901,12 +899,7 @@ private Mono createErrorResponseFromHttpResponse(String resourceA break; case HttpConstants.StatusCodes.SERVICE_UNAVAILABLE: - exception = new ServiceUnavailableException( - String.format( - RMResources.ExceptionMessage, - Strings.isNullOrEmpty(errorMessage) ? RMResources.ServiceUnavailable : errorMessage), - response.headers(), - request.uri()); + exception = new ServiceUnavailableException(errorMessage, response.headers(), request.uri()); break; case HttpConstants.StatusCodes.REQUEST_TIMEOUT: diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ConflictResolutionPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ConflictResolutionPolicy.java index 3ff0fa437223..1ba4942ac9ba 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ConflictResolutionPolicy.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/models/ConflictResolutionPolicy.java @@ -18,7 +18,7 @@ * service. * * Refer to: https://docs.microsoft.com/en-us/azure/cosmos-db/conflict-resolution-policies - * + * *

* A container with custom conflict resolution with no user-registered stored procedure. * 

{@code
@@ -27,7 +27,7 @@
  *      new CosmosContainerProperties("Multi-master container", "Multi-master container partition key");
  * containerProperties.setConflictResolutionPolicy(ConflictResolutionPolicy.createCustomPolicy());
  *
- * CosmosAsyncDatabase database = client.createDatabase(databaseSettings).block().getDatabase();
+ * CosmosAsyncDatabase database = client.createDatabase(databaseProperties).block().getDatabase();
  * CosmosAsyncContainer container = database.createContainer(containerProperties).block().getContainer();
  *
  * }
@@ -42,7 +42,7 @@
  * ConflictResolutionPolicy policy = ConflictResolutionPolicy.createCustomPolicy(conflictResolutionSprocName);
  * containerProperties.setConflictResolutionPolicy(policy);
  *
- * CosmosAsyncDatabase database = client.createDatabase(databaseSettings).block().getDatabase();
+ * CosmosAsyncDatabase database = client.createDatabase(databaseProperties).block().getDatabase();
  * CosmosAsyncContainer container = database.createContainer(containerProperties).block().getContainer();
  *
  * }
@@ -58,7 +58,7 @@
  * ConflictResolutionPolicy policy = ConflictResolutionPolicy.createLastWriterWinsPolicy("/path/for/conflict/resolution");
  * containerProperties.setConflictResolutionPolicy(policy);
  *
- * CosmosAsyncDatabase database = client.createDatabase(databaseSettings).block().getDatabase();
+ * CosmosAsyncDatabase database = client.createDatabase(databaseProperties).block().getDatabase();
  * CosmosAsyncContainer container = database.createContainer(containerProperties).block().getContainer();
  *
  * }
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 861ef378b90a..5f4da391e0ba 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
@@ -153,8 +153,8 @@ public static  CosmosItemProperties getCosmosItemProperties(CosmosItemRespons
     }
 
     @Warning(value = INTERNAL_USE_ONLY_WARNING)
-    public static Permission getV2Permissions(CosmosPermissionProperties permissionSettings) {
-        return permissionSettings.getV2Permissions();
+    public static Permission getV2Permissions(CosmosPermissionProperties permissionProperties) {
+        return permissionProperties.getV2Permissions();
     }
 
     @Warning(value = INTERNAL_USE_ONLY_WARNING)