Skip to content

Commit 30f5171

Browse files
---
yaml --- r: 31873 b: refs/heads/autosynth-datastore c: 902874f h: refs/heads/master i: 31871: 4a369d7
1 parent d015533 commit 30f5171

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ refs/heads/autosynth-bigquerystorage: a345f72d7a6358e9fea9dcdae94ec85a27da3088
127127
refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
128128
refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
129129
refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
130-
refs/heads/autosynth-datastore: 909b0e8ef2d87a5d75da3ebfb595868a94645aae
130+
refs/heads/autosynth-datastore: 902874ff124128a9bc4a27e2f43a5951c743215d
131131
refs/heads/autosynth-dialogflow: 841930a680ebe370c9fc6ae824465f6bc51a5a46
132132
refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
133133
refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3

branches/autosynth-datastore/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ boolean seemsLikeADirectoryAndUsePseudoDirectories(Storage storage) {
108108
this.bucket(),
109109
Storage.BlobListOption.prefix(prefix),
110110
// we only look at the first result, so no need for a bigger page.
111-
Storage.BlobListOption.pageSize(1));
111+
Storage.BlobListOption.pageSize(1),
112+
fileSystem.provider().getProject() == null
113+
? null
114+
: Storage.BlobListOption.userProject(fileSystem.provider().getProject()));
112115
for (Blob b : list.getValues()) {
113116
// if this blob starts with our prefix and then a slash, then prefix is indeed a folder!
114117
if (b.getBlobId() == null) {

branches/autosynth-datastore/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>
145145
case MAX_RESULTS:
146146
maxResults = (Long) e.getValue();
147147
break;
148+
case USER_PROJECT:
149+
// prevent unsupported operation
150+
break;
148151
default:
149152
throw new UnsupportedOperationException("Unknown option: " + e.getKey());
150153
}

0 commit comments

Comments
 (0)