Skip to content

Commit 304d63a

Browse files
committed
---
yaml --- r: 2555 b: refs/heads/update-datastore c: a08e7bb h: refs/heads/master i: 2553: 8354bcc 2551: 9f9d2a1
1 parent 8b42143 commit 304d63a

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: 2271ab9b178861dbd5e1705a356b5943610ee0ca
8+
refs/heads/update-datastore: a08e7bb7e091e8871097925bb54cde57082768b0
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

branches/update-datastore/gcloud-java-bigquery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.gcloud</groupId>
1313
<artifactId>gcloud-java-pom</artifactId>
14-
<version>0.0.11-SNAPSHOT</version>
14+
<version>0.1.1-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>gcloud-java-bigquery</site.installationModule>

branches/update-datastore/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/BigQueryImplTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ public void setUp() {
260260
EasyMock.replay(rpcFactoryMock);
261261
options = BigQueryOptions.builder()
262262
.projectId(PROJECT)
263-
.authCredentials(AuthCredentials.noCredentials())
264263
.serviceRpcFactory(rpcFactoryMock)
265264
.build();
266265
}
@@ -1011,7 +1010,7 @@ public void testRetryableException() {
10111010
.andThrow(new BigQueryException(500, "InternalError", true))
10121011
.andReturn(DATASET_INFO_WITH_PROJECT.toPb());
10131012
EasyMock.replay(bigqueryRpcMock);
1014-
bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
1013+
bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
10151014
DatasetInfo dataset = bigquery.getDataset(DATASET);
10161015
assertEquals(DATASET_INFO_WITH_PROJECT, dataset);
10171016
}
@@ -1022,7 +1021,7 @@ public void testNonRetryableException() {
10221021
EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
10231022
.andThrow(new BigQueryException(501, exceptionMessage, false));
10241023
EasyMock.replay(bigqueryRpcMock);
1025-
bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
1024+
bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
10261025
thrown.expect(BigQueryException.class);
10271026
thrown.expectMessage(exceptionMessage);
10281027
bigquery.getDataset(DatasetId.of(DATASET));
@@ -1034,7 +1033,7 @@ public void testRuntimeException() {
10341033
EasyMock.expect(bigqueryRpcMock.getDataset(DATASET, EMPTY_RPC_OPTIONS))
10351034
.andThrow(new RuntimeException(exceptionMessage));
10361035
EasyMock.replay(bigqueryRpcMock);
1037-
bigquery = options.toBuilder().retryParams(RetryParams.getDefaultInstance()).build().service();
1036+
bigquery = options.toBuilder().retryParams(RetryParams.defaultInstance()).build().service();
10381037
thrown.expect(BigQueryException.class);
10391038
thrown.expectMessage(exceptionMessage);
10401039
bigquery.getDataset(DATASET);

branches/update-datastore/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ public void testServiceOptions() throws Exception {
218218

219219
options = options.toBuilder()
220220
.projectId("p2")
221-
.retryParams(RetryParams.getDefaultInstance())
222-
.authCredentials(AuthCredentials.noCredentials())
221+
.retryParams(RetryParams.defaultInstance())
222+
.authCredentials(null)
223223
.build();
224224
serializedCopy = serializeAndDeserialize(options);
225225
assertEquals(options, serializedCopy);

0 commit comments

Comments
 (0)