---

aozarov · aozarov · commit 3c67d2f370e9 · 2015-05-07T11:31:27.000-07:00
yaml --- r: 5977 b: refs/heads/tswast-patch-1 c: 425ae6f h: refs/heads/master i: 5975: 7bbdde0
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: d4368c56ea9599f1ec82c02972d2e8b34587eca5
+refs/heads/tswast-patch-1: 425ae6f5d6d6eaacbcd51c304505dc829183441a
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageService.java b/branches/tswast-patch-1/src/main/java/com/google/gcloud/storage/StorageService.java
@@ -425,4 +425,6 @@ public static Builder builder() {
    * @throws StorageServiceException upon failure
    */
   BlobWriteChannel writer(Blob blob, BlobTargetOption... options);
+
+
 }
diff --git a/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java b/branches/tswast-patch-1/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java
@@ -35,6 +35,7 @@
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
+import com.google.gcloud.spi.DatastoreRpcFactory;
 
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
@@ -637,18 +638,21 @@ public void testRetires() throws Exception {
         DatastoreV1.LookupRequest.newBuilder().addKey(KEY1.toPb()).build();
     DatastoreV1.LookupResponse responsePb = DatastoreV1.LookupResponse.newBuilder()
         .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())).build();
-    DatastoreRpc mock = EasyMock.createStrictMock(DatastoreRpc.class);
-    EasyMock.expect(mock.lookup(requestPb))
+    DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
+    DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreServiceOptions.class)))
+        .andReturn(rpcMock);
+    EasyMock.expect(rpcMock.lookup(requestPb))
         .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE))
         .andReturn(responsePb);
-    EasyMock.replay(mock);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreServiceOptions options = this.options.toBuilder()
         .retryParams(RetryParams.getDefaultInstance())
-        .datastoreRpc(mock)
+        .serviceRpcFactory(rpcFactoryMock)
         .build();
     DatastoreService datastore = DatastoreServiceFactory.instance().get(options);
     Entity entity = datastore.get(KEY1);
     assertEquals(ENTITY1, entity);
-    EasyMock.verify(mock);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -425,4 +425,6 @@ public static Builder builder() {`
`425`	`425`	`* @throws StorageServiceException upon failure`
`426`	`426`	`*/`
`427`	`427`	`BlobWriteChannel writer(Blob blob, BlobTargetOption... options);`
	`428`	`+`
	`429`	`+`
`428`	`430`	`}`