Revert Changes

Author: psainics

src/main/java/io/cdap/plugin/gcp/gcs/StorageClient.java

@@ -119,14 +119,7 @@ public void mapMetaDataForAllBlobs(String path, Consumer<Map<String, String>> fu
       return;
     }
     GCSPath gcsPath = GCSPath.from(path);
-    Page<Blob> blobPage;
-    try {
-      blobPage = storage.list(gcsPath.getBucket(), Storage.BlobListOption.prefix(gcsPath.getName()));
-    } catch (Exception e) {
-      String errorReason = String.format("Unable to list objects in bucket %s.", gcsPath.getBucket());
-      throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e, errorReason, ErrorType.UNKNOWN,
-        true, GCPUtils.GCS_SUPPORTED_DOC_URL);
-    }
+    Page<Blob> blobPage = storage.list(gcsPath.getBucket(), Storage.BlobListOption.prefix(gcsPath.getName()));
     Iterator<Blob> blobIterator = blobPage.iterateAll().iterator();
     while (blobIterator.hasNext()) {
       Blob blob = blobIterator.next();
@@ -244,7 +237,8 @@ static List<GCSPath> getFilterMatchedPaths(GCSPath sourcePath, List<String> blob
    */
   private void pairTraverse(GCSPath sourcePath, GCSPath destPath, boolean recursive, boolean overwrite,
                             Consumer<BlobPair> consumer) {
-    Bucket sourceBucket;
+
+    Bucket sourceBucket = null;
     try {
       sourceBucket = storage.get(sourcePath.getBucket());
     } catch (Exception e) {
@@ -258,7 +252,7 @@ private void pairTraverse(GCSPath sourcePath, GCSPath destPath, boolean recursiv
       throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN),
         errorReason, errorReason, ErrorType.USER, true, null);
     }
-    Bucket destBucket;
+    Bucket destBucket = null;
     try {
       destBucket = storage.get(destPath.getBucket());
     } catch (Exception e) {
@@ -276,45 +270,24 @@ private void pairTraverse(GCSPath sourcePath, GCSPath destPath, boolean recursiv
 
     boolean destinationBaseExists;
     String baseDestName = destPath.getName();
-    Blob storageBlob;
-     try {
-       storageBlob = storage.get(BlobId.of(destPath.getBucket(), baseDestName));
-     } catch (Exception e) {
-       String errorReason = String.format("Unable to access GCS object '%s'.", baseDestName);
-       throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e, errorReason, ErrorType.UNKNOWN,
-         true, GCPUtils.GCS_SUPPORTED_DOC_URL);
-     }
-    if (destPath.isBucket() || storageBlob != null) {
+    if (destPath.isBucket() || storage.get(BlobId.of(destPath.getBucket(), baseDestName)) != null) {
       destinationBaseExists = true;
     } else {
       // if gs://bucket2/subdir doesn't exist, check if gs://bucket2/subdir/ exists
       // similarly, if gs://bucket2/subdir/ doesn't exist, check if gs://bucket2/subdir exists
       // this is because "cp dir0 subdir" and "cp dir0 subdir/" are equivalent if the 'subdir' directory exists
       String modifiedName = baseDestName.endsWith("/") ?
         baseDestName.substring(0, baseDestName.length() - 1) : baseDestName + "/";
-      try {
-        destinationBaseExists = storage.get(BlobId.of(destPath.getBucket(), modifiedName)) != null;
-      } catch (Exception e) {
-        String errorReason = String.format("Unable to access GCS object '%s'.", modifiedName);
-        throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e, errorReason, ErrorType.UNKNOWN,
-          true, GCPUtils.GCS_SUPPORTED_DOC_URL);
-      }
+      destinationBaseExists = storage.get(BlobId.of(destPath.getBucket(), modifiedName)) != null;
     }
 
     List<BlobPair> copyList = new ArrayList<>();
     traverse(BlobId.of(sourcePath.getBucket(), sourcePath.getName()), recursive, sourceBlob -> {
       BlobId destBlobID = resolve(sourcePath.getName(), sourceBlob.getBlobId().getName(),
                                   destPath, destinationBaseExists);
       if (!overwrite) {
-        Blob destBlob;
-       try {
-         destBlob = storage.get(destBlobID);
-       } catch (Exception e) {
-         String errorReason = String.format("Unable to access GCS object '%s'.", destBlobID.getName());
-         throw GCPErrorDetailsProviderUtil.getHttpResponseExceptionDetailsFromChain(e, errorReason, ErrorType.UNKNOWN,
-           true, GCPUtils.GCS_SUPPORTED_DOC_URL);
-       }
-         // we can't just use Blob's isDirectory() because the cloud console will create a 'directory' by creating
+        Blob destBlob = storage.get(destBlobID);
+        // we can't just use Blob's isDirectory() because the cloud console will create a 'directory' by creating
         // a 0 size placeholder blob that ends with '/'. This placeholder blob's isDirectory() method returns false,
         // but we don't want the overwrite check to fail on it. So we explicitly ignore the check for these 0 size
         // placeholder blobs.