Skip to content

Commit 3ce8539

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 6893 b: refs/heads/tswast-patch-1 c: 6870eb7 h: refs/heads/master i: 6891: 640797f
1 parent 247ea41 commit 3ce8539

7 files changed

Lines changed: 123 additions & 54 deletions

File tree

‎[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: aa0e37752f9f360bb87d108158a597eb8ccf479c
60+
refs/heads/tswast-patch-1: 6870eb7a5f21d78d5f067a0f43cf6140c3211e60
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,6 @@ public Project build() {
124124
this.options = resourceManager.options();
125125
}
126126

127-
/**
128-
* Constructs a Project object that contains project information got from the server.
129-
*
130-
* @return Project object containing the project's metadata or {@code null} if not found
131-
* @throws ResourceManagerException upon failure
132-
*/
133-
public static Project get(ResourceManager resourceManager, String projectId) {
134-
return resourceManager.get(projectId);
135-
}
136-
137127
/**
138128
* Returns the {@link ResourceManager} service object associated with this Project.
139129
*/
@@ -149,7 +139,7 @@ public ResourceManager resourceManager() {
149139
* @throws ResourceManagerException upon failure
150140
*/
151141
public Project reload() {
152-
return Project.get(resourceManager, projectId());
142+
return resourceManager.get(projectId());
153143
}
154144

155145
/**
@@ -210,10 +200,6 @@ public Project replace() {
210200
return resourceManager.replace(this);
211201
}
212202

213-
static Builder builder(ResourceManager resourceManager, String projectId) {
214-
return new Builder(resourceManager).projectId(projectId);
215-
}
216-
217203
@Override
218204
public Builder toBuilder() {
219205
return new Builder(this);

‎branches/tswast-patch-1/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import static org.easymock.EasyMock.verify;
2525
import static org.junit.Assert.assertEquals;
2626
import static org.junit.Assert.assertNull;
27-
import static org.junit.Assert.assertSame;
2827

2928
import com.google.common.collect.ImmutableMap;
3029

@@ -71,26 +70,6 @@ private void initializeProject() {
7170
project = new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_INFO));
7271
}
7372

74-
@Test
75-
public void testBuilder() {
76-
initializeExpectedProject(2);
77-
replay(resourceManager);
78-
Project builtProject = Project.builder(serviceMockReturnsOptions, PROJECT_ID)
79-
.name(NAME)
80-
.labels(LABELS)
81-
.projectNumber(PROJECT_NUMBER)
82-
.createTimeMillis(CREATE_TIME_MILLIS)
83-
.state(STATE)
84-
.build();
85-
assertEquals(PROJECT_ID, builtProject.projectId());
86-
assertEquals(NAME, builtProject.name());
87-
assertEquals(LABELS, builtProject.labels());
88-
assertEquals(PROJECT_NUMBER, builtProject.projectNumber());
89-
assertEquals(CREATE_TIME_MILLIS, builtProject.createTimeMillis());
90-
assertEquals(STATE, builtProject.state());
91-
assertSame(serviceMockReturnsOptions, builtProject.resourceManager());
92-
}
93-
9473
@Test
9574
public void testToBuilder() {
9675
initializeExpectedProject(4);
@@ -103,7 +82,7 @@ public void testGet() {
10382
initializeExpectedProject(1);
10483
expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(expectedProject);
10584
replay(resourceManager);
106-
Project loadedProject = Project.get(resourceManager, PROJECT_INFO.projectId());
85+
Project loadedProject = resourceManager.get(PROJECT_INFO.projectId());
10786
assertEquals(expectedProject, loadedProject);
10887
}
10988

@@ -126,7 +105,7 @@ public void testLoadNull() {
126105
initializeExpectedProject(1);
127106
expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null);
128107
replay(resourceManager);
129-
assertNull(Project.get(resourceManager, PROJECT_INFO.projectId()));
108+
assertNull(resourceManager.get(PROJECT_INFO.projectId()));
130109
}
131110

132111
@Test

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,6 @@ public Blob apply(Tuple<Storage, StorageObject> pb) {
6363
return Blob.fromPb(pb.x(), pb.y());
6464
}
6565
};
66-
static final Function<Blob, StorageObject> BLOB_TO_PB_FUNCTION =
67-
new Function<Blob, StorageObject>() {
68-
@Override
69-
public StorageObject apply(Blob blob) {
70-
return blob.toPb();
71-
}
72-
};
7366

7467
/**
7568
* Class for specifying blob source options when {@code Blob} methods are used.

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@
4949
*/
5050
public class BlobInfo implements Serializable {
5151

52-
static final Function<StorageObject, BlobInfo> INFO_FROM_PB_FUNCTION =
53-
new Function<StorageObject, BlobInfo>() {
54-
@Override
55-
public BlobInfo apply(StorageObject pb) {
56-
return BlobInfo.fromPb(pb);
57-
}
58-
};
5952
static final Function<BlobInfo, StorageObject> INFO_TO_PB_FUNCTION =
6053
new Function<BlobInfo, StorageObject>() {
6154
@Override

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.google.gcloud.storage;
1818

19+
import static com.google.gcloud.storage.Acl.Project.ProjectRole.VIEWERS;
20+
import static com.google.gcloud.storage.Acl.Role.READER;
21+
import static com.google.gcloud.storage.Acl.Role.WRITER;
1922
import static org.easymock.EasyMock.capture;
2023
import static org.easymock.EasyMock.createMock;
2124
import static org.easymock.EasyMock.createStrictMock;
@@ -30,7 +33,11 @@
3033
import static org.junit.Assert.assertSame;
3134
import static org.junit.Assert.assertTrue;
3235

36+
import com.google.common.collect.ImmutableList;
37+
import com.google.common.collect.ImmutableMap;
3338
import com.google.gcloud.ReadChannel;
39+
import com.google.gcloud.storage.Acl.Project;
40+
import com.google.gcloud.storage.Acl.User;
3441
import com.google.gcloud.storage.Storage.CopyRequest;
3542

3643
import org.easymock.Capture;
@@ -39,10 +46,54 @@
3946
import org.junit.Test;
4047

4148
import java.net.URL;
49+
import java.util.List;
50+
import java.util.Map;
4251
import java.util.concurrent.TimeUnit;
4352

4453
public class BlobTest {
4554

55+
private static final List<Acl> ACL = ImmutableList.of(
56+
Acl.of(User.ofAllAuthenticatedUsers(), READER), Acl.of(new Project(VIEWERS, "p1"), WRITER));
57+
private static final Integer COMPONENT_COUNT = 2;
58+
private static final String CONTENT_TYPE = "text/html";
59+
private static final String CACHE_CONTROL = "cache";
60+
private static final String CONTENT_DISPOSITION = "content-disposition";
61+
private static final String CONTENT_ENCODING = "UTF-8";
62+
private static final String CONTENT_LANGUAGE = "En";
63+
private static final String CRC32 = "0xFF00";
64+
private static final Long DELETE_TIME = System.currentTimeMillis();
65+
private static final String ETAG = "0xFF00";
66+
private static final Long GENERATION = 1L;
67+
private static final String ID = "B/N:1";
68+
private static final String MD5 = "0xFF00";
69+
private static final String MEDIA_LINK = "http://media/b/n";
70+
private static final Map<String, String> METADATA = ImmutableMap.of("n1", "v1", "n2", "v2");
71+
private static final Long META_GENERATION = 10L;
72+
private static final User OWNER = new User("[email protected]");
73+
private static final String SELF_LINK = "http://storage/b/n";
74+
private static final Long SIZE = 1024L;
75+
private static final Long UPDATE_TIME = DELETE_TIME - 1L;
76+
private static final BlobInfo FULL_BLOB_INFO = BlobInfo.builder("b", "n", GENERATION)
77+
.acl(ACL)
78+
.componentCount(COMPONENT_COUNT)
79+
.contentType(CONTENT_TYPE)
80+
.cacheControl(CACHE_CONTROL)
81+
.contentDisposition(CONTENT_DISPOSITION)
82+
.contentEncoding(CONTENT_ENCODING)
83+
.contentLanguage(CONTENT_LANGUAGE)
84+
.crc32c(CRC32)
85+
.deleteTime(DELETE_TIME)
86+
.etag(ETAG)
87+
.id(ID)
88+
.md5(MD5)
89+
.mediaLink(MEDIA_LINK)
90+
.metadata(METADATA)
91+
.metageneration(META_GENERATION)
92+
.owner(OWNER)
93+
.selfLink(SELF_LINK)
94+
.size(SIZE)
95+
.updateTime(UPDATE_TIME)
96+
.build();
4697
private static final BlobInfo BLOB_INFO = BlobInfo.builder("b", "n").metageneration(42L).build();
4798

4899
private Storage storage;
@@ -251,4 +302,14 @@ public void testSignUrl() throws Exception {
251302
initializeBlob();
252303
assertEquals(url, blob.signUrl(100, TimeUnit.SECONDS));
253304
}
305+
306+
@Test
307+
public void testToBuilder() {
308+
expect(storage.options()).andReturn(mockOptions).times(4);
309+
replay(storage);
310+
Blob fullBlob = new Blob(storage, new BlobInfo.BuilderImpl(FULL_BLOB_INFO));
311+
assertEquals(fullBlob, fullBlob.toBuilder().build());
312+
Blob simpleBlob = new Blob(storage, new BlobInfo.BuilderImpl(BLOB_INFO));
313+
assertEquals(simpleBlob, simpleBlob.toBuilder().build());
314+
}
254315
}

‎branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java‎

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
package com.google.gcloud.storage;
1818

19+
import static com.google.gcloud.storage.Acl.Project.ProjectRole.VIEWERS;
20+
import static com.google.gcloud.storage.Acl.Role.READER;
21+
import static com.google.gcloud.storage.Acl.Role.WRITER;
1922
import static org.easymock.EasyMock.capture;
2023
import static org.easymock.EasyMock.createMock;
2124
import static org.easymock.EasyMock.createStrictMock;
@@ -30,10 +33,15 @@
3033
import com.google.common.collect.ImmutableList;
3134
import com.google.gcloud.Page;
3235
import com.google.gcloud.PageImpl;
36+
import com.google.gcloud.storage.Acl.Project;
37+
import com.google.gcloud.storage.Acl.User;
3338
import com.google.gcloud.storage.BatchResponse.Result;
39+
import com.google.gcloud.storage.BucketInfo.AgeDeleteRule;
40+
import com.google.gcloud.storage.BucketInfo.DeleteRule;
3441

3542
import org.easymock.Capture;
3643
import org.junit.After;
44+
import org.junit.Before;
3745
import org.junit.Test;
3846

3947
import java.io.ByteArrayInputStream;
@@ -46,6 +54,41 @@
4654

4755
public class BucketTest {
4856

57+
private static final List<Acl> ACL = ImmutableList.of(
58+
Acl.of(User.ofAllAuthenticatedUsers(), READER), Acl.of(new Project(VIEWERS, "p1"), WRITER));
59+
private static final String ETAG = "0xFF00";
60+
private static final String ID = "B/N:1";
61+
private static final Long META_GENERATION = 10L;
62+
private static final User OWNER = new User("[email protected]");
63+
private static final String SELF_LINK = "http://storage/b/n";
64+
private static final Long CREATE_TIME = System.currentTimeMillis();
65+
private static final List<Cors> CORS = Collections.singletonList(Cors.builder().build());
66+
private static final List<Acl> DEFAULT_ACL =
67+
Collections.singletonList(Acl.of(User.ofAllAuthenticatedUsers(), WRITER));
68+
private static final List<? extends DeleteRule> DELETE_RULES =
69+
Collections.singletonList(new AgeDeleteRule(5));
70+
private static final String INDEX_PAGE = "index.html";
71+
private static final String NOT_FOUND_PAGE = "error.html";
72+
private static final String LOCATION = "ASIA";
73+
private static final String STORAGE_CLASS = "STANDARD";
74+
private static final Boolean VERSIONING_ENABLED = true;
75+
private static final BucketInfo FULL_BUCKET_INFO = BucketInfo.builder("b")
76+
.acl(ACL)
77+
.etag(ETAG)
78+
.id(ID)
79+
.metageneration(META_GENERATION)
80+
.owner(OWNER)
81+
.selfLink(SELF_LINK)
82+
.cors(CORS)
83+
.createTime(CREATE_TIME)
84+
.defaultAcl(DEFAULT_ACL)
85+
.deleteRules(DELETE_RULES)
86+
.indexPage(INDEX_PAGE)
87+
.notFoundPage(NOT_FOUND_PAGE)
88+
.location(LOCATION)
89+
.storageClass(STORAGE_CLASS)
90+
.versioningEnabled(VERSIONING_ENABLED)
91+
.build();
4992
private static final BucketInfo BUCKET_INFO = BucketInfo.builder("b").metageneration(42L).build();
5093
private static final String CONTENT_TYPE = "text/plain";
5194

@@ -56,6 +99,11 @@ public class BucketTest {
5699
private Bucket expectedBucket;
57100
private Iterable<Blob> blobResults;
58101

102+
@Before
103+
public void setUp() {
104+
storage = createStrictMock(Storage.class);
105+
}
106+
59107
@After
60108
public void tearDown() throws Exception {
61109
verify(storage);
@@ -64,7 +112,6 @@ public void tearDown() throws Exception {
64112
private void initializeExpectedBucket(int optionsCalls) {
65113
expect(serviceMockReturnsOptions.options()).andReturn(mockOptions).times(optionsCalls);
66114
replay(serviceMockReturnsOptions);
67-
storage = createStrictMock(Storage.class);
68115
expectedBucket = new Bucket(serviceMockReturnsOptions, new BucketInfo.BuilderImpl(BUCKET_INFO));
69116
blobResults = ImmutableList.of(
70117
new Blob(serviceMockReturnsOptions,
@@ -283,4 +330,14 @@ public void testCreateFromStreamNullContentType() throws Exception {
283330
Blob blob = bucket.create("n", streamContent, null);
284331
assertEquals(expectedBlob, blob);
285332
}
333+
334+
@Test
335+
public void testToBuilder() {
336+
expect(storage.options()).andReturn(mockOptions).times(4);
337+
replay(storage);
338+
Bucket fullBucket = new Bucket(storage, new BucketInfo.BuilderImpl(FULL_BUCKET_INFO));
339+
assertEquals(fullBucket, fullBucket.toBuilder().build());
340+
Bucket simpleBlob = new Bucket(storage, new BucketInfo.BuilderImpl(BUCKET_INFO));
341+
assertEquals(simpleBlob, simpleBlob.toBuilder().build());
342+
}
286343
}

0 commit comments

Comments
 (0)