Skip to content

Commit 3dc33bb

Browse files
committed
---
yaml --- r: 6405 b: refs/heads/tswast-patch-1 c: 46b60df h: refs/heads/master i: 6403: 0c830d0
1 parent d368633 commit 3dc33bb

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

  • branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: ba4bfa6017b39800abfda831ee071664802e6186
60+
refs/heads/tswast-patch-1: 46b60df4a132b669bb8752bc7bf02bd5f24c57d1
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Storage.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,11 @@ String entry() {
7373
}
7474
}
7575

76-
public static abstract class EntityField {
77-
78-
private final String selector;
79-
80-
public EntityField(String selector) {
81-
this.selector = selector;
82-
}
83-
84-
public String selector() {
85-
return selector;
86-
}
87-
}
88-
8976
enum BucketField {
9077
ID("id"),
9178
SELF_LINK("selfLink"),
9279
NAME("name"),
9380
TIME_CREATED("timeCreated"),
94-
UPDATED("updated"),
9581
METAGENERATION("metageneration"),
9682
ACL("acl"),
9783
DEFAULT_OBJECT_ACL("defaultObjectAcl"),
@@ -114,7 +100,7 @@ public String selector() {
114100
}
115101

116102
static String selector(BucketField... fields) {
117-
HashSet<String> fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 2);
103+
HashSet<String> fieldStrings = Sets.newHashSetWithExpectedSize(fields.length + 1);
118104
fieldStrings.add(NAME.selector());
119105
for (BucketField field : fields) {
120106
fieldStrings.add(field.selector());
@@ -146,7 +132,6 @@ enum BlobField {
146132
SELF_LINK("selfLink"),
147133
SIZE("size"),
148134
STORAGE_CLASS("storageClass"),
149-
TIME_CREATED("timeCreated"),
150135
TIME_DELETED("timeDeleted"),
151136
UPDATED("updated");
152137

0 commit comments

Comments
 (0)