Move list object API to java storage.

GoogleCloudDataproc · Dec 19, 2023 · 611f17f · 611f17f
1 parent 0acb27a
commit 611f17f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageClientImpl.java b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageClientImpl.java
@@ -89,6 +89,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -108,7 +110,6 @@
  */
 @VisibleForTesting
 public class GoogleCloudStorageClientImpl extends ForwardingGoogleCloudStorage {
-
   private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
 
   // Maximum number of times to retry deletes in the case of precondition failures.
@@ -483,6 +484,8 @@ public List<GoogleCloudStorageItemInfo> listObjectInfo(
     } while (pageToken != null
         && getMaxRemainingResults(listOptions.getMaxResults(), objectInfos) > 0);
 
+    objectInfos.sort(Comparator.comparing(GoogleCloudStorageItemInfo::getObjectName));
+
     return objectInfos;
   }
 
@@ -563,8 +566,7 @@ && getMaxRemainingResults(listOptions.getMaxResults(), objectInfos) > 0) {
         objectInfos.add(createItemInfoForBlob(blob));
       } else if (blob.getName().equals(objectNamePrefix) && listOptions.isIncludePrefix()) {
         // Handle object prefixes. Object prefixes show up as non-directory.
-        objectInfos.add(
-            createInferredDirectory(new StorageResourceId(bucketName, blob.getName())));
+        objectInfos.add(createItemInfoForBlob(blob));
         objectPrefixIncluded = true;
       }
     }
@@ -630,11 +632,11 @@ private static GoogleCloudStorageItemInfo createItemInfoForBlob(Blob blob) {
     checkNotNull(blob, "object must not be null");
     checkArgument(!isNullOrEmpty(blob.getBucket()), "object must have a bucket: %s", blob);
     checkArgument(!isNullOrEmpty(blob.getName()), "object must have a name: %s", blob);
-    return createItemInfoForStorageBlob(new StorageResourceId(blob.getBucket(), blob.getName()),
+    return createItemInfoForBlob(new StorageResourceId(blob.getBucket(), blob.getName()),
         blob);
   }
 
-  private static GoogleCloudStorageItemInfo createItemInfoForStorageBlob(
+  private static GoogleCloudStorageItemInfo createItemInfoForBlob(
       StorageResourceId resourceId, Blob blob) {
     checkArgument(resourceId != null, "resourceId must not be null");
     checkArgument(blob != null, "object must not be null");
@@ -667,12 +669,13 @@ private static GoogleCloudStorageItemInfo createItemInfoForStorageBlob(
       md5Hash = BaseEncoding.base64().decode(blob.getMd5());
     }
 
-    // TODO : Replace the deprecated time fields.
     return GoogleCloudStorageItemInfo.createObject(
         resourceId,
-        blob.getCreateTime() == null ? 0 : blob.getCreateTime(),
-        blob.getUpdateTime() == null ? 0 : blob.getUpdateTime(),
-        blob.getSize() == null ? 0 : blob.getSize().longValue(),
+        blob.getCreateTimeOffsetDateTime() == null ? 0
+            : blob.getCreateTimeOffsetDateTime().toInstant().toEpochMilli(),
+        blob.getUpdateTimeOffsetDateTime() == null ? 0
+            : blob.getUpdateTimeOffsetDateTime().toInstant().toEpochMilli(),
+        blob.getSize() == null ? 0 : blob.getSize(),
         blob.getContentType(),
         blob.getContentEncoding(),
         decodedMetadata,