throughputResponse) {
try {
return throughputResponse.block();
} catch (Exception ex) {
final Throwable throwable = Exceptions.unwrap(ex);
- if (throwable instanceof CosmosClientException) {
- throw (CosmosClientException) throwable;
+ if (throwable instanceof CosmosException) {
+ throw (CosmosException) throwable;
} else {
throw Exceptions.propagate(ex);
}
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosException.java
similarity index 81%
rename from sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java
rename to sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosException.java
index aa7d6ac543e5a..8f103fc03953a 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientException.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosException.java
@@ -8,7 +8,7 @@
import com.azure.cosmos.implementation.HttpConstants;
import com.azure.cosmos.implementation.RequestTimeline;
import com.azure.cosmos.implementation.directconnectivity.Uri;
-import com.azure.cosmos.models.CosmosError;
+import com.azure.cosmos.implementation.CosmosError;
import com.azure.cosmos.models.ModelBridgeInternal;
import com.azure.cosmos.implementation.apachecommons.lang.StringUtils;
@@ -21,20 +21,20 @@
/**
* This class defines a custom exception type for all operations on
* CosmosClient in the Azure Cosmos DB database service. Applications are
- * expected to catch CosmosClientException and handle errors as appropriate when
+ * expected to catch CosmosException and handle errors as appropriate when
* calling methods on CosmosClient.
*
* Errors coming from the service during normal execution are converted to
- * CosmosClientException before returning to the application with the following
+ * CosmosException before returning to the application with the following
* exception:
*
* When a BE error is encountered during a QueryIterable<T> iteration, an
- * IllegalStateException is thrown instead of CosmosClientException.
+ * IllegalStateException is thrown instead of CosmosException.
*
* When a transport level error happens that request is not able to reach the
- * service, an IllegalStateException is thrown instead of CosmosClientException.
+ * service, an IllegalStateException is thrown instead of CosmosException.
*/
-public class CosmosClientException extends AzureException {
+public class CosmosException extends AzureException {
private static final long serialVersionUID = 1L;
private final int statusCode;
@@ -50,7 +50,7 @@ public class CosmosClientException extends AzureException {
Uri requestUri;
String resourceAddress;
- protected CosmosClientException(int statusCode, String message, Map responseHeaders, Throwable cause) {
+ protected CosmosException(int statusCode, String message, Map responseHeaders, Throwable cause) {
super(message, cause);
this.statusCode = statusCode;
this.requestTimeline = RequestTimeline.empty();
@@ -58,49 +58,49 @@ protected CosmosClientException(int statusCode, String message, Map responseHeaders) {
+ protected CosmosException(int statusCode, CosmosError cosmosErrorResource, Map responseHeaders) {
this(/* resourceAddress */ null, statusCode, cosmosErrorResource, responseHeaders);
}
/**
- * Creates a new instance of the CosmosClientException class.
+ * Creates a new instance of the CosmosException class.
*
* @param resourceAddress the address of the resource the request is associated with.
* @param statusCode the http status code of the response.
@@ -108,17 +108,17 @@ protected CosmosClientException(int statusCode, CosmosError cosmosErrorResource,
* @param responseHeaders the response headers.
*/
- protected CosmosClientException(String resourceAddress,
- int statusCode,
- CosmosError cosmosErrorResource,
- Map responseHeaders) {
+ protected CosmosException(String resourceAddress,
+ int statusCode,
+ CosmosError cosmosErrorResource,
+ Map responseHeaders) {
this(statusCode, cosmosErrorResource == null ? null : cosmosErrorResource.getMessage(), responseHeaders, null);
this.resourceAddress = resourceAddress;
this.cosmosError = cosmosErrorResource;
}
/**
- * Creates a new instance of the CosmosClientException class.
+ * Creates a new instance of the CosmosException class.
*
* @param message the string message.
* @param statusCode the http status code of the response.
@@ -126,8 +126,8 @@ protected CosmosClientException(String resourceAddress,
* @param responseHeaders the response headers.
* @param resourceAddress the address of the resource the request is associated with.
*/
- protected CosmosClientException(String message, Exception exception, Map responseHeaders, int statusCode,
- String resourceAddress) {
+ protected CosmosException(String message, Exception exception, Map responseHeaders, int statusCode,
+ String resourceAddress) {
this(statusCode, message, responseHeaders, exception);
this.resourceAddress = resourceAddress;
}
@@ -188,7 +188,7 @@ public int getSubStatusCode() {
*
* @return the error.
*/
- public CosmosError getError() {
+ CosmosError getError() {
return this.cosmosError;
}
@@ -251,7 +251,7 @@ public CosmosDiagnostics getDiagnostics() {
return cosmosDiagnostics;
}
- CosmosClientException setDiagnostics(CosmosDiagnostics cosmosDiagnostics) {
+ CosmosException setDiagnostics(CosmosDiagnostics cosmosDiagnostics) {
this.cosmosDiagnostics = cosmosDiagnostics;
return this;
}
@@ -270,7 +270,7 @@ String innerErrorMessage() {
innerErrorMessage = cosmosError.getMessage();
if (innerErrorMessage == null) {
innerErrorMessage = String.valueOf(
- ModelBridgeInternal.getObjectFromJsonSerializable(ModelBridgeInternal.getJsonSerializable(cosmosError), "Errors"));
+ ModelBridgeInternal.getObjectFromJsonSerializable(cosmosError, "Errors"));
}
}
return innerErrorMessage;
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 b3eb7a8d45532..14ad8b8371b63 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
@@ -46,10 +46,8 @@ public class CosmosScripts {
*
* @param properties the properties
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosStoredProcedureResponse createStoredProcedure(CosmosStoredProcedureProperties properties) throws
- CosmosClientException {
+ public CosmosStoredProcedureResponse createStoredProcedure(CosmosStoredProcedureProperties properties) {
return mapStoredProcedureResponseAndBlock(
asyncScripts.createStoredProcedure(properties, new CosmosStoredProcedureRequestOptions())
);
@@ -61,11 +59,10 @@ public CosmosStoredProcedureResponse createStoredProcedure(CosmosStoredProcedure
* @param properties the properties
* @param options the options
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
public CosmosStoredProcedureResponse createStoredProcedure(
CosmosStoredProcedureProperties properties,
- CosmosStoredProcedureRequestOptions options) throws CosmosClientException {
+ CosmosStoredProcedureRequestOptions options) {
return mapStoredProcedureResponseAndBlock(asyncScripts.createStoredProcedure(properties,
options));
}
@@ -127,10 +124,8 @@ public CosmosStoredProcedure getStoredProcedure(String id) {
*
* @param properties the properties
* @return the cosmos sync user defined function response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosUserDefinedFunctionResponse createUserDefinedFunction(CosmosUserDefinedFunctionProperties properties)
- throws CosmosClientException {
+ public CosmosUserDefinedFunctionResponse createUserDefinedFunction(CosmosUserDefinedFunctionProperties properties) {
return mapUDFResponseAndBlock(asyncScripts.createUserDefinedFunction(properties));
}
@@ -190,9 +185,8 @@ public CosmosUserDefinedFunction getUserDefinedFunction(String id) {
*
* @param properties the properties
* @return the cosmos sync trigger response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosTriggerResponse createTrigger(CosmosTriggerProperties properties) throws CosmosClientException {
+ public CosmosTriggerResponse createTrigger(CosmosTriggerProperties properties) {
return mapTriggerResponseAndBlock(asyncScripts.createTrigger(properties));
}
@@ -247,18 +241,17 @@ public CosmosTrigger getTrigger(String id) {
*
* @param storedProcedureResponseMono the stored procedure response mono
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
CosmosStoredProcedureResponse mapStoredProcedureResponseAndBlock(
- Mono storedProcedureResponseMono) throws CosmosClientException {
+ Mono storedProcedureResponseMono) {
try {
return storedProcedureResponseMono
.map(this::convertResponse)
.block();
} catch (Exception ex) {
final Throwable throwable = Exceptions.unwrap(ex);
- if (throwable instanceof CosmosClientException) {
- throw (CosmosClientException) throwable;
+ if (throwable instanceof CosmosException) {
+ throw (CosmosException) throwable;
} else {
throw ex;
}
@@ -284,18 +277,17 @@ CosmosStoredProcedureResponse convertResponse(CosmosAsyncStoredProcedureResponse
*
* @param responseMono the response mono
* @return the cosmos sync user defined function response
- * @throws CosmosClientException the cosmos client exception
*/
CosmosUserDefinedFunctionResponse mapUDFResponseAndBlock(
- Mono responseMono) throws CosmosClientException {
+ Mono responseMono) {
try {
return responseMono
.map(this::convertResponse)
.block();
} catch (Exception ex) {
final Throwable throwable = Exceptions.unwrap(ex);
- if (throwable instanceof CosmosClientException) {
- throw (CosmosClientException) throwable;
+ if (throwable instanceof CosmosException) {
+ throw (CosmosException) throwable;
} else {
throw Exceptions.propagate(ex);
}
@@ -325,18 +317,16 @@ CosmosUserDefinedFunctionResponse convertResponse(CosmosAsyncUserDefinedFunction
*
* @param responseMono the response mono
* @return the cosmos sync trigger response
- * @throws CosmosClientException the cosmos client exception
*/
- CosmosTriggerResponse mapTriggerResponseAndBlock(Mono responseMono) throws
- CosmosClientException {
+ CosmosTriggerResponse mapTriggerResponseAndBlock(Mono responseMono) {
try {
return responseMono
.map(this::convertResponse)
.block();
} catch (Exception ex) {
final Throwable throwable = Exceptions.unwrap(ex);
- if (throwable instanceof CosmosClientException) {
- throw (CosmosClientException) throwable;
+ if (throwable instanceof CosmosException) {
+ throw (CosmosException) throwable;
} else {
throw Exceptions.propagate(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 0307f25a7614c..7869978cca101 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
@@ -44,9 +44,8 @@ public String getId() {
* Read cosmos sync stored procedure.
*
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosStoredProcedureResponse read() throws CosmosClientException {
+ public CosmosStoredProcedureResponse read() {
return container.getScripts()
.mapStoredProcedureResponseAndBlock(storedProcedure.read());
}
@@ -56,10 +55,8 @@ public CosmosStoredProcedureResponse read() throws CosmosClientException {
*
* @param options the options
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosStoredProcedureResponse read(CosmosStoredProcedureRequestOptions options) throws
- CosmosClientException {
+ public CosmosStoredProcedureResponse read(CosmosStoredProcedureRequestOptions options) {
return container.getScripts()
.mapStoredProcedureResponseAndBlock(storedProcedure.read(options));
}
@@ -68,9 +65,8 @@ public CosmosStoredProcedureResponse read(CosmosStoredProcedureRequestOptions op
* Delete cosmos stored procedure.
*
* @return the cosmos sync response
- * @throws CosmosClientException the cosmos client exception
*/
- public CosmosStoredProcedureResponse delete() throws CosmosClientException {
+ public CosmosStoredProcedureResponse delete() {
return container.getScripts()
.mapStoredProcedureResponseAndBlock(storedProcedure.delete());
}
@@ -80,9 +76,8 @@ public CosmosStoredProcedureResponse delete() throws CosmosClientException {
*
* @param options the options
* @return the cosmos sync response
- * @throws CosmosClientException the cosmos client exception
*/
- CosmosStoredProcedureResponse delete(CosmosStoredProcedureRequestOptions options) throws CosmosClientException {
+ CosmosStoredProcedureResponse delete(CosmosStoredProcedureRequestOptions options) {
return container.getScripts()
.mapStoredProcedureResponseAndBlock(storedProcedure.delete(options));
}
@@ -93,11 +88,10 @@ CosmosStoredProcedureResponse delete(CosmosStoredProcedureRequestOptions options
* @param procedureParams the procedure params
* @param options the options
* @return the cosmos sync stored procedure response
- * @throws CosmosClientException the cosmos client exception
*/
public CosmosStoredProcedureResponse execute(
List