Skip to content

Commit a390c9e

Browse files
shinfanshinfan
committed
Merge branch 'master' of github.com:GoogleCloudPlatform/google-cloud-java into docs
2 parents 7c29209 + c3d18ff commit a390c9e

28 files changed

Lines changed: 540 additions & 504 deletions

File tree

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@
1919
import static com.google.cloud.RetryHelper.runWithRetries;
2020
import static com.google.common.base.Preconditions.checkArgument;
2121

22+
import com.google.api.gax.paging.Page;
2223
import com.google.api.services.bigquery.model.GetQueryResultsResponse;
2324
import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
2425
import com.google.api.services.bigquery.model.TableDataInsertAllRequest.Rows;
2526
import com.google.api.services.bigquery.model.TableRow;
2627
import com.google.cloud.BaseService;
27-
import com.google.api.gax.paging.Page;
2828
import com.google.cloud.PageImpl;
2929
import com.google.cloud.PageImpl.NextPageFetcher;
3030
import com.google.cloud.RetryHelper;
31+
import com.google.cloud.Tuple;
3132
import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
3233
import com.google.cloud.bigquery.spi.v2.BigQueryRpc;
3334
import com.google.common.base.Function;
@@ -36,7 +37,6 @@
3637
import com.google.common.collect.Iterables;
3738
import com.google.common.collect.Lists;
3839
import com.google.common.collect.Maps;
39-
4040
import java.util.List;
4141
import java.util.Map;
4242
import java.util.concurrent.Callable;
@@ -247,21 +247,30 @@ public Page<Dataset> listDatasets(String projectId, DatasetListOption... options
247247
return listDatasets(projectId, getOptions(), optionMap(options));
248248
}
249249

250-
private static Page<Dataset> listDatasets(final String projectId,
251-
final BigQueryOptions serviceOptions, final Map<BigQueryRpc.Option, ?> optionsMap) {
250+
private static Page<Dataset> listDatasets(
251+
final String projectId,
252+
final BigQueryOptions serviceOptions,
253+
final Map<BigQueryRpc.Option, ?> optionsMap) {
252254
try {
253-
BigQueryRpc.Tuple<String, Iterable<com.google.api.services.bigquery.model.Dataset>> result =
254-
runWithRetries(new Callable<BigQueryRpc.Tuple<String,
255-
Iterable<com.google.api.services.bigquery.model.Dataset>>>() {
255+
Tuple<String, Iterable<com.google.api.services.bigquery.model.Dataset>> result =
256+
runWithRetries(
257+
new Callable<
258+
Tuple<String, Iterable<com.google.api.services.bigquery.model.Dataset>>>() {
256259
@Override
257-
public BigQueryRpc.Tuple<String,
258-
Iterable<com.google.api.services.bigquery.model.Dataset>> call() {
260+
public Tuple<String, Iterable<com.google.api.services.bigquery.model.Dataset>>
261+
call() {
259262
return serviceOptions.getBigQueryRpcV2().listDatasets(projectId, optionsMap);
260263
}
261-
}, serviceOptions.getRetrySettings(), EXCEPTION_HANDLER, serviceOptions.getClock());
264+
},
265+
serviceOptions.getRetrySettings(),
266+
EXCEPTION_HANDLER,
267+
serviceOptions.getClock());
262268
String cursor = result.x();
263-
return new PageImpl<>(new DatasetPageFetcher(projectId, serviceOptions, cursor, optionsMap),
264-
cursor, Iterables.transform(result.y(),
269+
return new PageImpl<>(
270+
new DatasetPageFetcher(projectId, serviceOptions, cursor, optionsMap),
271+
cursor,
272+
Iterables.transform(
273+
result.y(),
265274
new Function<com.google.api.services.bigquery.model.Dataset, Dataset>() {
266275
@Override
267276
public Dataset apply(com.google.api.services.bigquery.model.Dataset dataset) {
@@ -391,11 +400,11 @@ public Page<Table> listTables(DatasetId datasetId, TableListOption... options) {
391400
private static Page<Table> listTables(final DatasetId datasetId,
392401
final BigQueryOptions serviceOptions, final Map<BigQueryRpc.Option, ?> optionsMap) {
393402
try {
394-
BigQueryRpc.Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>> result =
395-
runWithRetries(new Callable<BigQueryRpc.Tuple<String,
403+
Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>> result =
404+
runWithRetries(new Callable<Tuple<String,
396405
Iterable<com.google.api.services.bigquery.model.Table>>>() {
397406
@Override
398-
public BigQueryRpc.Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>>
407+
public Tuple<String, Iterable<com.google.api.services.bigquery.model.Table>>
399408
call() {
400409
return serviceOptions.getBigQueryRpcV2().listTables(
401410
datasetId.getProject(), datasetId.getDataset(), optionsMap);
@@ -450,10 +459,10 @@ private static Page<List<FieldValue>> listTableData(final TableId tableId,
450459
final BigQueryOptions serviceOptions, final Map<BigQueryRpc.Option, ?> optionsMap) {
451460
try {
452461
final TableId completeTableId = tableId.setProjectId(serviceOptions.getProjectId());
453-
BigQueryRpc.Tuple<String, Iterable<TableRow>> result =
454-
runWithRetries(new Callable<BigQueryRpc.Tuple<String, Iterable<TableRow>>>() {
462+
Tuple<String, Iterable<TableRow>> result =
463+
runWithRetries(new Callable<Tuple<String, Iterable<TableRow>>>() {
455464
@Override
456-
public BigQueryRpc.Tuple<String, Iterable<TableRow>> call() {
465+
public Tuple<String, Iterable<TableRow>> call() {
457466
return serviceOptions.getBigQueryRpcV2()
458467
.listTableData(completeTableId.getProject(), completeTableId.getDataset(),
459468
completeTableId.getTable(), optionsMap);
@@ -509,11 +518,11 @@ public Page<Job> listJobs(JobListOption... options) {
509518

510519
private static Page<Job> listJobs(final BigQueryOptions serviceOptions,
511520
final Map<BigQueryRpc.Option, ?> optionsMap) {
512-
BigQueryRpc.Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>> result =
513-
runWithRetries(new Callable<BigQueryRpc.Tuple<String,
521+
Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>> result =
522+
runWithRetries(new Callable<Tuple<String,
514523
Iterable<com.google.api.services.bigquery.model.Job>>>() {
515524
@Override
516-
public BigQueryRpc.Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>>
525+
public Tuple<String, Iterable<com.google.api.services.bigquery.model.Job>>
517526
call() {
518527
return serviceOptions.getBigQueryRpcV2().listJobs(serviceOptions.getProjectId(), optionsMap);
519528
}

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/BigQueryRpc.java‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
2828
import com.google.api.services.bigquery.model.TableRow;
2929
import com.google.cloud.ServiceRpc;
30+
import com.google.cloud.Tuple;
3031
import com.google.cloud.bigquery.BigQueryException;
31-
3232
import java.util.Map;
3333

3434
public interface BigQueryRpc extends ServiceRpc {
@@ -73,29 +73,6 @@ Boolean getBoolean(Map<Option, ?> options) {
7373
}
7474
}
7575

76-
class Tuple<X, Y> {
77-
78-
private final X x;
79-
private final Y y;
80-
81-
private Tuple(X x, Y y) {
82-
this.x = x;
83-
this.y = y;
84-
}
85-
86-
public static <X, Y> Tuple<X, Y> of(X x, Y y) {
87-
return new Tuple<>(x, y);
88-
}
89-
90-
public X x() {
91-
return x;
92-
}
93-
94-
public Y y() {
95-
return y;
96-
}
97-
}
98-
9976
/**
10077
* Returns the requested dataset or {@code null} if not found.
10178
*

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.google.api.services.bigquery.model.TableList;
5050
import com.google.api.services.bigquery.model.TableReference;
5151
import com.google.api.services.bigquery.model.TableRow;
52+
import com.google.cloud.Tuple;
5253
import com.google.cloud.bigquery.BigQueryException;
5354
import com.google.cloud.bigquery.BigQueryOptions;
5455
import com.google.cloud.http.HttpTransportOptions;

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
import static org.junit.Assert.assertSame;
2727
import static org.junit.Assert.assertTrue;
2828

29+
import com.google.api.gax.paging.Page;
2930
import com.google.api.services.bigquery.model.ErrorProto;
3031
import com.google.api.services.bigquery.model.GetQueryResultsResponse;
3132
import com.google.api.services.bigquery.model.TableCell;
3233
import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
3334
import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
3435
import com.google.api.services.bigquery.model.TableRow;
35-
import com.google.api.gax.paging.Page;
3636
import com.google.cloud.ServiceOptions;
37+
import com.google.cloud.Tuple;
3738
import com.google.cloud.WriteChannel;
3839
import com.google.cloud.bigquery.InsertAllRequest.RowToInsert;
39-
import com.google.cloud.bigquery.spi.v2.BigQueryRpc;
40-
import com.google.cloud.bigquery.spi.v2.BigQueryRpc.Tuple;
4140
import com.google.cloud.bigquery.spi.BigQueryRpcFactory;
41+
import com.google.cloud.bigquery.spi.v2.BigQueryRpc;
4242
import com.google.common.base.Function;
4343
import com.google.common.collect.ImmutableList;
4444
import com.google.common.collect.ImmutableMap;

0 commit comments

Comments
 (0)