CosmosClientException update (#11311)

* CosmosClientException Update Co-authored-by: Annie Liang <xinlian@microsoft.com>
AzureSDKAutomation · May 20, 2020 · 2bb973b · 2bb973b
1 parent 87fff96
commit 2bb973b
Show file tree

Hide file tree

Showing 132 changed files with 661 additions and 868 deletions.
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
@@ -45,33 +45,33 @@
     <Field name="defaultEncryptionAlgorithm"/>
     <Bug pattern="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"/>
   </Match>
-  
+
   <!-- Defines native api, doesn't follow java style.-->
   <Match>
       <Class name="~com\.azure\.identity\.implementation\.WindowsCredentialApi(.+)"/>
       <Bug pattern="UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD,
       UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,
       NM_FIELD_NAMING_CONVENTION"/>
   </Match>
-  
+
   <!-- Exception needs to be caught here.-->
   <Match>
       <Class name="~com\.azure\.identity\.implementation\.VisualStudioCacheAccessor"/>
       <Bug pattern="REC_CATCH_EXCEPTION"/>
   </Match>
-  
+
   <!-- Exception needs to be caught here.-->
   <Match>
       <Class name="~com\.azure\.identity\.IntelliJCredential"/>
       <Bug pattern="REC_CATCH_EXCEPTION"/>
   </Match>
-  
+
   <!-- Accesses native api, doesn't follow java style.-->
   <Match>
       <Class name="~com\.azure\.identity\.implementation\.LinuxKeyRingAccessor(.+)"/>
       <Bug pattern="UWF_UNWRITTEN_FIELD"/>
   </Match>
-  
+
   <!-- Accesses native api, doesn't follow java style.-->
   <Match>
       <Class name="com.azure.identity.implementation.WindowsCredentialAccessor"/>
@@ -1215,28 +1215,28 @@
 
   <!-- Bug: https://github.com/Azure/azure-sdk-for-java/issues/9088 -->
   <Match>
-    <Class name="com.azure.cosmos.CosmosClientException"/>
+    <Class name="com.azure.cosmos.CosmosException"/>
     <Field name="cosmosError"/>
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
 
   <!-- Bug: https://github.com/Azure/azure-sdk-for-java/issues/9088 -->
   <Match>
-    <Class name="com.azure.cosmos.CosmosClientException"/>
+    <Class name="com.azure.cosmos.CosmosException"/>
     <Field name="cosmosDiagnostics"/>
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
 
   <!-- Bug: https://github.com/Azure/azure-sdk-for-java/issues/9088 -->
   <Match>
-    <Class name="com.azure.cosmos.CosmosClientException"/>
+    <Class name="com.azure.cosmos.CosmosException"/>
     <Field name="requestTimeline"/>
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
 
   <!-- Bug: https://github.com/Azure/azure-sdk-for-java/issues/9088 -->
   <Match>
-    <Class name="com.azure.cosmos.CosmosClientException"/>
+    <Class name="com.azure.cosmos.CosmosException"/>
     <Field name="requestUri"/>
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
@@ -2010,7 +2010,7 @@
     <Package name="~com\.azure\.management(\.[^.]+)*\.samples(\.[^.]+)*"/>
     <Bug pattern="REC_CATCH_EXCEPTION"/>
   </Match>
-  
+
   <!-- Exclude from spring related classes -->
   <Match>
     <Or>
@@ -2022,14 +2022,14 @@
                   RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE,
                   RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"/>
   </Match>
-  
-  
+
+
   <!-- These fields are designed to be not written. They are for deserializing. -->
   <Match>
       <Class name="com.azure.identity.implementation.LinuxKeyRingAccessor$GError"/>
       <Bug pattern="UWF_UNWRITTEN_FIELD"/>
   </Match>
-  
+
   <!-- These fields use File Reader with default encoding, java 8 doesn't support passing in encoding type. -->
   <Match>
       <Class name="com.azure.identity.implementation.IntelliJCacheAccessor"/>

diff --git a/...osmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java b/...osmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsynReadWithMultipleClients.java
@@ -9,7 +9,7 @@
 import com.azure.cosmos.CosmosAsyncContainer;
 import com.azure.cosmos.CosmosAsyncDatabase;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.DirectConnectionConfig;
 import com.azure.cosmos.GatewayConnectionConfig;
 import com.azure.cosmos.implementation.HttpConstants;
@@ -243,7 +243,7 @@ private void createClients() {
                     boolean databaseCreated = false;
                     try {
                         cosmosAsyncDatabase = asyncClient.getDatabase(this.configuration.getDatabaseId()).read().block().getDatabase();
-                    } catch (CosmosClientException e) {
+                    } catch (CosmosException e) {
                         if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                             cosmosAsyncDatabase = asyncClient.createDatabase(this.configuration.getDatabaseId()).block().getDatabase();
                             logger.info("Database {} is created for this test on host {}", this.configuration.getDatabaseId(), endpoint);
@@ -256,7 +256,7 @@ private void createClients() {
 
                     try {
                         cosmosAsyncContainer = cosmosAsyncDatabase.getContainer(this.configuration.getCollectionId()).read().block().getContainer();
-                    } catch (CosmosClientException e) {
+                    } catch (CosmosException e) {
                         if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                             cosmosAsyncContainer =
                                 cosmosAsyncDatabase.createContainer(this.configuration.getCollectionId(), Configuration.DEFAULT_PARTITION_KEY_PATH, this.configuration.getThroughput()).block().getContainer();

diff --git a/...osmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java b/...osmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java
@@ -9,7 +9,7 @@
 import com.azure.cosmos.CosmosAsyncContainer;
 import com.azure.cosmos.CosmosAsyncDatabase;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.DirectConnectionConfig;
 import com.azure.cosmos.GatewayConnectionConfig;
 import com.azure.cosmos.implementation.HttpConstants;
@@ -87,7 +87,7 @@ abstract class AsyncBenchmark<T> {
             ).read().doOnError(error ->
                 logger.error("Database {} creation failed due to ", this.configuration.getDatabaseId(), error)
             ).block().getDatabase();
-        } catch (CosmosClientException e) {
+        } catch (CosmosException e) {
             if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                 cosmosAsyncDatabase = cosmosClient.createDatabase(cfg.getDatabaseId()).block().getDatabase();
                 logger.info("Database {} is created for this test", this.configuration.getDatabaseId());
@@ -103,7 +103,7 @@ abstract class AsyncBenchmark<T> {
             ).read().doOnError(error ->
                 logger.error("Database {} creation failed due to ", this.configuration.getDatabaseId(), error)
             ).block().getContainer();
-        } catch (CosmosClientException e) {
+        } catch (CosmosException e) {
             if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                 cosmosAsyncContainer = cosmosAsyncDatabase.createContainer(
                     this.configuration.getCollectionId(),

diff --git a/...cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java b/...cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/SyncBenchmark.java
@@ -7,7 +7,7 @@
 import com.azure.cosmos.ConnectionMode;
 import com.azure.cosmos.CosmosClient;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.CosmosContainer;
 import com.azure.cosmos.CosmosDatabase;
 import com.azure.cosmos.DirectConnectionConfig;
@@ -120,7 +120,7 @@ public T apply(T o, Throwable throwable) {
         try {
             cosmosDatabase = cosmosClient.getDatabase(this.configuration.getDatabaseId()).read().getDatabase();
             logger.info("Database {} is created for this test", this.configuration.getDatabaseId());
-        } catch (CosmosClientException e) {
+        } catch (CosmosException e) {
             if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                 cosmosDatabase = cosmosClient.createDatabase(cfg.getDatabaseId()).getDatabase();
                 databaseCreated = true;
@@ -131,7 +131,7 @@ public T apply(T o, Throwable throwable) {
 
         try {
             cosmosContainer = cosmosDatabase.getContainer(this.configuration.getCollectionId()).read().getContainer();
-        } catch (CosmosClientException e) {
+        } catch (CosmosException e) {
             if (e.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
                 cosmosContainer = cosmosDatabase.createContainer(this.configuration.getCollectionId(), Configuration.DEFAULT_PARTITION_KEY_PATH, this.configuration.getThroughput()).getContainer();
                 logger.info("Collection {} is created for this test", this.configuration.getCollectionId());

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
@@ -7,7 +7,7 @@
 import com.azure.cosmos.CosmosAsyncDatabase;
 import com.azure.cosmos.models.CosmosAsyncItemResponse;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.models.CosmosContainerProperties;
 import com.azure.cosmos.util.CosmosPagedFlux;
 import com.azure.cosmos.models.FeedOptions;
@@ -146,8 +146,8 @@ private void log(Object object) {
     }
 
     private void log(String msg, Throwable throwable) {
-        if (throwable instanceof CosmosClientException) {
-            log(msg + ": " + ((CosmosClientException) throwable).getStatusCode());
+        if (throwable instanceof CosmosException) {
+            log(msg + ": " + ((CosmosException) throwable).getStatusCode());
         }
     }
 

diff --git a/...xamples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java b/...xamples/src/main/java/com/azure/cosmos/examples/ChangeFeed/SampleChangeFeedProcessor.java
@@ -9,7 +9,7 @@
 import com.azure.cosmos.models.CosmosAsyncContainerResponse;
 import com.azure.cosmos.CosmosAsyncDatabase;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.models.CosmosContainerProperties;
 import com.azure.cosmos.models.CosmosContainerRequestOptions;
 import com.azure.cosmos.implementation.CosmosItemProperties;
@@ -145,10 +145,10 @@ public static CosmosAsyncContainer createNewCollection(CosmosAsyncClient client,
                 throw new IllegalArgumentException(String.format("Collection %s already exists in database %s.", collectionName, databaseName));
             }
         } catch (RuntimeException ex) {
-            if (ex instanceof CosmosClientException) {
-                CosmosClientException cosmosClientException = (CosmosClientException) ex;
+            if (ex instanceof CosmosException) {
+                CosmosException cosmosException = (CosmosException) ex;
 
-                if (cosmosClientException.getStatusCode() != 404) {
+                if (cosmosException.getStatusCode() != 404) {
                     throw ex;
                 }
             } else {
@@ -187,10 +187,10 @@ public static CosmosAsyncContainer createNewLeaseCollection(CosmosAsyncClient cl
                 }
             }
         } catch (RuntimeException ex) {
-            if (ex instanceof CosmosClientException) {
-                CosmosClientException cosmosClientException = (CosmosClientException) ex;
+            if (ex instanceof CosmosException) {
+                CosmosException cosmosException = (CosmosException) ex;
 
-                if (cosmosClientException.getStatusCode() != 404) {
+                if (cosmosException.getStatusCode() != 404) {
                     throw ex;
                 }
             } else {

diff --git a/...azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/Helpers.java b/...azure-cosmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/Helpers.java
@@ -4,11 +4,10 @@
 package com.azure.cosmos.rx.examples.multimaster;
 
 import com.azure.cosmos.implementation.AsyncDocumentClient;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.implementation.Database;
 import com.azure.cosmos.implementation.DocumentCollection;
 import com.azure.cosmos.implementation.ResourceResponse;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public class Helpers {
@@ -26,8 +25,8 @@ static public Mono<Database> createDatabaseIfNotExists(AsyncDocumentClient clien
         return client.readDatabase("/dbs/" + databaseName, null)
                 .onErrorResume(
                         e -> {
-                            if (e instanceof CosmosClientException) {
-                                CosmosClientException dce = (CosmosClientException) e;
+                            if (e instanceof CosmosException) {
+                                CosmosException dce = (CosmosException) e;
                                 if (dce.getStatusCode() ==  404) {
                                     // if doesn't exist create it
 
@@ -47,8 +46,8 @@ static public Mono<DocumentCollection> createCollectionIfNotExists(AsyncDocument
         return client.readCollection(createDocumentCollectionUri(databaseName, collectionName), null)
                 .onErrorResume(
                         e -> {
-                            if (e instanceof CosmosClientException) {
-                                CosmosClientException dce = (CosmosClientException) e;
+                            if (e instanceof CosmosException) {
+                                CosmosException dce = (CosmosException) e;
                                 if (dce.getStatusCode() ==  404) {
                                     // if doesn't exist create it
 
@@ -68,8 +67,8 @@ static public Mono<DocumentCollection> createCollectionIfNotExists(AsyncDocument
         return client.readCollection(createDocumentCollectionUri(databaseName, collection.getId()), null)
                 .onErrorResume(
                         e -> {
-                            if (e instanceof CosmosClientException) {
-                                CosmosClientException dce = (CosmosClientException) e;
+                            if (e instanceof CosmosException) {
+                                CosmosException dce = (CosmosException) e;
                                 if (dce.getStatusCode() ==  404) {
                                     // if doesn't exist create it
 

diff --git a/...amples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/ConflictWorker.java b/...amples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/ConflictWorker.java
@@ -5,7 +5,7 @@
 
 import com.azure.cosmos.BridgeInternal;
 import com.azure.cosmos.models.ConflictResolutionPolicy;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.models.FeedResponse;
 import com.azure.cosmos.implementation.Resource;
 import com.azure.cosmos.implementation.AsyncDocumentClient;
@@ -491,8 +491,8 @@ private Mono<Document> tryInsertDocument(AsyncDocumentClient client, String coll
     }
 
     private boolean hasDocumentClientException(Throwable e, int statusCode) {
-        if (e instanceof CosmosClientException) {
-            CosmosClientException dce = (CosmosClientException) e;
+        if (e instanceof CosmosException) {
+            CosmosException dce = (CosmosException) e;
             return dce.getStatusCode() == statusCode;
         }
 
@@ -501,7 +501,7 @@ private boolean hasDocumentClientException(Throwable e, int statusCode) {
 
     private boolean hasDocumentClientExceptionCause(Throwable e) {
         while (e != null) {
-            if (e instanceof CosmosClientException) {
+            if (e instanceof CosmosException) {
                 return true;
             }
 
@@ -512,8 +512,8 @@ private boolean hasDocumentClientExceptionCause(Throwable e) {
 
     private boolean hasDocumentClientExceptionCause(Throwable e, int statusCode) {
         while (e != null) {
-            if (e instanceof CosmosClientException) {
-                CosmosClientException dce = (CosmosClientException) e;
+            if (e instanceof CosmosException) {
+                CosmosException dce = (CosmosException) e;
                 return dce.getStatusCode() == statusCode;
             }
 

diff --git a/...osmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Worker.java b/...osmos-examples/src/main/java/com/azure/cosmos/rx/examples/multimaster/samples/Worker.java
@@ -5,7 +5,7 @@
 
 
 import com.azure.cosmos.implementation.AsyncDocumentClient;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.implementation.Document;
 import com.azure.cosmos.models.FeedOptions;
 import com.azure.cosmos.models.FeedResponse;
@@ -136,7 +136,7 @@ void deleteAll() {
                 this.client.deleteDocument(document.getSelfLink(), null)
                         .subscribeOn(schedulerForBlockingWork).single().block();
             } catch (RuntimeException exEx) {
-                CosmosClientException dce = getDocumentClientExceptionCause(exEx);
+                CosmosException dce = getDocumentClientExceptionCause(exEx);
 
                 if (dce.getStatusCode() != 404) {
                     logger.info("Error occurred while deleting {} from {}", dce, client.getWriteEndpoint());
@@ -147,11 +147,11 @@ void deleteAll() {
         logger.info("Deleted all documents from region {}", this.client.getWriteEndpoint());
     }
 
-    private CosmosClientException getDocumentClientExceptionCause(Throwable e) {
+    private CosmosException getDocumentClientExceptionCause(Throwable e) {
         while (e != null) {
 
-            if (e instanceof CosmosClientException) {
-                return (CosmosClientException) e;
+            if (e instanceof CosmosException) {
+                return (CosmosException) e;
             }
 
             e = e.getCause();

diff --git a/...osmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java b/...osmos-examples/src/test/java/com/azure/cosmos/rx/examples/CollectionCRUDAsyncAPITest.java
@@ -2,19 +2,16 @@
 // Licensed under the MIT License.
 package com.azure.cosmos.rx.examples;
 
-import com.azure.cosmos.BridgeInternal;
-import com.azure.cosmos.ConnectionMode;
 import com.azure.cosmos.DirectConnectionConfig;
 import com.azure.cosmos.implementation.ConnectionPolicy;
 import com.azure.cosmos.ConsistencyLevel;
-import com.azure.cosmos.CosmosClientException;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.models.DataType;
 import com.azure.cosmos.DocumentClientTest;
 import com.azure.cosmos.models.FeedResponse;
 import com.azure.cosmos.models.IncludedPath;
 import com.azure.cosmos.models.Index;
 import com.azure.cosmos.models.IndexingPolicy;
-import com.azure.cosmos.models.ModelBridgeInternal;
 import com.azure.cosmos.models.PartitionKeyDefinition;
 import com.azure.cosmos.implementation.AsyncDocumentClient;
 import com.azure.cosmos.implementation.Database;
@@ -30,7 +27,6 @@
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -236,7 +232,7 @@ public void createCollection_toBlocking_CollectionAlreadyExists_Fails() {
             collectionForTestObservable.single() // Gets the single result
                     .block(); // Blocks
             assertThat("Should not reach here", false);
-        } catch (CosmosClientException e) {
+        } catch (CosmosException e) {
             assertThat("Collection already exists.", e.getStatusCode(),
                        equalTo(409));
         }