Consolidate behavior of options (#13339)

Azure · Jul 20, 2020 · 8355cc5 · 8355cc5
1 parent 588ac7b
commit 8355cc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...re-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java b/...re-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobAsyncClientBase.java
@@ -1374,7 +1374,7 @@ public Mono<Response<Map<String, String>>> getTagsWithResponse(BlobGetTagsOption
     }
 
     Mono<Response<Map<String, String>>> getTagsWithResponse(BlobGetTagsOptions options, Context context) {
-        StorageImplUtils.assertNotNull("options", options);
+        options = (options == null) ? new BlobGetTagsOptions() : options;
         BlobRequestConditions requestConditions = (options.getRequestConditions() == null)
             ? new BlobRequestConditions() : options.getRequestConditions();
         return this.azureBlobStorage.blobs().getTagsWithRestResponseAsync(null, null, null, null, snapshot,

diff --git a/...e-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobLeaseAsyncClient.java b/...e-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobLeaseAsyncClient.java
@@ -241,7 +241,7 @@ public Mono<Response<String>> renewLeaseWithResponse(BlobRenewLeaseOptions optio
     }
 
     Mono<Response<String>> renewLeaseWithResponse(BlobRenewLeaseOptions options, Context context) {
-        StorageImplUtils.assertNotNull("options", options);
+        options = (options == null) ? new BlobRenewLeaseOptions() : options;
         BlobLeaseRequestConditions requestConditions = (options.getRequestConditions() == null)
             ? new BlobLeaseRequestConditions() : options.getRequestConditions();
         context = context == null ? Context.NONE : context;
@@ -321,7 +321,7 @@ public Mono<Response<Void>> releaseLeaseWithResponse(BlobReleaseLeaseOptions opt
     }
 
     Mono<Response<Void>> releaseLeaseWithResponse(BlobReleaseLeaseOptions options, Context context) {
-        StorageImplUtils.assertNotNull("options", options);
+        options = (options == null) ? new BlobReleaseLeaseOptions() : options;
         BlobLeaseRequestConditions requestConditions = (options.getRequestConditions() == null)
             ? new BlobLeaseRequestConditions() : options.getRequestConditions();
         context = context == null ? Context.NONE : context;
@@ -414,7 +414,7 @@ public Mono<Response<Integer>> breakLeaseWithResponse(BlobBreakLeaseOptions opti
     }
 
     Mono<Response<Integer>> breakLeaseWithResponse(BlobBreakLeaseOptions options, Context context) {
-        StorageImplUtils.assertNotNull("options", options);
+        options = (options == null) ? new BlobBreakLeaseOptions() : options;
         BlobLeaseRequestConditions requestConditions = (options.getRequestConditions() == null)
             ? new BlobLeaseRequestConditions() : options.getRequestConditions();
         context = context == null ? Context.NONE : context;