Skip to content

Commit 0a28868

Browse files
ludochludoch
committed
Merge pull request #86 from aozarov/master
rename Bucket to BucketInfo and Blob to BlobInfo
2 parents 1075d64 + 2f29ab7 commit 0a28868

File tree

15 files changed

+341
-339
lines changed

15 files changed

+341
-339
lines changed

‎gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchRequest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,39 @@ public final class BatchRequest implements Serializable {
3333

3434
private static final long serialVersionUID = -1527992265939800345L;
3535

36-
private final Map<Blob, Iterable<BlobSourceOption>> toDelete;
37-
private final Map<Blob, Iterable<BlobTargetOption>> toUpdate;
38-
private final Map<Blob, Iterable<BlobSourceOption>> toGet;
36+
private final Map<BlobInfo, Iterable<BlobSourceOption>> toDelete;
37+
private final Map<BlobInfo, Iterable<BlobTargetOption>> toUpdate;
38+
private final Map<BlobInfo, Iterable<BlobSourceOption>> toGet;
3939

4040
public static class Builder {
4141

42-
private Map<Blob, Iterable<BlobSourceOption>> toDelete = new LinkedHashMap<>();
43-
private Map<Blob, Iterable<BlobTargetOption>> toUpdate = new LinkedHashMap<>();
44-
private Map<Blob, Iterable<BlobSourceOption>> toGet = new LinkedHashMap<>();
42+
private Map<BlobInfo, Iterable<BlobSourceOption>> toDelete = new LinkedHashMap<>();
43+
private Map<BlobInfo, Iterable<BlobTargetOption>> toUpdate = new LinkedHashMap<>();
44+
private Map<BlobInfo, Iterable<BlobSourceOption>> toGet = new LinkedHashMap<>();
4545

4646
private Builder() {}
4747

4848
/**
4949
* Delete the given blob.
5050
*/
5151
public Builder delete(String bucket, String blob, BlobSourceOption... options) {
52-
toDelete.put(Blob.of(bucket, blob), Lists.newArrayList(options));
52+
toDelete.put(BlobInfo.of(bucket, blob), Lists.newArrayList(options));
5353
return this;
5454
}
5555

5656
/**
5757
* Update the given blob.
5858
*/
59-
public Builder update(Blob blob, BlobTargetOption... options) {
60-
toUpdate.put(blob, Lists.newArrayList(options));
59+
public Builder update(BlobInfo blobInfo, BlobTargetOption... options) {
60+
toUpdate.put(blobInfo, Lists.newArrayList(options));
6161
return this;
6262
}
6363

6464
/**
6565
* Retrieve metadata for the given blob.
6666
*/
6767
public Builder get(String bucket, String blob, BlobSourceOption... options) {
68-
toGet.put(Blob.of(bucket, blob), Lists.newArrayList(options));
68+
toGet.put(BlobInfo.of(bucket, blob), Lists.newArrayList(options));
6969
return this;
7070
}
7171

@@ -96,15 +96,15 @@ public boolean equals(Object obj) {
9696
&& Objects.equals(toGet, other.toGet);
9797
}
9898

99-
public Map<Blob, Iterable<BlobSourceOption>> toDelete() {
99+
public Map<BlobInfo, Iterable<BlobSourceOption>> toDelete() {
100100
return toDelete;
101101
}
102102

103-
public Map<Blob, Iterable<BlobTargetOption>> toUpdate() {
103+
public Map<BlobInfo, Iterable<BlobTargetOption>> toUpdate() {
104104
return toUpdate;
105105
}
106106

107-
public Map<Blob, Iterable<BlobSourceOption>> toGet() {
107+
public Map<BlobInfo, Iterable<BlobSourceOption>> toGet() {
108108
return toGet;
109109
}
110110

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public final class BatchResponse implements Serializable {
3131
private static final long serialVersionUID = 1057416839397037706L;
3232

3333
private final List<Result<Boolean>> deleteResult;
34-
private final List<Result<Blob>> updateResult;
35-
private final List<Result<Blob>> getResult;
34+
private final List<Result<BlobInfo>> updateResult;
35+
private final List<Result<BlobInfo>> getResult;
3636

3737
public static class Result<T extends Serializable> implements Serializable {
3838

@@ -112,8 +112,8 @@ static <T extends Serializable> Result<T> empty() {
112112
}
113113
}
114114

115-
public BatchResponse(List<Result<Boolean>> deleteResult, List<Result<Blob>> updateResult,
116-
List<Result<Blob>> getResult) {
115+
public BatchResponse(List<Result<Boolean>> deleteResult, List<Result<BlobInfo>> updateResult,
116+
List<Result<BlobInfo>> getResult) {
117117
this.deleteResult = ImmutableList.copyOf(deleteResult);
118118
this.updateResult = ImmutableList.copyOf(updateResult);
119119
this.getResult = ImmutableList.copyOf(getResult);
@@ -145,14 +145,14 @@ public List<Result<Boolean>> deletes() {
145145
/**
146146
* Returns the results for the update operations using the request order.
147147
*/
148-
public List<Result<Blob>> updates() {
148+
public List<Result<BlobInfo>> updates() {
149149
return updateResult;
150150
}
151151

152152
/**
153153
* Returns the results for the get operations using the request order.
154154
*/
155-
public List<Result<Blob>> gets() {
155+
public List<Result<BlobInfo>> gets() {
156156
return getResult;
157157
}
158158
}

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java renamed to ‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,25 @@
4141
*
4242
* @see <a href="https://cloud.google.com/storage/docs/concepts-techniques#concepts">Concepts and Terminology</a>
4343
*/
44-
public final class Blob implements Serializable {
44+
public final class BlobInfo implements Serializable {
4545

4646
private static final long serialVersionUID = 2228487739943277159L;
4747

48-
static final Function<StorageObject, Blob> FROM_PB_FUNCTION =
49-
new Function<StorageObject, Blob>() {
48+
static final Function<StorageObject, BlobInfo> FROM_PB_FUNCTION =
49+
new Function<StorageObject, BlobInfo>() {
5050
@Override
51-
public Blob apply(StorageObject pb) {
52-
return Blob.fromPb(pb);
51+
public BlobInfo apply(StorageObject pb) {
52+
return BlobInfo.fromPb(pb);
5353
}
5454
};
5555

56-
static final Function<Blob, StorageObject> TO_PB_FUNCTION = new Function<Blob, StorageObject>() {
57-
@Override
58-
public StorageObject apply(Blob blob) {
59-
return blob.toPb();
60-
}
61-
};
56+
static final Function<BlobInfo, StorageObject> TO_PB_FUNCTION =
57+
new Function<BlobInfo, StorageObject>() {
58+
@Override
59+
public StorageObject apply(BlobInfo blobInfo) {
60+
return blobInfo.toPb();
61+
}
62+
};
6263

6364
private final String bucket;
6465
private final String id;
@@ -220,14 +221,14 @@ Builder updateTime(Long updateTime) {
220221
return this;
221222
}
222223

223-
public Blob build() {
224+
public BlobInfo build() {
224225
checkNotNull(bucket);
225226
checkNotNull(name);
226-
return new Blob(this);
227+
return new BlobInfo(this);
227228
}
228229
}
229230

230-
private Blob(Builder builder) {
231+
private BlobInfo(Builder builder) {
231232
bucket = builder.bucket;
232233
name = builder.name;
233234
id = builder.id;
@@ -377,12 +378,12 @@ public String toString() {
377378
.toString();
378379
}
379380

380-
public static Blob of(String bucket, String name) {
381+
public static BlobInfo of(String bucket, String name) {
381382
return builder(bucket, name).build();
382383
}
383384

384-
public static Builder builder(Bucket bucket, String name) {
385-
return builder(bucket.name(), name);
385+
public static Builder builder(BucketInfo bucketInfo, String name) {
386+
return builder(bucketInfo.name(), name);
386387
}
387388

388389
public static Builder builder(String bucket, String name) {
@@ -396,10 +397,10 @@ public int hashCode() {
396397

397398
@Override
398399
public boolean equals(Object obj) {
399-
if (!(obj instanceof Blob)) {
400+
if (!(obj instanceof BlobInfo)) {
400401
return false;
401402
}
402-
return Objects.equals(toPb(), ((Blob) obj).toPb());
403+
return Objects.equals(toPb(), ((BlobInfo) obj).toPb());
403404
}
404405

405406
StorageObject toPb() {
@@ -444,7 +445,7 @@ public ObjectAccessControl apply(Acl acl) {
444445
return storageObject;
445446
}
446447

447-
static Blob fromPb(StorageObject storageObject) {
448+
static BlobInfo fromPb(StorageObject storageObject) {
448449
Builder builder = new Builder()
449450
.bucket(storageObject.getBucket())
450451
.cacheControl(storageObject.getCacheControl())

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannelImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BlobReadChannelImpl implements BlobReadChannel {
3737
private static final long serialVersionUID = 4821762590742862669L;
3838

3939
private final StorageOptions serviceOptions;
40-
private final Blob blob;
40+
private final BlobInfo blobInfo;
4141
private final Map<StorageRpc.Option, ?> requestOptions;
4242
private int position;
4343
private boolean isOpen;
@@ -49,10 +49,10 @@ class BlobReadChannelImpl implements BlobReadChannel {
4949
private transient int bufferPos;
5050
private transient byte[] buffer;
5151

52-
BlobReadChannelImpl(StorageOptions serviceOptions, Blob blob,
52+
BlobReadChannelImpl(StorageOptions serviceOptions, BlobInfo blobInfo,
5353
Map<StorageRpc.Option, ?> requestOptions) {
5454
this.serviceOptions = serviceOptions;
55-
this.blob = blob;
55+
this.blobInfo = blobInfo;
5656
this.requestOptions = requestOptions;
5757
isOpen = true;
5858
initTransients();
@@ -75,7 +75,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
7575

7676
private void initTransients() {
7777
storageRpc = serviceOptions.storageRpc();
78-
storageObject = blob.toPb();
78+
storageObject = blobInfo.toPb();
7979
}
8080

8181
@Override

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobWriterChannelImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class BlobWriterChannelImpl implements BlobWriteChannel {
3939
private static final int DEFAULT_CHUNK_SIZE = 8 * MIN_CHUNK_SIZE;
4040

4141
private final StorageOptions options;
42-
private final Blob blob;
42+
private final BlobInfo blobInfo;
4343
private final String uploadId;
4444
private int position;
4545
private byte[] buffer = new byte[0];
@@ -50,10 +50,10 @@ class BlobWriterChannelImpl implements BlobWriteChannel {
5050
private transient StorageRpc storageRpc;
5151
private transient StorageObject storageObject;
5252

53-
public BlobWriterChannelImpl(StorageOptions options, Blob blob,
53+
public BlobWriterChannelImpl(StorageOptions options, BlobInfo blobInfo,
5454
Map<StorageRpc.Option, ?> optionsMap) {
5555
this.options = options;
56-
this.blob = blob;
56+
this.blobInfo = blobInfo;
5757
initTransients();
5858
uploadId = options.storageRpc().open(storageObject, optionsMap);
5959
}
@@ -91,7 +91,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
9191

9292
private void initTransients() {
9393
storageRpc = options.storageRpc();
94-
storageObject = blob.toPb();
94+
storageObject = blobInfo.toPb();
9595
}
9696

9797
private void validateOpen() throws IOException {

‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java renamed to ‎gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
*
4949
* @see <a href="https://cloud.google.com/storage/docs/concepts-techniques#concepts">Concepts and Terminology</a>
5050
*/
51-
public final class Bucket implements Serializable {
51+
public final class BucketInfo implements Serializable {
5252

5353
private static final long serialVersionUID = -3946094202176916586L;
5454

@@ -69,19 +69,19 @@ public final class Bucket implements Serializable {
6969
private final Location location;
7070
private final StorageClass storageClass;
7171

72-
static final Function<com.google.api.services.storage.model.Bucket, Bucket> FROM_PB_FUNCTION =
73-
new Function<com.google.api.services.storage.model.Bucket, Bucket>() {
72+
static final Function<com.google.api.services.storage.model.Bucket, BucketInfo> FROM_PB_FUNCTION =
73+
new Function<com.google.api.services.storage.model.Bucket, BucketInfo>() {
7474
@Override
75-
public Bucket apply(com.google.api.services.storage.model.Bucket pb) {
76-
return Bucket.fromPb(pb);
75+
public BucketInfo apply(com.google.api.services.storage.model.Bucket pb) {
76+
return BucketInfo.fromPb(pb);
7777
}
7878
};
7979

80-
static final Function<Bucket, com.google.api.services.storage.model.Bucket> TO_PB_FUNCTION =
81-
new Function<Bucket, com.google.api.services.storage.model.Bucket>() {
80+
static final Function<BucketInfo, com.google.api.services.storage.model.Bucket> TO_PB_FUNCTION =
81+
new Function<BucketInfo, com.google.api.services.storage.model.Bucket>() {
8282
@Override
83-
public com.google.api.services.storage.model.Bucket apply(Bucket bucket) {
84-
return bucket.toPb();
83+
public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo) {
84+
return bucketInfo.toPb();
8585
}
8686
};
8787

@@ -491,13 +491,13 @@ public Builder defaultAcl(Iterable<Acl> acl) {
491491
return this;
492492
}
493493

494-
public Bucket build() {
494+
public BucketInfo build() {
495495
checkNotNull(name);
496-
return new Bucket(this);
496+
return new BucketInfo(this);
497497
}
498498
}
499499

500-
private Bucket(Builder builder) {
500+
private BucketInfo(Builder builder) {
501501
id = builder.id;
502502
name = builder.name;
503503
etag = builder.etag;
@@ -607,10 +607,10 @@ public int hashCode() {
607607

608608
@Override
609609
public boolean equals(Object obj) {
610-
if (!(obj instanceof Bucket)) {
610+
if (!(obj instanceof BucketInfo)) {
611611
return false;
612612
}
613-
return Objects.equals(toPb(), ((Bucket) obj).toPb());
613+
return Objects.equals(toPb(), ((BucketInfo) obj).toPb());
614614
}
615615

616616
@Override
@@ -620,7 +620,7 @@ public String toString() {
620620
.toString();
621621
}
622622

623-
public static Bucket of(String name) {
623+
public static BucketInfo of(String name) {
624624
return builder(name).build();
625625
}
626626

@@ -691,7 +691,7 @@ public Rule apply(DeleteRule deleteRule) {
691691
return bucketPb;
692692
}
693693

694-
static Bucket fromPb(com.google.api.services.storage.model.Bucket bucketPb) {
694+
static BucketInfo fromPb(com.google.api.services.storage.model.Bucket bucketPb) {
695695
Builder builder = new Builder()
696696
.name(bucketPb.getName())
697697
.id(bucketPb.getId())

0 commit comments

Comments
 (0)