Skip to content

Commit eb98930

Browse files
committed
---
yaml --- r: 1827 b: refs/heads/pubsub-alpha c: 46b60df h: refs/heads/master i: 1825: 68d722f 1823: 30193bb
1 parent 704532c commit eb98930

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

  • branches/pubsub-alpha/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
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
6-
refs/heads/pubsub-alpha: ba4bfa6017b39800abfda831ee071664802e6186
6+
refs/heads/pubsub-alpha: 46b60df4a132b669bb8752bc7bf02bd5f24c57d1
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
88
refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

branches/pubsub-alpha/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)